From d8202101888610f51ded4c4e330dc67c2c5a7623 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:43:55 +0200 Subject: [PATCH] haskell-zlib: add version 0.5.4.0 --- .../development/libraries/haskell/zlib/0.5.4.0.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/zlib/0.5.4.0.nix diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix new file mode 100644 index 000000000000..abeed295e035 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix @@ -0,0 +1,14 @@ +{ cabal, zlib }: + +cabal.mkDerivation (self: { + pname = "zlib"; + version = "0.5.4.0"; + sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1"; + 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 ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0667e073891a..cafe393821d2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text = self.text_0_11_2_3; # 7.6 ok transformers = self.transformers_0_3_0_0; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok - zlib = self.zlib_0_5_3_3; # 7.6 ok + zlib = self.zlib_0_5_4_0; # 7.6 ok cabalInstall = self.cabalInstall_0_14_0; # 7.6 ok alex = self.alex_3_0_1; # 7.6 ok haddock = self.haddock_2_12_0; # 7.6 ok @@ -1695,7 +1695,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; - zlib = self.zlib_0_5_3_3; + zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { + inherit (pkgs) zlib; + }; + zlib = self.zlib_0_5_4_0; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};