From bf47f4bbe39e7cf9b7443f64b12dc65f0dbf56bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Apr 2012 19:48:24 +0000 Subject: [PATCH] Updated Haskell packages. - HsOpenSSL: updated to version 0.10.2 - zip-archive: updated to version 0.1.1.8 svn path=/nixpkgs/trunk/; revision=33657 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- pkgs/development/libraries/haskell/zip-archive/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index a283acacd6d0..83bc8a227b74 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.1.4"; - sha256 = "1zrmngxm1xs51ql5za46lw6xkiyczx6qyvpami9k13g8k6kznqbz"; + version = "0.10.2"; + sha256 = "0bji31lb9n08ybzs23251q6afr32fjvzcjm7qs3fvy3r7bc3gqbf"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index a7029cc953e5..050d48280d2e 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.1.7"; - sha256 = "1q52v18kl1j049kk3yb7rp0k27p6q7r72mg1vcbdid6qd7a9dh48"; + version = "0.1.1.8"; + sha256 = "0rq4jk1sxi6lrc7d7sh500lh83v2fxxrfh2gknqiyzxd3wh364y1"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl utf8String zlib ]; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; - license = "GPL"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; };