diff --git a/CHANGELOG b/CHANGELOG index f07f6fd997..d28ef58299 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,7 +12,6 @@ git-annex (6.20160908) UNRELEASED; urgency=medium * copy, move, mirror: Support --json and --json-progress. * Improve gpg secret key list parser to deal with changes in gpg 2.1.15. Fixes key name display in webapp. - * stack.yaml: Update to lts-7.0 (ghc 8) * info: Support being passed a treeish, and show info about the annexed files in it similar to how a directory is handled. * sync: Previously, when run in a branch with a slash in its name, diff --git a/stack.yaml b/stack.yaml index 7d2bf11cbc..c05ecb3b0e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,15 +18,8 @@ flags: androidsplice: false packages: - '.' +resolver: lts-5.18 extra-deps: -- bloomfilter-2.0.1.0 -- esqueleto-2.4.3 -- network-multicast-0.1.1 -- persistent-2.2.4.1 -- persistent-sqlite-2.2.1 -- persistent-template-2.1.8.1 -- torrent-10000.0.0 -- yesod-default-1.2.0 +- process-1.3.0.0 explicit-setup-deps: git-annex: true -resolver: lts-7.0