diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:40 -0400 |
| commit | 022e81407e7d806100a0882c0f23067a88b4900a (patch) | |
| tree | b8035dc47239d6b687aa83adef0d45e11ac65969 /git-annex.cabal | |
| parent | 52089bbe73d95c5a2c06a3c58c507129335e5580 (diff) | |
| parent | e9128138ef1e19a341d7edfda4db2d6b1f8f6b0a (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
git-annex.cabal
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index b05863b79..b0835f50a 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -96,11 +96,11 @@ Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, containers, utf8-string, network (>= 2.0), mtl (>= 2), - bytestring, old-locale, time, HTTP, dataenc, SHA, process, json, + bytestring, old-locale, time, dataenc, SHA, process, json, base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.5), transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3), - data-default, case-insensitive + data-default, case-insensitive, http-conduit, http-types CC-Options: -Wall GHC-Options: -Wall Extensions: PackageImports @@ -111,7 +111,7 @@ Executable git-annex GHC-Options: -O2 if (os(windows)) - Build-Depends: Win32, Win32-extras + Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3) C-Sources: Utility/winprocess.c else Build-Depends: unix @@ -137,12 +137,11 @@ Executable git-annex CPP-Options: -DWITH_CRYPTOHASH if flag(S3) - Build-Depends: aws, conduit, resourcet, - http-conduit, http-client, http-types + Build-Depends: aws, conduit, resourcet CPP-Options: -DWITH_S3 if flag(WebDAV) - Build-Depends: DAV (>= 1.0), http-client, http-types + Build-Depends: DAV (>= 1.0) CPP-Options: -DWITH_WEBDAV if flag(Assistant) && ! os(solaris) @@ -188,7 +187,7 @@ Executable git-annex if flag(Webapp) Build-Depends: yesod, yesod-default, yesod-static, yesod-form, yesod-core, - http-types, wai, wai-extra, warp, warp-tls, + wai, wai-extra, warp, warp-tls, blaze-builder, crypto-api, hamlet, clientsession, template-haskell, data-default, aeson, path-pieces, shakespeare |