mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2015-11-06 12:54:23 -04:00
parent 013986b492
commit e96d9bbdb4
Failed to extract signature
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/install/fromsource/comment_52_df7d36e4d169fbc4199026d7af1aa581._comment Normal file
View file

@ -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.
"""]]

6
git-annex.cabal
View file

@ -128,7 +128,7 @@ Executable git-annex
utf8-string, bytestring, text, sandi, json, utf8-string, bytestring, text, sandi, json,
monad-control, transformers, monad-control, transformers,
bloomfilter, edit-distance, bloomfilter, edit-distance,
resourcet, http-conduit, http-types, resourcet, http-conduit, http-client, http-types,
time, old-locale time, old-locale
CC-Options: -Wall CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs GHC-Options: -Wall -fno-warn-tabs
@ -179,11 +179,11 @@ Executable git-annex
Build-Depends: regex-compat Build-Depends: regex-compat
if flag(S3) 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 CPP-Options: -DWITH_S3
if flag(WebDAV) if flag(WebDAV)
Build-Depends: DAV (>= 1.0), http-client Build-Depends: DAV (>= 1.0)
CPP-Options: -DWITH_WEBDAV CPP-Options: -DWITH_WEBDAV
if flag(Assistant) && ! os(solaris) if flag(Assistant) && ! os(solaris)