aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-02-27 11:15:09 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-02-27 11:15:09 -0400
commit76fc350395290f51ef6c0e6bbf5c97080eb5b644 (patch)
tree6749e4dc4aeacbf58a233b85ab34904e368de72c
parentb01723f718408f298a0420c4632ab7637fffdeb0 (diff)
move resourcet dependency out of S3 only; needed by database code
-rw-r--r--git-annex.cabal4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 7f2c50b80..d5835890a 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -112,7 +112,7 @@ Executable git-annex
data-default, case-insensitive, http-conduit, http-types,
cryptohash (>= 0.10.0),
esqueleto, persistent-sqlite, persistent, persistent-template,
- monad-logger
+ monad-logger, resourcet
CC-Options: -Wall
GHC-Options: -Wall
Extensions: PackageImports
@@ -150,7 +150,7 @@ Executable git-annex
Build-Depends: regex-compat
if flag(S3)
- Build-Depends: conduit, resourcet, conduit-extra, aws (>= 0.9.2), http-client
+ Build-Depends: conduit, conduit-extra, aws (>= 0.9.2), http-client
CPP-Options: -DWITH_S3
if flag(WebDAV)