diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix index dd54bfa112b..c399c523f89 100644 --- a/pkgs/applications/version-management/darcs/darcs-2.nix +++ b/pkgs/applications/version-management/darcs/darcs-2.nix @@ -1,16 +1,20 @@ -{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage} : +{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage, zlib} : cabal.mkDerivation (self : { pname = "darcs"; name = self.fname; - version = "2.3.1"; - sha256 = "14821bb2db4975cb4db2c5cc4f085069b936da591b7b71592befc9e07f17d214"; + version = "2.4.1"; + sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa"; - extraBuildInputs = [html parsec regexCompat curl haskeline hashedStorage]; + extraBuildInputs = [ + html parsec regexCompat curl haskeline hashedStorage zlib + ]; meta = { homepage = http://darcs.net/; description = "Patch-based version management system"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index de189369772..ff89b3b8f10 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -1,12 +1,13 @@ -{cabal, mtl, zlib, mmap}: +{cabal, mtl, zlib, mmap, binary, dataenc}: cabal.mkDerivation (self : { pname = "hashed-storage"; - version = "0.3.8"; - sha256 = "1f379dcb00a56c0b330eeabb1f069ef294bcf1f3dc18980e93b8b228e577fdb1"; - propagatedBuildInputs = [mtl zlib mmap]; + version = "0.4.11"; + sha256 = "c719f9b86c5a517324ce3448fcb4b6377ccbfa085268b396bec47b8bbcfbde1b"; + propagatedBuildInputs = [mtl zlib mmap binary dataenc]; meta = { description = "Hashed file storage support code"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 425b6754a11..c94ee35b784 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -261,7 +261,7 @@ rec { }; hashedStorage = import ../development/libraries/haskell/hashed-storage { - inherit cabal mtl zlib mmap; + inherit cabal mtl zlib mmap binary dataenc; }; haskeline = import ../development/libraries/haskell/haskeline { @@ -940,6 +940,7 @@ rec { darcs = import ../applications/version-management/darcs/darcs-2.nix { inherit cabal html mtl parsec regexCompat haskeline hashedStorage; + zlib = zlib0520; inherit (pkgs) curl; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 6e6a0a12df9..a0a33abbea4 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -423,11 +423,13 @@ with (import ./release-lib.nix); }; haskellPackages_ghc6121 = { + darcs = ghcSupported; ghc = ghcSupported; haskellPlatform2010100 = linux; }; haskellPackages_ghc6122 = { + darcs = ghcSupported; ghc = ghcSupported; haskellPlatform2010100 = linux; };