From 89438059ab3e11691cbe8f24ab9e5612dcfbb5f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Sep 2014 20:54:05 +0200 Subject: [PATCH] haskell-git-annex: update to version 5.20140915 --- .../git-and-tools/git-annex/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 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 601e065bfff..bf5b8d51c37 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,18 +7,18 @@ , 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 +, 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.mkDerivation (self: { pname = "git-annex"; - version = "5.20140831"; - sha256 = "0s2pc8bm3c79dsbafwp2pc5yghzh6vdzs9sj0mfq6rxiv27wrrwq"; + version = "5.20140915"; + sha256 = "0csd16vqmr4s6x627ikkl8dz6hvr2grqkzjxh0hbkqrirfsxj0kk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -27,11 +27,11 @@ cabal.mkDerivation (self: { 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 + 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 ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fAssistant -fProduction"; @@ -48,6 +48,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ simons ]; - broken = true; }; })