From 8377f503f15475e83da7c66168d779972487c366 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Mar 2021 20:57:01 +0100 Subject: [PATCH] cabal-install: fix the build with ghc-9.0.x --- .../haskell-modules/configuration-ghc-9.0.x.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index e3099bfe510..1b8b087326e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -43,12 +43,14 @@ self: super: { unix = null; xhtml = null; - # Build cabal-install with the compiler's native Cabal. - cabal-install = (doJailbreak super.cabal-install).override { - # Use dontCheck to break test dependency cycles - edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); - random = super.random_1_2_0; - }; + # cabal-install needs more recent versions of random, but an older + # version of base16-bytestring. + cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { + Cabal = null; + base16-bytestring = self.base16-bytestring_0_1_1_7; + random = dontCheck super.random_1_2_0; # break infinite recursion + hashable = doJailbreak super.hashable; # allow random 1.2.x + }); # Jailbreaks & Version Updates async = doJailbreak super.async;