diff options
| author | Peter Simons <simons@cryp.to> | 2011-11-05 00:03:44 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-11-05 00:03:44 +0000 |
| commit | a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27 (patch) | |
| tree | 976af7e08dc9768399ba5e47543edce10f2507a5 /pkgs/applications/version-management/git-and-tools | |
| parent | 16b52399c728b08d06ce42cff75dcfb587aa54f2 (diff) | |
| download | nixpkgs-a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27.tar nixpkgs-a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27.tar.gz nixpkgs-a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27.tar.bz2 nixpkgs-a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27.tar.lz nixpkgs-a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27.tar.xz nixpkgs-a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27.tar.zst nixpkgs-a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27.zip | |
git-annex: updated to version 3.20111025
svn path=/nixpkgs/trunk/; revision=30241
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 6319c3592c6..3f1593899c1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,7 +48,8 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2; + HTTP testpack monadControl hS3 mtl network hslogger hxt json; + QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 5fdf9f43bb1..937c2eecd72 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20111011"; + version = "3.20111025"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c"; + sha256 = "1ae0fd9551d3397d1b7e5bc1eba9aab47b803bac680c3d019ba6ef7cefe96d27"; }; buildInputs = [ |