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

[Peter Simons]

Author: simons
Date: Sat Sep  3 13:17:36 2011
New Revision: 28996
URL: https://svn.nixos.org/websvn/nix/?rev=28996&sc=1

Log:
git-annex: updated to version 3.20110902

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    
    Sat Sep  3 13:17:29 2011        (r28995)
+++ 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix    
    Sat Sep  3 13:17:36 2011        (r28996)
@@ -48,7 +48,7 @@
   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;
+      HTTP testpack monadControl hS3 mtl network hslogger hxt json;
     QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
   };
 

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
      Sat Sep  3 13:17:29 2011        (r28995)
+++ 
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
      Sat Sep  3 13:17:36 2011        (r28996)
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, 
utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which
-, monadControl }:
+{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, 
hxt
+, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
+, QuickCheck2, rsync, SHA, testpack, utf8String, which
+}:
 
 let
-  version = "3.20110819";
+  version = "3.20110902";
 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 = 
"1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943";
+    sha256 = "1flw3472g19v6ins1nv66m51w15131013077yvfh2blywm0pqrl0";
   };
 
-  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String 
QuickCheck2 pcreLight
-    SHA dataenc HTTP testpack git ikiwiki which monadControl];
+  buildInputs = [
+    curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
+    libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
+    rsync SHA testpack utf8String which
+  ];
 
   checkTarget = "test";
   doCheck = true;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits