summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-06 12:54:23 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-06 12:54:23 -0400
commit3d8fc3d9bfeb7be3edee5cd69e2bd8bc4bcad080 (patch)
tree5db3d3b094512f930c7f097935256d7e7e049e11 /git-annex.cabal
parent7c06f2e40b302af4f81f08fa9521c3e063dfa120 (diff)
move dep on http-client to main dep list, since Utility.Url uses it
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index ff8fd3e5d..5d7c3d855 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -128,7 +128,7 @@ Executable git-annex
utf8-string, bytestring, text, sandi, json,
monad-control, transformers,
bloomfilter, edit-distance,
- resourcet, http-conduit, http-types,
+ resourcet, http-conduit, http-client, http-types,
time, old-locale
CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs
@@ -179,11 +179,11 @@ Executable git-annex
Build-Depends: regex-compat
if flag(S3)
- Build-Depends: conduit, conduit-extra, aws (>= 0.9.2), http-client
+ Build-Depends: conduit, conduit-extra, aws (>= 0.9.2)
CPP-Options: -DWITH_S3
if flag(WebDAV)
- Build-Depends: DAV (>= 1.0), http-client
+ Build-Depends: DAV (>= 1.0)
CPP-Options: -DWITH_WEBDAV
if flag(Assistant) && ! os(solaris)