diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-09-13 12:02:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-09-13 12:02:02 -0400 |
| commit | c84b5c140c236e051c49487c4bcfb8d267bc6bc6 (patch) | |
| tree | c48b9c09c023fa9a6c3e33e8c7defcbf1e0dbbe1 | |
| parent | e74fb92d5220ba998d8d8da27f2d83ccfe9c6681 (diff) | |
deal with network-uri split, in a backwards-compatable way
| -rw-r--r-- | git-annex.cabal | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 8a9ab058a..8471a6b5e 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -92,10 +92,14 @@ Flag EKG Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/) Default: False +Flag network-uri + Description: Get Network.URI from the network-uri package + Default: True + Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, - containers, utf8-string, network (>= 2.0), mtl (>= 2), + containers, utf8-string, mtl (>= 2), bytestring, old-locale, time, dataenc, SHA, process, json, base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, @@ -107,6 +111,11 @@ Executable git-annex -- Some things don't work with the non-threaded RTS. GHC-Options: -threaded + if flag(network-uri) + Build-Depends: network-uri (>= 2.6), network (>= 2.6) + else + Build-Depends: network (< 2.6), network (>= 2.0) + if flag(Production) GHC-Options: -O2 |