move dep on http-client to main dep list, since Utility.Url uses it

diff --git a/doc/install/fromsource/comment_52_df7d36e4d169fbc4199026d7af1aa581._comment b/doc/install/fromsource/comment_52_df7d36e4d169fbc4199026d7af1aa581._comment
new file mode 100644 (file)
index 0000000..42a519c
--- /dev/null
+++ b/doc/install/fromsource/comment_52_df7d36e4d169fbc4199026d7af1aa581._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 52"""
+ date="2015-11-06T16:48:16Z"
+ content="""
+@reyman64 missing dependency on http-client in that configuration.
+I've fixed this in git.
+"""]]

diff --git a/git-annex.cabal b/git-annex.cabal
index ff8fd3e5d9c8a1b5cbe9ff5453efecc120e77602..5d7c3d855fa0e201d6abb30129ffb4870c1c71c3 100644 (file)
--- 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)