summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar ilovezfs <ilovezfs@icloud.com>2016-08-09 08:14:53 -0700
committerGravatar Joey Hess <joeyh@joeyh.name>2016-09-05 19:39:19 -0400
commit15c054042f6582689fdac4d02dd8ba69505bb586 (patch)
tree53e46996b7303e57c1328db789303f13a28f6f70
parenteeb791347c0dc74661c5f2bd4a705e918e039fb2 (diff)
git-annex.cabal: persistent ==2.2.4.1
Simplify Solver's task by requesting version 2.2.4.1 of the persistent package instead of just providing the persistent < 2.5 constraint. With only the persistent < 2.5 constraint, and with --flags=s3\ webapp and --max-backjumps=10000, CI timed out after two hours with Solver still trying to find a solution. This is a follow-up to 2415b7cb, since there's been a regression in the situation between 6.20160619 and 6.20160808, probably simply because Hackage is a moving target.
-rw-r--r--git-annex.cabal2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index a18544914..c5f76165b 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -337,7 +337,7 @@ Executable git-annex
bloomfilter, edit-distance,
resourcet, http-conduit (<2.2.0), http-client, http-types,
time, old-locale,
- esqueleto, persistent-sqlite, persistent (<2.5), persistent-template,
+ esqueleto, persistent-sqlite, persistent (==2.2.4.1), persistent-template,
aeson,
unordered-containers,
feed,