From 1a8eb3334f70065d281c7c798c1172ee5f56c941 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Oct 2012 11:26:30 -0400 Subject: deal with incompatable api change in network 2.4.0.1 On the cabal side, let's just require this new version, and set -DURI_24 to enable the code using it. --- git-annex.cabal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'git-annex.cabal') diff --git a/git-annex.cabal b/git-annex.cabal index b372c3705..9586f8230 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -46,7 +46,8 @@ Flag Pairing Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, - unix, containers, utf8-string, network, mtl, bytestring, old-locale, time, + unix, containers, utf8-string, network (>= 2.4.0.1), mtl, + bytestring, old-locale, time, pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP, base == 4.5.*, monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process @@ -58,6 +59,7 @@ Executable git-annex C-Sources: Utility/libkqueue.c Extensions: CPP GHC-Options: -threaded + CPP-Options: -DURI_24 if flag(S3) Build-Depends: hS3 -- cgit v1.2.3