Author: simons
Date: Fri Jan 27 20:31:03 2012
New Revision: 31894
URL: https://nixos.org/websvn/nix/?rev=31894&sc=1
Log:
haskell-zlib: added version 0.5.3.2
This version is disabled for all versions of GHC older than 7.2, because
it won't build. Upstream has been notified.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.3.2.nix Fri Jan
27 20:31:03 2012 (r31894)
@@ -0,0 +1,17 @@
+{ 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
+ ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Jan 27 20:31:00
2012 (r31893)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Jan 27 20:31:03
2012 (r31894)
@@ -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_1; # 7.2 ok, 7.3 ok
+ zlib = self.zlib_0_5_3_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
text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok
@@ -210,6 +210,7 @@
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 =
@@ -252,6 +253,7 @@
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 =
@@ -294,6 +296,7 @@
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 =
@@ -332,6 +335,7 @@
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
};
@@ -371,6 +375,7 @@
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 =
@@ -410,6 +415,7 @@
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 =
@@ -1486,7 +1492,10 @@
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix
{
inherit (pkgs) zlib;
};
- zlib = self.zlib_0_5_0_0;
+ 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;
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
