git-annex: update to version 3.20121112

2 files changed, 10 insertions, 5 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 98468e32bac..59d85a4ddaa 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 {
       blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl
       network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
       extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
-      transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck;
+      transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
+      SafeSemaphore networkPprotocolXmpp async dns;
   };
 
   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 79473242e89..d8c72f1264c 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
@@ -7,18 +7,19 @@
 , MissingH, monadControl, mtl, network, networkInfo
 , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
 , transformers, transformersBase, utf8String, wai, waiLogger, warp
-, yesod, yesodDefault, yesodStatic, testpack
+, yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
+, networkPprotocolXmpp, async, dns
 }:
 
 let
-  version = "3.20121017";
+  version = "3.20121112";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
-    sha256 = "1949efb22cd3154323ee00d3ab62b07158df4024283a67a53134a1fa2efa9841";
+    sha256 = "1ch91jvzm3di5p024kwx0ikgf588lk7bp36hlgj4ar9aa2fdl7yr";
     name = "git-annex-${version}.tar.gz";
   };
 
@@ -29,7 +30,8 @@ stdenv.mkDerivation {
     httpTypes IfElse json liftedBase MissingH monadControl mtl network
     networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
     transformers transformersBase utf8String wai waiLogger warp yesod
-    yesodDefault yesodStatic testpack ];
+    yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
+    async dns ];
 
   checkTarget = "test";
   doCheck = true;
@@ -39,6 +41,8 @@ stdenv.mkDerivation {
     makeFlagsArray=( PREFIX=$out )
     sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man
     sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
+    # Remove this patch after the next update!
+    sed -i -e '9i #define WITH_OLD_URI' Utility/Url.hs
   '';
 
   meta = {