summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 18:00:24 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 18:01:23 -0400
commit9224fce38034d23501038dfe07a434f5554e3b2c (patch)
tree726690314dcd84789fd2fe899f98e8771741d76e
parent9e5dd34879e932129f39f000cd841df71afef08e (diff)
Revert "stack.yaml: Update to lts-7.0 (ghc 8)"
This reverts commit 1f51e4c31db44507d31447ac7d63406918738807. This broke the i386ancient autobuilder due to its use of --flag git-annex:XMPP --flag=git-annex:dbus -- Failure when adding dependencies: fdo-notify: needed ((>=0.3)), stack configuration has no specified version (latest applicable is 0.3.1) gnutls: needed ((>=0.1.4)), stack configuration has no specified version (latest applicable is 0.2) network-protocol-xmpp: needed (-any), stack configuration has no specified version (latest applicable is 0.4.8) OSX autobuilder also seems hosed by it, so too soon. De-revert later..
-rw-r--r--CHANGELOG1
-rw-r--r--stack.yaml11
2 files changed, 2 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f07f6fd99..d28ef5829 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 7d2bf11cb..c05ecb3b0 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