haskell-git-annex: update to version 5.20140717

1 files changed, 28 insertions, 24 deletions

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 0983ca913865..07b09d37a2fd 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,41 +7,45 @@
 , gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
 , httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
 , monadControl, mtl, network, networkInfo, networkMulticast
-, networkProtocolXmpp, openssh, optparseApplicative, perl
-, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
-, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
-, tastyRerun, text, time, transformers, unixCompat, utf8String
-, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod
-, yesodCore, yesodDefault, yesodForm, yesodStatic
-, fsnotify
+, networkProtocolXmpp, openssh, optparseApplicative, pathPieces
+, perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore
+, securemem, SHA, shakespeare, stm, tasty, tastyHunit
+, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat
+, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes
+, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140709";
-  sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
+  version = "5.20140717";
+  sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter byteable caseInsensitive
-    clientsession cryptoApi cryptohash dataDefault dataenc DAV
-    dlist dns editDistance exceptions extensibleExceptions
-    feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
+    clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
+    dlist dns editDistance exceptions extensibleExceptions fdoNotify
+    feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient
     httpConduit httpTypes IfElse json liftedBase MissingH monadControl
     mtl network networkInfo networkMulticast networkProtocolXmpp
-    optparseApplicative QuickCheck random regexTdfa SafeSemaphore
-    securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck
-    tastyRerun text time transformers unixCompat utf8String uuid wai
-    waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
-    yesodForm yesodStatic
-  ] ++ (if self.stdenv.isDarwin then [
-    fsnotify
-  ] else [
-    dbus fdoNotify hinotify
-  ]);
+    optparseApplicative pathPieces QuickCheck random regexTdfa
+    SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
+    tastyQuickcheck tastyRerun text time transformers unixCompat
+    utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
+    yesodDefault yesodForm yesodStatic
+  ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
-  configureFlags = "-fAssistant
-                    -fProduction";
+  configureFlags = "-fS3
+                    -fWebDAV
+                    -fInotify
+                    -fDbus
+                    -fAssistant
+                    -fWebapp
+                    -fPairing
+                    -fXMPP
+                    -fDNS
+                    -fProduction
+                    -fTDFA";
   preConfigure = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"