summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-10-21 16:34:38 +0000
committerPeter Simons <simons@cryp.to>2011-10-21 16:34:38 +0000
commite98852cefda2b8428998fb14a485bc5d3df9ecee (patch)
treebd52ad9628439c0ba4ade6d1e8b250bfd4926a4c /pkgs/applications/version-management/git-and-tools
parent9704af30c37895a44dde127ea13a8d01e66f1aed (diff)
downloadnixpkgs-e98852cefda2b8428998fb14a485bc5d3df9ecee.tar
nixpkgs-e98852cefda2b8428998fb14a485bc5d3df9ecee.tar.gz
nixpkgs-e98852cefda2b8428998fb14a485bc5d3df9ecee.tar.bz2
nixpkgs-e98852cefda2b8428998fb14a485bc5d3df9ecee.tar.lz
nixpkgs-e98852cefda2b8428998fb14a485bc5d3df9ecee.tar.xz
nixpkgs-e98852cefda2b8428998fb14a485bc5d3df9ecee.tar.zst
nixpkgs-e98852cefda2b8428998fb14a485bc5d3df9ecee.zip
git-annex: updated to version 3.20111011
svn path=/nixpkgs/trunk/; revision=29964
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix3
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-annex/default.nix4
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 7513a7adbc7..153ff2f03e9 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -48,8 +48,7 @@ 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 = haskellPackages.QuickCheck_2_4_0_1;
+      HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2;
   };
 
   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 848214b0fb9..5fdf9f43bb1 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.20110915";
+  version = "3.20111011";
 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 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47";
+    sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c";
   };
 
   buildInputs = [