public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Darcs updated to 2.4.1; now ghc-6.12-compatible.

Browse Source 
svn path=/nixpkgs/trunk/; revision=21355
This commit is contained in:
Andres Löh 2010-04-27 19:51:37 +00:00
parent 375900a6e7
commit f892a8efaa
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/version-management/darcs/darcs-2.nix
View File

@ -1,16 +1,20 @@
{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage} : {cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage, zlib} :
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "darcs"; pname = "darcs";
name = self.fname; name = self.fname;
version = "2.3.1"; version = "2.4.1";
sha256 = "14821bb2db4975cb4db2c5cc4f085069b936da591b7b71592befc9e07f17d214"; sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa";
extraBuildInputs = [html parsec regexCompat curl haskeline hashedStorage]; extraBuildInputs = [
html parsec regexCompat curl haskeline hashedStorage zlib
];
meta = { meta = {
homepage = http://darcs.net/; homepage = http://darcs.net/;
description = "Patch-based version management system"; description = "Patch-based version management system";
license = "GPL";
maintainers = [self.stdenv.lib.maintainers.andres];
}; };
}) })

9
pkgs/development/libraries/haskell/hashed-storage/default.nix
View File

@ -1,12 +1,13 @@
{cabal, mtl, zlib, mmap}: {cabal, mtl, zlib, mmap, binary, dataenc}:
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "hashed-storage"; pname = "hashed-storage";
version = "0.3.8"; version = "0.4.11";
sha256 = "1f379dcb00a56c0b330eeabb1f069ef294bcf1f3dc18980e93b8b228e577fdb1"; sha256 = "c719f9b86c5a517324ce3448fcb4b6377ccbfa085268b396bec47b8bbcfbde1b";
propagatedBuildInputs = [mtl zlib mmap]; propagatedBuildInputs = [mtl zlib mmap binary dataenc];
meta = { meta = {
description = "Hashed file storage support code"; description = "Hashed file storage support code";
maintainers = [self.stdenv.lib.maintainers.andres];
}; };
}) })

3
pkgs/top-level/haskell-packages.nix
View File

@ -261,7 +261,7 @@ rec {
}; };
hashedStorage = import ../development/libraries/haskell/hashed-storage { 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 { haskeline = import ../development/libraries/haskell/haskeline {
@ -940,6 +940,7 @@ rec {
darcs = import ../applications/version-management/darcs/darcs-2.nix { darcs = import ../applications/version-management/darcs/darcs-2.nix {
inherit cabal html mtl parsec regexCompat haskeline hashedStorage; inherit cabal html mtl parsec regexCompat haskeline hashedStorage;
zlib = zlib0520;
inherit (pkgs) curl; inherit (pkgs) curl;
}; };

2
pkgs/top-level/release.nix
View File

@ -423,11 +423,13 @@ with (import ./release-lib.nix);
}; };
haskellPackages_ghc6121 = { haskellPackages_ghc6121 = {
darcs = ghcSupported;
ghc = ghcSupported; ghc = ghcSupported;
haskellPlatform2010100 = linux; haskellPlatform2010100 = linux;
}; };
haskellPackages_ghc6122 = { haskellPackages_ghc6122 = {
darcs = ghcSupported;
ghc = ghcSupported; ghc = ghcSupported;
haskellPlatform2010100 = linux; haskellPlatform2010100 = linux;
}; };