From 41515cc4504ab1fe668b835af80d3ce2e46de4d4 Mon Sep 17 00:00:00 2001 From: Jens Nolte Date: Wed, 29 Sep 2021 03:28:21 +0200 Subject: [PATCH] haskell.packages.ghc921: use hashable_1_3_3_0 hashable 1.3.0 is broken on GHC 9.2.1. This enables building unordered-containers. --- .../haskell-modules/configuration-ghc-9.2.x.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index eac85d6b7a9e..4177d1a9a298 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -58,7 +58,6 @@ self: super: { dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; hackage-security = doJailbreak super.hackage-security; - hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); @@ -87,7 +86,11 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); - # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. + # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x + # Tests fail because random hasn't been updated for GHC 9.2.x + hashable = dontCheck super.hashable_1_3_3_0; + + # Tests fail because random hasn't been updated for GHC 9.2.x unordered-containers = dontCheck super.unordered-containers; # The test suite seems pretty broken.