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

Override 'Cabal' attribute in 'jailbreakCabal' only when building with a GHC

Browse Source 
version older than 7.2.x. Newer compilers can use their native version of Cabal
to build this tool.
This commit is contained in:
Peter Simons 2012-09-10 15:39:44 +02:00
parent 010c282cb2
commit 5bde8b0985
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/haskell-defaults.nix
View File

@ -42,6 +42,7 @@
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
}; };
ghc703Prefs = ghc703Prefs =
@ -50,6 +51,7 @@
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
}; };
ghc702Prefs = ghc701Prefs; ghc702Prefs = ghc701Prefs;
@ -60,6 +62,7 @@
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
}; };
ghc6123Prefs = ghc6122Prefs; ghc6123Prefs = ghc6122Prefs;
@ -73,6 +76,7 @@
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
deepseq = self.deepseq_1_1_0_2; deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably statistics) compile # deviating from Haskell platform here, to make some packages (notably statistics) compile
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
}; };
ghc6121Prefs = ghc6121Prefs =
@ -83,6 +87,7 @@
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
deepseq = self.deepseq_1_1_0_2; deepseq = self.deepseq_1_1_0_2;
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
# deviating from Haskell platform here, to make some packages (notably statistics) compile # deviating from Haskell platform here, to make some packages (notably statistics) compile
}; };
@ -97,6 +102,7 @@
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
deepseq = self.deepseq_1_1_0_2; deepseq = self.deepseq_1_1_0_2;
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
# deviating from Haskell platform here, to make some packages (notably statistics) compile # deviating from Haskell platform here, to make some packages (notably statistics) compile
}; };

4
pkgs/top-level/haskell-packages.nix
View File

@ -1792,9 +1792,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
cabalInstall = self.cabalInstall_0_14_0; cabalInstall = self.cabalInstall_0_14_0;
jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal { jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
Cabal = self.Cabal_1_14_0;
};
lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; lhs2tex = callPackage ../tools/typesetting/lhs2tex {};