summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <id@joeyh.name>2014-12-03 15:09:18 -0400
committerGravatar Joey Hess <id@joeyh.name>2014-12-03 15:09:18 -0400
commitc868500c7647f37c133ec0457e0cf0dac76ee151 (patch)
treebea359e2b78e47d1f8b0b3fc2596b6aeb1252edc /git-annex.cabal
parentd53d14a278959b2a66790c52f97e817aec8b2ab8 (diff)
remove PatchedAWS flag
Now that deps are sorted out in hackage, cabal is unlikely to try to install a too old AWS, so I don't think this flag is worth the bother of being completely correct with the dependency versioning. This avoids me needing to enable to flag on the autobuilders..
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal10
1 files changed, 1 insertions, 9 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index cc5b6c884..4433faee9 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -34,10 +34,6 @@ Description:
Flag S3
Description: Enable S3 support
-Flag PatchedAWS
- Description: Building on system, like Debian, with old AWS patched to support git-annex
- Default: False
-
Flag WebDAV
Description: Enable WebDAV support
@@ -155,11 +151,7 @@ Executable git-annex
CPP-Options: -DWITH_CRYPTOHASH
if flag(S3)
- Build-Depends: conduit, resourcet, conduit-extra
- if flag(PatchedAWS)
- Build-Depends: aws (>= 0.9.2)
- else
- Build-Depends: aws (>= 0.10.4)
+ Build-Depends: conduit, resourcet, conduit-extra, aws (>= 0.9.2)
CPP-Options: -DWITH_S3
if flag(WebDAV)