From 81cb2c144c2fcd39f779d034c4fc9a3dad4c5b32 Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Wed, 3 Dec 2014 22:00:36 +0100
Subject: [PATCH] haskell-git-annex: update to version 5.20141203

---
 .../git-and-tools/git-annex/default.nix       | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 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 c10927b62559..9ae34d5a5ec5 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
@@ -1,37 +1,38 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
-, caseInsensitive, clientsession, cryptoApi, cryptohash, curl
-, dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
-, exceptions, fdoNotify, feed, filepath, git, gnupg1, gnutls
-, hamlet, hinotify, hS3, hslogger, httpClient, httpConduit
-, httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl
-, network, networkInfo, networkMulticast, networkProtocolXmpp
-, networkUri, 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, aeson, async, aws, blazeBuilder, bloomfilter, bup
+, byteable, caseInsensitive, clientsession, conduit, conduitExtra
+, cryptoApi, cryptohash, curl, dataDefault, dataenc, DAV, dbus
+, dlist, dns, editDistance, exceptions, fdoNotify, feed, filepath
+, git, gnupg1, gnutls, hamlet, hinotify, hslogger, httpClient
+, httpConduit, httpTypes, IfElse, json, lsof, MissingH
+, monadControl, mtl, network, networkInfo, networkMulticast
+, networkProtocolXmpp, networkUri, openssh, optparseApplicative
+, pathPieces, perl, QuickCheck, random, regexTdfa, resourcet, 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.20141125";
-  sha256 = "0rlsd3fri9iq8hrl98xyil3dgz6czxb3h5f8xjviin3lkm2x09ms";
+  version = "5.20141203";
+  sha256 = "01gifds86925vg7mh363i7qsii2wrgf3vpk3wgjff9rbb7z0fvfk";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    aeson async blazeBuilder bloomfilter byteable caseInsensitive
-    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
+    aeson async aws blazeBuilder bloomfilter byteable caseInsensitive
+    clientsession conduit conduitExtra cryptoApi cryptohash dataDefault
+    dataenc DAV dbus dlist dns editDistance exceptions fdoNotify feed
+    filepath gnutls hamlet hinotify hslogger httpClient httpConduit
+    httpTypes IfElse json MissingH monadControl mtl network networkInfo
     networkMulticast networkProtocolXmpp networkUri 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
+    pathPieces QuickCheck random regexTdfa resourcet 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";
@@ -47,6 +48,5 @@ 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 = with self.stdenv.lib.maintainers; [ simons ];
   };
 })