haskell-git-annex: update to version 5.20140817

1 files changed, 24 insertions, 31 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 8fe78d6f825..62132271ec9 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
@@ -3,45 +3,38 @@
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
 , caseInsensitive, clientsession, cryptoApi, cryptohash, curl
 , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
-, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git
-, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
-, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
-, monadControl, mtl, network, networkInfo, networkMulticast
-, 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
-, fsnotify
+, exceptions, fdoNotify, feed, filepath, git, gnupg1, gnutls
+, hamlet, hinotify, hS3, hslogger, httpClient, httpConduit
+, httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl
+, network, networkInfo, networkMulticast, 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.20140717";
-  sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl";
+  version = "5.20140817";
+  sha256 = "0cly19rd250qiikzszgad2r5xz570kr00vcb8ij6icbm53pw3hxc";
   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
-    httpConduit httpTypes IfElse json liftedBase MissingH monadControl
-    mtl network networkInfo networkMulticast networkProtocolXmpp
-    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
-  ] ++ (if self.stdenv.isDarwin then [
-    fsnotify
-  ] else [
-    dbus fdoNotify hinotify
-  ]);
+    clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
+    dlist dns editDistance exceptions fdoNotify feed filepath gnutls
+    hamlet hinotify hS3 hslogger httpClient httpConduit httpTypes
+    IfElse json MissingH monadControl mtl network networkInfo
+    networkMulticast networkProtocolXmpp 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 = "-fAssistant -fProduction";
   preConfigure = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"
@@ -57,6 +50,6 @@ cabal.mkDerivation (self: {
     description = "manage files with git, without checking their contents into git";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = with self.stdenv.lib.maintainers; [ simons ];
   };
 })