From d943787ca787d32071643d5b94efa312fafe6ba8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 15 Nov 2016 11:19:57 -0400 Subject: unbreak all the autobuilders git-annex.cabal: Loosen bounds on persistent to allow 2.5, which on Debian has been patched to work with esqueleto. This may break cabal's resolver on non-Debian systems; if so, either use stack to build, or run cabal with --constraint='persistent ==2.2.4.1' Hopefully this mess with esqueleto will be resolved soon. https://github.com/prowdsponsor/esqueleto/issues/137 --- CHANGELOG | 11 +++++++++++ git-annex.cabal | 5 +---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 273bf520e..33f434df4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +git-annex (6.20161112) UNRELEASED; urgency=medium + + * git-annex.cabal: Loosen bounds on persistent to allow 2.5, which + on Debian has been patched to work with esqueleto. + This may break cabal's resolver on non-Debian systems; + if so, either use stack to build, or run cabal with + --constraint='persistent ==2.2.4.1' + Hopefully this mess with esqueleto will be resolved soon. + + -- Joey Hess Tue, 15 Nov 2016 11:15:27 -0400 + git-annex (6.20161111) unstable; urgency=medium * Restarting a crashing git process could result in filename encoding diff --git a/git-annex.cabal b/git-annex.cabal index 65abc8d32..46b08d22d 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -359,10 +359,7 @@ Executable git-annex old-locale, esqueleto, persistent-sqlite, - -- Old version needed due to - -- https://github.com/prowdsponsor/esqueleto/issues/137 - -- and also temporarily to make ghc 8 builds work - persistent (< 2.5), + persistent, persistent-template, aeson, unordered-containers, -- cgit v1.2.3