diff options
author | Peter Simons <simons@cryp.to> | 2012-11-26 14:16:54 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-11-26 14:17:38 +0100 |
commit | bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6 (patch) | |
tree | 4fdeb5b15434e3e12c1857585a10aa92136f0444 /pkgs | |
parent | ca429c3b6154a2a013e8567d08984467b6fff2fa (diff) | |
download | nixpkgs-bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6.tar nixpkgs-bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6.tar.gz nixpkgs-bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6.tar.bz2 nixpkgs-bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6.tar.lz nixpkgs-bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6.tar.xz nixpkgs-bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6.tar.zst nixpkgs-bc6627c6e96d108d5c621c2a9b51f6ea1d2b51f6.zip |
haskell-defaults.nix: add compiler-specific overrides to fix build of cabal-install
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index aa43203fe53..69c99db89a2 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -26,19 +26,22 @@ self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; binary = null; # now a core package + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; binary = null; # now a core package + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; ghc722Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; binary = null; # a core package - deepseq = self.deepseq_1_3_0_0; + deepseq = self.deepseq_1_3_0_1; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; ghc721Prefs = ghc722Prefs; @@ -47,6 +50,7 @@ self : self.haskellPlatformArgs_2011_4_0_0 self // { haskellPlatform = self.haskellPlatform_2011_4_0_0; cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; @@ -55,6 +59,7 @@ self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; @@ -65,6 +70,7 @@ self : self.haskellPlatformArgs_2011_2_0_0 self // { haskellPlatform = self.haskellPlatform_2011_2_0_0; cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; @@ -75,7 +81,6 @@ self : self.haskellPlatformArgs_2010_2_0_0 self // { haskellPlatform = self.haskellPlatform_2010_2_0_0; mtl1 = self.mtl_1_1_0_2; - 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; deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile @@ -100,7 +105,6 @@ mtl1 = self.mtl_1_1_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; text = self.text_0_11_0_6; - 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; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; |