diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-10-15 23:44:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 23:44:52 +0200 |
| commit | 6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf (patch) | |
| tree | b9389b60b9845aa86cff8a619895552ffee17dbb /pkgs | |
| parent | d75e0589af5f2a414f6f63fedcfd4a27e6fde2be (diff) | |
| parent | 321626d5ee6410e6a431e8e487cc1a5d7f4fa894 (diff) | |
| download | nixlib-6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf.tar nixlib-6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf.tar.gz nixlib-6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf.tar.bz2 nixlib-6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf.tar.lz nixlib-6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf.tar.xz nixlib-6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf.tar.zst nixlib-6c00efd6c0f5600a9a09d6ea9d6a2c07a57bfcdf.zip | |
Merge pull request #48485 from dhess/cryptonite-aarch64
haskellPackages.cryptonite: fix for aarch64 and re-enable tests
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6f654c32dbb2..125413d61511 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -676,8 +676,13 @@ self: super: { # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; - # https://github.com/fpco/stackage/issues/838 - cryptonite = dontCheck super.cryptonite; + # Fix an aarch64 issue with cryptonite-0.25: + # https://github.com/haskell-crypto/cryptonite/issues/234 + # This has been committed upstream, but there is, as of yet, no new release. + cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch { + url = https://github.com/haskell-crypto/cryptonite/commit/4622e5fc8ece82f4cf31358e31cd02cf020e558e.patch; + sha256 = "1m2d47ni4jbrpvxry50imj91qahr3r7zkqm157clrzlmw6gzpgnq"; + }); # We cannot build this package w/o the C library from <http://www.phash.org/>. phash = markBroken super.phash; |