summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-07-14 11:00:47 +0200
committerPeter Simons <simons@cryp.to>2014-07-14 17:33:50 +0200
commitaf88d71b55be62828d7355d48d69c5c744fc738a (patch)
treeb88508e3f061fc20b2479758acdc646d8d1e58c8 /pkgs/applications/version-management
parent78c7ea2c8f66f7c147ac7935420513b2f8eecd60 (diff)
downloadnixpkgs-af88d71b55be62828d7355d48d69c5c744fc738a.tar
nixpkgs-af88d71b55be62828d7355d48d69c5c744fc738a.tar.gz
nixpkgs-af88d71b55be62828d7355d48d69c5c744fc738a.tar.bz2
nixpkgs-af88d71b55be62828d7355d48d69c5c744fc738a.tar.lz
nixpkgs-af88d71b55be62828d7355d48d69c5c744fc738a.tar.xz
nixpkgs-af88d71b55be62828d7355d48d69c5c744fc738a.tar.zst
nixpkgs-af88d71b55be62828d7355d48d69c5c744fc738a.zip
haskell-git-annex: update to version 5.20140709
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-annex/default.nix30
1 files changed, 18 insertions, 12 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 59bcda0c29e..b4acd0e854e 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
@@ -10,20 +10,20 @@
 , 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
+, yesodCore, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140707";
-  sha256 = "1m78125w6mq532ngfksrwj3s43qj7wyp756f6qxcqg1cl71xh34k";
+  version = "5.20140709";
+  sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
   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
@@ -31,13 +31,19 @@ cabal.mkDerivation (self: {
     tastyRerun text time transformers unixCompat utf8String uuid wai
     waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
     yesodForm yesodStatic
-  ] ++ (if (!self.stdenv.isDarwin) then [
-    dbus fdoNotify hinotify
-  ] else [
-    fsnotify
-  ]);
+  ];
   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"