From a2df0e09ff226eae4fe0afc7b404dd57281d2dc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 7 Feb 2012 10:34:28 +0000
Subject: [PATCH] haskell-zlib: added version 0.5.3.3
svn path=/nixpkgs/trunk/; revision=32101
---
.../libraries/haskell/zlib/0.5.3.3.nix | 17 +++++++++++++++++
pkgs/top-level/haskell-packages.nix | 7 +++++--
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
new file mode 100644
index 000000000000..909754db3e7f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
@@ -0,0 +1,17 @@
+{ cabal, zlib }:
+
+cabal.mkDerivation (self: {
+ pname = "zlib";
+ version = "0.5.3.3";
+ sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2";
+ 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
+ ];
+ };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 294fa00d17d1..b1e44ecb0bea 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
stm = self.stm_2_2_0_1; # 7.4.1 ok
syb = self.syb_0_3_6; # 7.4.1 ok
xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok
- zlib = self.zlib_0_5_3_1; # 7.4.1 ok
+ zlib = self.zlib_0_5_3_3; # 7.4.1 ok
HTTP = self.HTTP_4000_2_2; # 7.4.1 ok
text = self.text_0_11_1_13; # 7.4.1 ok
transformers = self.transformers_0_2_2_0; # 7.4.1 ok
@@ -1520,7 +1520,10 @@ 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 {
inherit (pkgs) zlib;
};
- zlib = self.zlib_0_5_3_1;
+ zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix {
+ inherit (pkgs) zlib;
+ };
+ zlib = self.zlib_0_5_3_3;
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};