From d344f04d0959af6f0a5d2f4e2ebcc3bab271a90e Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 22 Jul 2016 12:41:28 -0400
Subject: [PATCH] cabal constraints for aws and esqueleto
closes https://github.com/joeyh/git-annex/pull/55
* git-annex.cabal: Temporarily limit to http-conduit <2.2.0
since aws 0.14.0 is not compatible with the newer version.
* git-annex.cabal: Temporarily limit to persistent <2.5
since esqueleto 2.4.3 is not compatible with the newer version.
---
CHANGELOG | 4 ++++
doc/bugs/cabal_constraints_for_aws_and_esqueleto.mdwn | 3 +++
2 files changed, 7 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index efab17b424..79e4dc1bd0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,10 @@ git-annex (6.20160620) UNRELEASED; urgency=medium
* Added --branch option to copy, drop, fsck, get, metadata, mirror, move,
and whereis commands. This option makes git-annex operate on files that
are included in a specified branch (or other treeish).
+ * git-annex.cabal: Temporarily limit to http-conduit <2.2.0
+ since aws 0.14.0 is not compatible with the newer version.
+ * git-annex.cabal: Temporarily limit to persistent <2.5
+ since esqueleto 2.4.3 is not compatible with the newer version.
-- Joey Hess <id@joeyh.name> Wed, 20 Jul 2016 12:03:15 -0400
diff --git a/doc/bugs/cabal_constraints_for_aws_and_esqueleto.mdwn b/doc/bugs/cabal_constraints_for_aws_and_esqueleto.mdwn
index 19daf83dc3..4b47803262 100644
--- a/doc/bugs/cabal_constraints_for_aws_and_esqueleto.mdwn
+++ b/doc/bugs/cabal_constraints_for_aws_and_esqueleto.mdwn
@@ -23,3 +23,6 @@ esqueleto 2.4.3 is incompatible with persistent 2.5
https://github.com/prowdsponsor/esqueleto/issues/137
https://github.com/prowdsponsor/esqueleto/pull/141
https://github.com/prowdsponsor/esqueleto/pull/139
+
+> I assume this will be sorted out upstream, but I don't mind temporarily
+> adding the constraints. [[done]] --[[Joey]]