From 45e9c9d63209cb05fa9670bb04d61ad5c4171d23 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 16 Jul 2017 07:24:03 +0100
Subject: [PATCH] stack, site: update stack yaml files, sync with download page

[ci skip]
---
 site/download.md      |  8 +++++---
 stack-ghc7.10.yaml    | 35 ++++++++++-------------------------
 stack-ghc7.8.yaml.old | 25 -------------------------
 stack-ghc8.0.1.yaml   | 16 ++++++++++++++++
 stack.yaml            | 10 +++++-----
 5 files changed, 36 insertions(+), 58 deletions(-)
 delete mode 100644 stack-ghc7.8.yaml.old
 create mode 100644 stack-ghc8.0.1.yaml

diff --git a/site/download.md b/site/download.md
index 3a1a115ff..db2418712 100644
--- a/site/download.md
+++ b/site/download.md
@@ -50,7 +50,7 @@ You have to build it, but this is relatively easy:
 
 2. **`stack install --resolver lts-8 hledger-lib-1.3 hledger-1.3 [hledger-ui-1.3] [hledger-web-1.3] [hledger-api-1.3]`**\   
    \
-   This command installs the specified hledger packages (and required haskell libraries and tools) from the latest [Stackage LTS](https://www.stackage.org) snapshot (and Hackage).
+   This command installs the specified hledger packages (and required haskell libraries and tools) from the latest [Stackage LTS](https://www.stackage.org) snapshot (and if needed, [Hackage](http://hackage.haskell.org)).
    It is reliable, but can take significant time (minutes to hours) and space (megabytes to a gigabyte) depending on your connection, machine and past installations.
    You can add `--dry-run` to see what it plans to do, and kill/restart it without losing progress.\
    You can omit the bracketed packages to save time, and maybe install them later. If you include them, don't type the brackets.
@@ -70,9 +70,11 @@ You have to build it, but this is relatively easy:
    (except on Mac Sierra which [requires at least GHC 8.0.2/lts-8](https://ghc.haskell.org/trac/ghc/ticket/12479)):\
    `stack install --resolver lts-7 hledger-lib-1.3 hledger-1.3 hledger-ui-1.3 hledger-web-1.3 hledger-api-1.3 brick-0.19 vty-5.15.1 data-clist-0.1.2.0`  # GHC 8.0.1 \
    `stack install --resolver lts-6 hledger-lib-1.3 hledger-1.3 hledger-ui-1.3 hledger-web-1.3 hledger-api-1.3 megaparsec-5.3.1 brick-0.19 vty-5.15.1 data-clist-0.1.2.0 text-zipper-0.10`  # GHC 7.10.3 \
+   <!-- keep synced with stack.yaml files -->
 
-Now you should be able to run `hledger --version` and see a version similar to the above
-(and `hledger-ui --version`, `hledger-web --version` etc. if you installed those).
+Now you should be able to run `hledger --version` 
+(and `hledger-ui --version`, `hledger-web --version` etc. if you installed those)
+and see the version you just installed.
 
 <!--(The exact steps depend on your OS, cabal version and expertise.)-->
 <!--
diff --git a/stack-ghc7.10.yaml b/stack-ghc7.10.yaml
index bb668988e..f8e65efbf 100644
--- a/stack-ghc7.10.yaml
+++ b/stack-ghc7.10.yaml
@@ -1,6 +1,14 @@
-# Last-tested stack build plan using GHC 7.10.3
+# stack build plan using GHC 7.10.3
+# keep synced with download.md
 
-resolver: lts-6.27
+resolver: lts-6.35
+
+extra-deps:
+- brick-0.19
+- data-clist-0.1.2.0
+- text-zipper-0.10
+- vty-5.15.1
+- megaparsec-5.3.1
 
 packages:
 - hledger-lib
@@ -8,26 +16,3 @@ packages:
 - hledger-ui
 - hledger-web
 - hledger-api
-
-extra-deps:
-- brick-0.19
-- data-clist-0.1.1.0
-- text-zipper-0.8.1
-- vty-5.11.3
-- megaparsec-5.1.2
-
-# latest as of 2017/2/4, untested:
-#resolver: lts-6.30
-#
-#packages:
-#- hledger-lib
-#- hledger
-#- hledger-ui
-#- hledger-web
-#- hledger-api
-#
-#extra-deps:
-#- megaparsec-5.2.0
-#- vty-5.15
-#- brick-0.17
-#- text-zipper-0.10
diff --git a/stack-ghc7.8.yaml.old b/stack-ghc7.8.yaml.old
deleted file mode 100644
index 9b2cbbead..000000000
--- a/stack-ghc7.8.yaml.old
+++ /dev/null
@@ -1,25 +0,0 @@
-# GHC 7.8 support has bitrotted; patches welcome.
-
-# stack build plan WIP:
-
-#resolver: lts-2.22
-#
-#packages:
-#- hledger-lib
-##- hledger
-##- hledger-ui
-##- hledger-web
-##- hledger-api
-#
-#extra-deps:
-#- base-compat-0.8.1
-#- time-1.5
-#- megaparsec-5.0.1
-#- uglymemo-0.1.0.1
-#- fail-4.9.0.0
-#- semigroups-0.18.2
-#- transformers-0.4.1.0
-#- transformers-compat-0.4.0.4
-#- mtl-2.2.1
-#- mtl-compat-0.2.1.3
-##- brick-0.8
diff --git a/stack-ghc8.0.1.yaml b/stack-ghc8.0.1.yaml
new file mode 100644
index 000000000..6f09034f2
--- /dev/null
+++ b/stack-ghc8.0.1.yaml
@@ -0,0 +1,16 @@
+# stack build plan using GHC 8.0.1
+# keep synced with download.md
+
+resolver: lts-7.24
+
+extra-deps:
+- brick-0.19
+- data-clist-0.1.1.0
+- vty-5.15.1
+
+packages:
+- hledger-lib
+- hledger
+- hledger-ui
+- hledger-web
+- hledger-api
diff --git a/stack.yaml b/stack.yaml
index bc68d48a6..ea1a921d5 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,7 +1,9 @@
-# Last-tested stack build plan using GHC 8.0.2 (osx sierra compatible)
-# stack.yaml help: https://github.com/commercialhaskell/stack/wiki/stack.yaml
+# stack build plan using GHC 8.0.2 (osx sierra compatible)
+# keep synced with download.md
 
-resolver: lts-8.15
+resolver: lts-8.22
+
+extra-deps: []
 
 packages:
 - hledger-lib
@@ -9,5 +11,3 @@ packages:
 - hledger-ui
 - hledger-web
 - hledger-api
-
-extra-deps: []