JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

darcs: switch build to GHC 8.0.2 to fix it

Browse Source 
Also, jailbreak the constraint on unix-compat <5.
This commit is contained in:
Peter Simons 2017-12-29 17:39:16 +01:00
parent 238d574846
commit ab3a12ed7e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1015,7 +1015,9 @@ self: super: {
# https://github.com/haskell/cabal/issues/4969 # https://github.com/haskell/cabal/issues/4969
haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4; haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };
# Jailbreak "unix-compat >=0.1.2 && <0.5".
darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; });
haddock-api = super.haddock-api.override
{ haddock-library = self.haddock-library_1_4_4; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -14394,7 +14394,7 @@ with pkgs;
cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { };
darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc802.darcs) (drv: {
configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
}); });