Skip to content

Commit

Permalink
Merge pull request #48486 from srhb/backport-48485
Browse files Browse the repository at this point in the history
Backport 18.09: haskellPackages.cryptonite: fix for aarch64 and re-enable tests
  • Loading branch information
srhb committed Oct 15, 2018
2 parents b5380ae + 67a7354 commit 24bab87
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
Expand Up @@ -675,8 +675,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;
Expand Down

0 comments on commit 24bab87

Please sign in to comment.