From 3fac05bf5e8843402d93451fcf340e9d094cf53c Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Tue, 9 Aug 2016 08:14:53 -0700 Subject: [PATCH] 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 18e458db, since there's been a regression in the situation between 6.20160619 and 6.20160808, probably simply because Hackage is a moving target. --- git-annex.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-annex.cabal b/git-annex.cabal index a18544914c..c5f76165b6 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,