From 0ec6325b87e5eec95067762f61670e1a4a084a58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 23:48:22 +0000
Subject: [PATCH] git-annex: updated to version 3.20110705

svn path=/nixpkgs/trunk/; revision=27661
---
 .../version-management/git-and-tools/default.nix    |  5 +++--
 .../git-and-tools/git-annex/default.nix             | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 6271ab408ef..69134f33cc3 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,8 +46,9 @@ rec {
   };
 
   gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl libuuid rsync findutils curl perl;
-    inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc;
+    inherit stdenv fetchurl libuuid rsync findutils curl perl git;
+    inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
+      HTTP testpack;
   };
 
   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 8fa4cba9a24..4d5feb94171 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
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String, QuickCheck2, pcreLight, SHA, dataenc }:
+{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
+, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git }:
 
 let
-  version = "0.20110427";
+  version = "3.20110705";
 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 = "1vbmkvf9hlnfcaqsyi1ay2rr835j49bxqyfdi3v3373pdfd6195z";
+    sha256 = "781b0c02f992e46f3c2555db803caed2a9bbd274a62fcebab3f596bfd7888c9a";
   };
 
-  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight SHA dataenc];
+  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
+    SHA dataenc HTTP testpack git];
+
+  checkTarget = "test";
+  doCheck = true;
 
   preConfigure = ''
     makeFlagsArray=( PREFIX=$out )