Don't override deepseq globally in Cabal 1.18.x.

Deepseq is a core package, and building Cabal with a version that differs from
the one shipped with GHC is probably not a good idea.

For GHC 7.0.x, however, we must override deepseq, because the library just
won't build otherwise.
This commit is contained in:
Peter Simons 2013-11-07 15:36:55 +01:00
parent 0cd6b6e896
commit ad2d8fdfb9
2 changed files with 4 additions and 4 deletions

View File

@ -60,6 +60,7 @@
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
prettyShow = self.prettyShow_1_2;
bmp = self.bmp_1_2_2_1;
Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
};
ghc703Prefs =
@ -71,6 +72,7 @@
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
prettyShow = self.prettyShow_1_2;
bmp = self.bmp_1_2_2_1;
Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
};
ghc702Prefs = ghc701Prefs;
@ -84,6 +86,7 @@
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
prettyShow = self.prettyShow_1_2;
bmp = self.bmp_1_2_2_1;
Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
};
ghc6123Prefs = ghc6122Prefs;

View File

@ -662,10 +662,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix {
cabal = self.cabal.override { Cabal = null; };
deepseq = self.deepseq_1_3_0_2;
};
Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { cabal = self.cabal.override { Cabal = null; }; };
Cabal = null; # core package in GHC
cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};