summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Alper Nebi Yasak <alpernebiyasak@gmail.com>2016-12-10 15:24:27 +0300
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-10 10:45:52 -0400
commitcb5724155e20f247c3d4a987aa6635a8e5de039a (patch)
treeb830e7f95dfc538c7745d0353f0a098a11df7944 /git-annex.cabal
parentd7b969b0835e7a2b5046c62b7f40a4089c4cc760 (diff)
Remove http-conduit (<2.2.0) constraint
Since https://github.com/aristidb/aws/issues/206 is resolved, this constraint is no longer necessary. However, http-conduit (>=2.2.0) requires http-client (>=0.5.0) which introduces some breaking changes. This commit also implements those changes depending on the version. Fixes: https://git-annex.branchable.com/bugs/Build_with_aws_head_fails/ Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index ec54a146d..83d45a1d9 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -357,8 +357,7 @@ Executable git-annex
resourcet,
http-client,
http-types,
- -- Old version needed due to https://github.com/aristidb/aws/issues/206
- http-conduit (<2.2.0),
+ http-conduit,
time,
old-locale,
esqueleto,