haskell-zlib: drop version 0.5.3.2 again; it's causing lots of trouble
This change affects only GHC 7.2 or later. svn path=/nixpkgs/trunk/; revision=31985
This commit is contained in:
parent
9d9e33b98d
commit
798890b819
|
@ -1,17 +0,0 @@
|
||||||
{ cabal, zlib }:
|
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
|
||||||
pname = "zlib";
|
|
||||||
version = "0.5.3.2";
|
|
||||||
sha256 = "1a5xr59bw7hpgd7fwkpgkrpib7i46dsip7285pccvi2934k0628q";
|
|
||||||
extraLibraries = [ zlib ];
|
|
||||||
meta = {
|
|
||||||
description = "Compression and decompression in the gzip and zlib formats";
|
|
||||||
license = self.stdenv.lib.licenses.bsd3;
|
|
||||||
platforms = self.ghc.meta.platforms;
|
|
||||||
maintainers = [
|
|
||||||
self.stdenv.lib.maintainers.andres
|
|
||||||
self.stdenv.lib.maintainers.simons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
|
@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok
|
stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok
|
||||||
syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok
|
syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok
|
||||||
xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
|
xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
|
||||||
zlib = self.zlib_0_5_3_2; # 7.2 ok, 7.3 ok
|
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
|
||||||
HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
|
HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
|
||||||
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
|
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
|
||||||
text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok
|
text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok
|
||||||
|
@ -210,7 +210,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
haskellPlatform = self.haskellPlatform_2011_4_0_0;
|
haskellPlatform = self.haskellPlatform_2011_4_0_0;
|
||||||
mtl1 = self.mtl_1_1_1_1;
|
mtl1 = self.mtl_1_1_1_1;
|
||||||
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
|
||||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
|
||||||
};
|
};
|
||||||
|
|
||||||
haskellPlatform_2011_4_0_0 =
|
haskellPlatform_2011_4_0_0 =
|
||||||
|
@ -253,7 +252,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
haskellPlatform = self.haskellPlatform_2011_2_0_1;
|
haskellPlatform = self.haskellPlatform_2011_2_0_1;
|
||||||
mtl1 = self.mtl_1_1_1_1;
|
mtl1 = self.mtl_1_1_1_1;
|
||||||
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
|
||||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
|
||||||
};
|
};
|
||||||
|
|
||||||
haskellPlatform_2011_2_0_1 =
|
haskellPlatform_2011_2_0_1 =
|
||||||
|
@ -296,7 +294,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
haskellPlatform = self.haskellPlatform_2011_2_0_0;
|
haskellPlatform = self.haskellPlatform_2011_2_0_0;
|
||||||
mtl1 = self.mtl_1_1_1_1;
|
mtl1 = self.mtl_1_1_1_1;
|
||||||
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
|
||||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
|
||||||
};
|
};
|
||||||
|
|
||||||
haskellPlatform_2011_2_0_0 =
|
haskellPlatform_2011_2_0_0 =
|
||||||
|
@ -335,7 +332,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
self : self.haskellPlatformArgs_2010_2_0_0 self // {
|
self : self.haskellPlatformArgs_2010_2_0_0 self // {
|
||||||
haskellPlatform = self.haskellPlatform_2010_2_0_0;
|
haskellPlatform = self.haskellPlatform_2010_2_0_0;
|
||||||
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
|
||||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
|
||||||
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
|
||||||
};
|
};
|
||||||
|
@ -375,7 +371,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
haskellPlatform = self.haskellPlatform_2010_1_0_0;
|
haskellPlatform = self.haskellPlatform_2010_1_0_0;
|
||||||
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
|
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
|
||||||
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
|
||||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
|
||||||
};
|
};
|
||||||
|
|
||||||
haskellPlatform_2010_1_0_0 =
|
haskellPlatform_2010_1_0_0 =
|
||||||
|
@ -415,7 +410,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
|
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
|
||||||
text = self.text_0_11_0_6;
|
text = self.text_0_11_0_6;
|
||||||
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
|
||||||
zlib_0_5_3_2 = null; # don't pick this version of 'zlib' during nix-env -u
|
|
||||||
};
|
};
|
||||||
|
|
||||||
haskellPlatform_2009_2_0_2 =
|
haskellPlatform_2009_2_0_2 =
|
||||||
|
@ -1502,10 +1496,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix {
|
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix {
|
||||||
inherit (pkgs) zlib;
|
inherit (pkgs) zlib;
|
||||||
};
|
};
|
||||||
zlib_0_5_3_2 = callPackage ../development/libraries/haskell/zlib/0.5.3.2.nix {
|
zlib = self.zlib_0_5_3_1;
|
||||||
inherit (pkgs) zlib;
|
|
||||||
};
|
|
||||||
zlib = self.zlib_0_5_3_2;
|
|
||||||
|
|
||||||
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
|
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue