From 1f2b00ee3b4a32c173802ba5d072fbb260bd32ba Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 8 Sep 2017 07:57:07 -0700
Subject: [PATCH] stack: update stackage configs for 3 ghcs, switch to 8.2.1 as
 default

Building with same GHC as stackage nightly is a good idea for noticing
problems keeping us out of stackage. make test-stackage is a start at
checking for stackage problems with the last three GHC versions.
---
 Makefile        | 18 ++++++++++++++++++
 stack.yaml      | 10 +++++-----
 stack7.10.yaml  | 30 ++++++++++++++++++++++++++++++
 stack8.0.yaml   | 14 ++++++++++++++
 stack8.2.1.yaml | 14 --------------
 5 files changed, 67 insertions(+), 19 deletions(-)
 create mode 100644 stack7.10.yaml
 create mode 100644 stack8.0.yaml
 delete mode 100644 stack8.2.1.yaml

diff --git a/Makefile b/Makefile
index 12a0f4537..f93c640ba 100644
--- a/Makefile
+++ b/Makefile
@@ -579,6 +579,24 @@ travistest: \
 	sh -e bin/compile.sh
 	make functest
 
+STACKTESTACTION=test
+#STACKTESTACTION=bench
+#STACKTESTACTION=build
+#STACKTESTACTION=build --dry-run
+
+test-stackage: \
+	test-stackage-ghc710 \
+	test-stackage-ghc80 \
+	test-stackage-ghc82 \
+
+test-stackage-ghc710:
+	stack --stack-yaml stack7.10.yaml $(STACKTESTACTION)
+
+test-stackage-ghc80:
+	stack --stack-yaml stack8.0.yaml $(STACKTESTACTION)
+
+test-stackage-ghc82:
+	stack --stack-yaml stack.yaml $(STACKTESTACTION)
 
 # test-ghc-%: # bin/hledgerdev.ghc-$* \
 # 	$(call def-help,test-ghc-%,\
diff --git a/stack.yaml b/stack.yaml
index 370ae1e93..db3ecd7c5 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,14 +1,14 @@
-# stack build plan using GHC 8.0.2 (osx sierra compatible)
-# keep synced with download.md
+# stack build plan using GHC 8.2.1
+# keep synced with download.md ?
 
-resolver: lts-9.0
+resolver: nightly-2017-09-07
 
 extra-deps:
- []
+- wai-handler-launch-3.0.2.3
 
 packages:
 - hledger-lib
 - hledger
 - hledger-ui
 - hledger-web
-- hledger-api
+- hledger-api
\ No newline at end of file
diff --git a/stack7.10.yaml b/stack7.10.yaml
new file mode 100644
index 000000000..025310f49
--- /dev/null
+++ b/stack7.10.yaml
@@ -0,0 +1,30 @@
+# stack build plan using GHC 7.10.3
+# keep synced with download.md
+
+resolver: lts-6.35
+
+extra-deps:
+- attoparsec-iso8601-1.0.0.0
+- brick-0.24.2
+- cpphs-1.20.8
+- data-clist-0.1.2.0
+- http-api-data-0.3.7.1
+- megaparsec-5.3.1
+- natural-transformation-0.4
+- parser-combinators-0.2.0
+- persistent-2.7.0
+- persistent-template-2.5.2
+- servant-0.11
+- servant-server-0.11
+- text-zipper-0.10
+- th-orphans-0.13.4
+- vty-5.17.1
+- word-wrap-0.4.1
+- yesod-persistent-1.4.2
+
+packages:
+- hledger-lib
+- hledger
+- hledger-ui
+- hledger-web
+- hledger-api
diff --git a/stack8.0.yaml b/stack8.0.yaml
new file mode 100644
index 000000000..64f5dcfd2
--- /dev/null
+++ b/stack8.0.yaml
@@ -0,0 +1,14 @@
+# stack build plan using GHC 8.0.2 (this or newer required for osx sierra+)
+# keep synced with download.md
+
+resolver: lts-9.3
+
+extra-deps:
+ []
+
+packages:
+- hledger-lib
+- hledger
+- hledger-ui
+- hledger-web
+- hledger-api
diff --git a/stack8.2.1.yaml b/stack8.2.1.yaml
deleted file mode 100644
index 55c2be1c7..000000000
--- a/stack8.2.1.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# stack build plan using GHC 8.2.1
-# keep synced with download.md ?
-
-resolver: nightly-2017-09-05
-
-extra-deps:
-- wai-handler-launch-3.0.2.3
-
-packages:
-- hledger-lib
-- hledger
-- hledger-ui
-- hledger-web
-- hledger-api
\ No newline at end of file