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

haskell: don't provide 'binary' default, instead we override that

Browse Source 
attribute in the compiler-specific package set

binary has become a core package in ghc 7.4.2, so we cannot easily build
stuff with our own version of it. (Least not without Cabal warning about
version conflicts in the build log.)
This commit is contained in:
Peter Simons 2013-12-26 20:24:54 +01:00
parent ad80939299
commit 7e94212b0d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@
cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
bmp = self.bmp_1_2_2_1; bmp = self.bmp_1_2_2_1;
binary = self.binary_0_6_0_0;
}; };
ghc721Prefs = ghc722Prefs; ghc721Prefs = ghc722Prefs;
@ -66,6 +67,7 @@
cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
prettyShow = self.prettyShow_1_2; prettyShow = self.prettyShow_1_2;
bmp = self.bmp_1_2_2_1; bmp = self.bmp_1_2_2_1;
binary = self.binary_0_6_0_0;
Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
quickcheckIo = self.quickcheckIo.override { quickcheckIo = self.quickcheckIo.override {
HUnit = self.HUnit_1_2_5_2; HUnit = self.HUnit_1_2_5_2;
@ -83,6 +85,7 @@
cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
prettyShow = self.prettyShow_1_2; prettyShow = self.prettyShow_1_2;
bmp = self.bmp_1_2_2_1; bmp = self.bmp_1_2_2_1;
binary = self.binary_0_6_0_0;
Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
quickcheckIo = self.quickcheckIo.override { quickcheckIo = self.quickcheckIo.override {
HUnit = self.HUnit_1_2_5_2; HUnit = self.HUnit_1_2_5_2;
@ -102,6 +105,7 @@
cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
prettyShow = self.prettyShow_1_2; prettyShow = self.prettyShow_1_2;
bmp = self.bmp_1_2_2_1; bmp = self.bmp_1_2_2_1;
binary = self.binary_0_6_0_0;
Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
quickcheckIo = self.quickcheckIo.override { quickcheckIo = self.quickcheckIo.override {
HUnit = self.HUnit_1_2_5_2; HUnit = self.HUnit_1_2_5_2;
@ -121,6 +125,7 @@
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
bmp = self.bmp_1_2_2_1; bmp = self.bmp_1_2_2_1;
binary = self.binary_0_6_0_0;
cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { 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; Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3;
mtl = self.mtl_2_1_2; mtl = self.mtl_2_1_2;
@ -143,6 +148,7 @@
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
bmp = self.bmp_1_2_2_1; bmp = self.bmp_1_2_2_1;
binary = self.binary_0_6_0_0;
cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override {
Cabal = self.Cabal_1_16_0_3; Cabal = self.Cabal_1_16_0_3;
zlib = self.zlib_0_5_3_3; zlib = self.zlib_0_5_3_3;

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

@ -602,7 +602,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
binary_0_6_0_0 = callPackage ../development/libraries/haskell/binary/0.6.0.0.nix {}; binary_0_6_0_0 = callPackage ../development/libraries/haskell/binary/0.6.0.0.nix {};
binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {}; binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {};
binary = self.binary_0_7_1_0; binary = null; # core package starting with GHC 7.4.x
binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {};