diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-09-18 14:36:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-09-18 14:36:20 -0400 |
| commit | 2ba86dcb3dd049f592235bcbcb45a6f05c2a13f6 (patch) | |
| tree | d5cccc978e7b4bf5171a93c7cb5a314b891bb6b8 /git-annex.cabal | |
| parent | b9343ca1d3e0c7e136f7894cd159edb1d0730a0a (diff) | |
| parent | 7255a3267c3728822698aafcf5b9d597b17dc9a4 (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
Utility/Url.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 6e57dd1f4..425bc3f90 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140717 +Version: 5.20140916 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> @@ -92,12 +92,16 @@ 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.5), transformers, + base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3), data-default, case-insensitive, http-conduit, http-types @@ -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 @@ -123,7 +132,7 @@ Executable git-annex if flag(TestSuite) Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun, - optparse-applicative, crypto-api + optparse-applicative (>= 0.9.1), crypto-api CPP-Options: -DWITH_TESTSUITE if flag(TDFA) @@ -141,7 +150,7 @@ Executable git-annex CPP-Options: -DWITH_S3 if flag(WebDAV) - Build-Depends: DAV (>= 1.0) + Build-Depends: DAV (>= 1.0), http-client CPP-Options: -DWITH_WEBDAV if flag(Assistant) && ! os(solaris) |