From c8a59e845369f24eb9518d6c5d1d4df105647aa7 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Mon, 15 Oct 2018 16:31:59 -0400 Subject: haskellPackages.cryptonite: re-enable tests. This has been fixed since cryptonite-0.7: https://github.com/haskell-crypto/cryptonite/issues/28 cryptonite is also no longer listed in expected-test-failures in Stackage. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6f654c32dbb2..29f776bb4af8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -676,9 +676,6 @@ self: super: { # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; - # https://github.com/fpco/stackage/issues/838 - cryptonite = dontCheck super.cryptonite; - # We cannot build this package w/o the C library from . phash = markBroken super.phash; -- cgit 1.4.1 From 321626d5ee6410e6a431e8e487cc1a5d7f4fa894 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Mon, 15 Oct 2018 17:11:32 -0400 Subject: haskellPackages.cryptonite: fix for aarch64. This is a cherry-pick from upstream (see https://github.com/haskell-crypto/cryptonite/issues/234); there has been no upstream release since the fix was committed. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 29f776bb4af8..125413d61511 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -676,6 +676,14 @@ self: super: { # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; + # 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 . phash = markBroken super.phash; -- cgit 1.4.1