alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

jailbreak-cabal: clean up overrides

Browse source 
These changes ensure that jailbreak-cabal works correctly without further
configuration even with older compilers. The exception to that rule being,
naturally, versions of GHC that can't compile Cabal 1.20.x; these *do* need
another override.
This commit is contained in:
Peter Simons 2015-09-15 12:43:14 +02:00
parent 73d79ed945
commit 974f2122b1
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -12,7 +12,7 @@ self: super: {
cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
# Link statically to avoid runtime dependency on GHC.
jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
# Apply NixOS-specific patches.
ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;

12
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file

@ -41,7 +41,7 @@ self: super: {
# Cabal_1_22_1_1 requires filepath >=1 && <1.4
cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
# Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
# Don't compile jailbreak-cabal with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
version = "1.23.0.0";
src = pkgs.fetchFromGitHub {
@ -54,10 +54,12 @@ self: super: {
doHaddock = false;
postUnpack = "sourceRoot+=/Cabal";
});
jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
});
jailbreak-cabal = super.jailbreak-cabal.override {
Cabal = self.Cabal_1_23_0_0;
mkDerivation = drv: self.mkDerivation (drv // {
preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
});
};
idris =
let idris' = overrideCabal super.idris (drv: {