Author: simons
Date: Thu Feb 2 17:03:01 2012
New Revision: 31985
URL: https://nixos.org/websvn/nix/?rev=31985&sc=1
Log:
haskell-zlib: drop version 0.5.3.2 again; it's causing lots of trouble
This change affects only GHC 7.2 or later.
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Feb 2 15:44:22
2012 (r31984)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Feb 2 17:03:01
2012 (r31985)
@@ -151,7 +151,7 @@
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
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
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
@@ -210,7 +210,6 @@
haskellPlatform = self.haskellPlatform_2011_4_0_0;
mtl1 = self.mtl_1_1_1_1;
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 =
@@ -253,7 +252,6 @@
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
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 =
@@ -296,7 +294,6 @@
haskellPlatform = self.haskellPlatform_2011_2_0_0;
mtl1 = self.mtl_1_1_1_1;
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 =
@@ -335,7 +332,6 @@
self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0;
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;
# deviating from Haskell platform here, to make some packages (notably
statistics) compile
};
@@ -375,7 +371,6 @@
haskellPlatform = self.haskellPlatform_2010_1_0_0;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
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 =
@@ -415,7 +410,6 @@
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
text = self.text_0_11_0_6;
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 =
@@ -1502,10 +1496,7 @@
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix
{
inherit (pkgs) zlib;
};
- zlib_0_5_3_2 = callPackage ../development/libraries/haskell/zlib/0.5.3.2.nix
{
- inherit (pkgs) zlib;
- };
- zlib = self.zlib_0_5_3_2;
+ zlib = self.zlib_0_5_3_1;
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
