b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #113637 from ju1m/cabal-install

Browse source 
cabal-install: fix build on ghc901
This commit is contained in:
Peter Simons 2021-02-18 20:27:04 +01:00 committed by GitHub
parent 8b4f9b531c 8e17af5172
commit 37347001e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -45,7 +45,7 @@ self: super: {
# Take the 3.4.x release candidate.
cabal-install = assert super.cabal-install.version == "3.2.0.0";
overrideCabal super.cabal-install (drv: {
overrideCabal (doJailbreak super.cabal-install) (drv: {
postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot";
version = "cabal-install-3.4.0.0-rc4";
editedCabalFile = null;
@ -54,6 +54,7 @@ self: super: {
rev = "cabal-install-3.4.0.0-rc4";
sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk";
};
executableHaskellDepends = drv.executableHaskellDepends ++ [ self.regex-base self.regex-posix ];
});
# Jailbreaks & Version Updates
@ -62,8 +63,10 @@ self: super: {
data-fix = doJailbreak super.data-fix;
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"; });
lukko = doJailbreak super.lukko;
parallel = doJailbreak super.parallel;