pyrox.dev
Merge pull request #113637 from ju1m/cabal-install
cabal-install: fix build on ghc901
authored by
Peter Simons
and committed by
GitHub
37347001
8b4f9b53
+4
-1
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+4
-1
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
···
45
45
46
46
# Take the 3.4.x release candidate.
47
47
cabal-install = assert super.cabal-install.version == "3.2.0.0";
48
-
overrideCabal super.cabal-install (drv: {
48
+
overrideCabal (doJailbreak super.cabal-install) (drv: {
49
49
postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot";
50
50
version = "cabal-install-3.4.0.0-rc4";
51
51
editedCabalFile = null;
···
54
54
rev = "cabal-install-3.4.0.0-rc4";
55
55
sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk";
56
56
};
57
+
executableHaskellDepends = drv.executableHaskellDepends ++ [ self.regex-base self.regex-posix ];
57
58
});
58
59
59
60
# Jailbreaks & Version Updates
···
62
63
data-fix = doJailbreak super.data-fix;
63
64
dec = doJailbreak super.dec;
64
65
ed25519 = doJailbreak super.ed25519;
66
+
hackage-security = doJailbreak super.hackage-security;
65
67
hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; });
66
68
hashable-time = doJailbreak super.hashable-time;
69
+
HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
67
70
integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
68
71
lukko = doJailbreak super.lukko;
69
72
parallel = doJailbreak super.parallel;