about 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>2012-11-21 12:29:12 +0100
committerPeter Simons <simons@cryp.to>2012-11-21 12:30:54 +0100
commit9ada368ef842d5bc52d0db0b92ee0217cc213a83 (patch)
tree65bc0d76f231c89ceb485ccba53734268cd10f54 /pkgs/applications/version-management/git-and-tools
parent5407af5c143dc575aece93facfa6b785813541c0 (diff)
downloadnixlib-9ada368ef842d5bc52d0db0b92ee0217cc213a83.tar
nixlib-9ada368ef842d5bc52d0db0b92ee0217cc213a83.tar.gz
nixlib-9ada368ef842d5bc52d0db0b92ee0217cc213a83.tar.bz2
nixlib-9ada368ef842d5bc52d0db0b92ee0217cc213a83.tar.lz
nixlib-9ada368ef842d5bc52d0db0b92ee0217cc213a83.tar.xz
nixlib-9ada368ef842d5bc52d0db0b92ee0217cc213a83.tar.zst
nixlib-9ada368ef842d5bc52d0db0b92ee0217cc213a83.zip
git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-annex/default.nix10
2 files changed, 6 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 59d85a4ddaa0..9f52871547a4 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -49,7 +49,7 @@ rec {
       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
-      SafeSemaphore networkPprotocolXmpp async dns;
+      SafeSemaphore networkPprotocolXmpp async dns DAV;
   };
 
   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 d8c72f1264c8..713cf0d62a61 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
@@ -8,18 +8,18 @@
 , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
 , transformers, transformersBase, utf8String, wai, waiLogger, warp
 , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
-, networkPprotocolXmpp, async, dns
+, networkPprotocolXmpp, async, dns, DAV
 }:
 
 let
-  version = "3.20121112";
+  version = "3.20121112-161-gb27d9eb";
 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 = "1ch91jvzm3di5p024kwx0ikgf588lk7bp36hlgj4ar9aa2fdl7yr";
+    url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;h=b27d9ebd0f63bdc449440f2529224d5b655ddbb3;sf=tgz";
+    sha256 = "507efc50e33566a51a6abf688920d30fc55ce984c9c35be085e6df0767686b3a";
     name = "git-annex-${version}.tar.gz";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
     transformers transformersBase utf8String wai waiLogger warp yesod
     yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
-    async dns ];
+    async dns DAV ];
 
   checkTarget = "test";
   doCheck = true;