[Nix-commits] SVN commit: nix - r27661 - in nixpkgs/trunk/pkgs/applications/version-management/git-and-tools: . git-annex

[Peter Simons]

Author: simons
Date: Thu Jul  7 23:48:22 2011
New Revision: 27661
URL: https://svn.nixos.org/websvn/nix/?rev=27661&sc=1

Log:
git-annex: updated to version 3.20110705

Modified:
   nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
   
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix

Modified: 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==============================================================================
--- 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix    
    Thu Jul  7 23:48:17 2011        (r27660)
+++ 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix    
    Thu Jul  7 23:48:22 2011        (r27661)
@@ -46,8 +46,9 @@
   };
 
   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 {

Modified: 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
==============================================================================
--- 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
      Thu Jul  7 23:48:17 2011        (r27660)
+++ 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
      Thu Jul  7 23:48:22 2011        (r27661)
@@ -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 )
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits