From 31868a6892928c02b385e327083d37f68adc047a Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 29 Jan 2021 15:08:18 -0800
Subject: [PATCH] ;stack: build with lts-17/ghc-8.10.3 by default

---
 .github/workflows/mac.yml  |  4 ++--
 .github/workflows/push.yml |  4 ++--
 stack.yaml                 | 10 ++++------
 stack8.10.yaml             | 18 ------------------
 stack8.8.yaml              | 38 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 46 insertions(+), 28 deletions(-)
 delete mode 100644 stack8.10.yaml
 create mode 100644 stack8.8.yaml

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index c1bd97e2e..fe1b9ba24 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -45,8 +45,8 @@ jobs:
         # - { ghc: "82"  , stack: "stack --stack-yaml=stack8.2.yaml" }
         # - { ghc: "84"  , stack: "stack --stack-yaml=stack8.4.yaml" }
         # - { ghc: "86"    , stack: "stack --stack-yaml=stack8.6.yaml" }
-        # - { ghc: "88"  , stack: "stack --stack-yaml=stack.yaml" }
-        - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" }
+        # - { ghc: "88"  , stack: "stack --stack-yaml=stack8.8.yaml" }
+        - { ghc: "810" , stack: "stack --stack-yaml=stack.yaml" }
         # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below)
 
     steps:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 1b9cbab3b..9077e1a4c 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -41,8 +41,8 @@ jobs:
         # - { ghc: "82" , stack: "stack --stack-yaml=stack8.2.yaml" }
         # - { ghc: "84" , stack: "stack --stack-yaml=stack8.4.yaml" }
         # - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" }
-        # - { ghc: "88" , stack: "stack --stack-yaml=stack.yaml" }
-        - { ghc: "810"  , stack: "stack --stack-yaml=stack8.10.yaml" }
+        # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" }
+        - { ghc: "810"  , stack: "stack --stack-yaml=stack.yaml" }
 
     steps:
 
diff --git a/stack.yaml b/stack.yaml
index ac3d67ee7..8244efc3c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,10 +1,10 @@
-# stack build plan using GHC 8.8.4
+# stack build plan using GHC 8.10.3
 
 nix:
   pure: false
   packages: [perl gmp ncurses zlib]
 
-resolver: lts-16.25
+resolver: lts-17.0
 
 packages:
 - hledger-lib
@@ -12,10 +12,8 @@ packages:
 - hledger-ui
 - hledger-web
 
-extra-deps:
+# extra-deps:
 # for hledger-lib:
-- pretty-simple-4.0.0.0
-- prettyprinter-1.7.0
 # for hledger:
 # for hledger-ui:
 # for hledger-web:
@@ -35,4 +33,4 @@ extra-deps:
 #  "$targets": -Werror
 #  "$everything": -O2
 #  some-package: -DSOME_CPP_FLAG
-  
+  
\ No newline at end of file
diff --git a/stack8.10.yaml b/stack8.10.yaml
deleted file mode 100644
index 05882d7d8..000000000
--- a/stack8.10.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# stack build plan using GHC 8.10.3
-
-nix:
-  pure: false
-  packages: [perl gmp ncurses zlib]
-
-resolver: nightly-2021-01-28
-
-packages:
-- hledger-lib
-- hledger
-- hledger-ui
-- hledger-web
-
-# extra-deps:
-# - pretty-simple-4.0.0.0
-# - prettyprinter-1.7.0
-# - prettyprinter-ansi-terminal-1.1.2
diff --git a/stack8.8.yaml b/stack8.8.yaml
new file mode 100644
index 000000000..8d7fc6c8f
--- /dev/null
+++ b/stack8.8.yaml
@@ -0,0 +1,38 @@
+# stack build plan using GHC 8.8.4
+
+nix:
+  pure: false
+  packages: [perl gmp ncurses zlib]
+
+resolver: lts-16.31
+
+packages:
+- hledger-lib
+- hledger
+- hledger-ui
+- hledger-web
+
+extra-deps:
+# for hledger-lib:
+- pretty-simple-4.0.0.0
+- prettyprinter-1.7.0
+# for hledger:
+# for hledger-ui:
+# for hledger-web:
+# for Shake.hs:
+
+# for precise profiling, per https://www.tweag.io/posts/2020-01-30-haskell-profiling.html:
+# apply-ghc-options: everything
+# rebuild-ghc-options: true
+# stack build --profile --ghc-options="-fno-prof-auto"
+
+# tell GHC to write hie files, eg for weeder. Rumoured to be slow.
+# ghc-options:
+#   "$locals": -fwrite-ide-info
+
+# ghc-options:
+#   "$locals": -ddump-timings
+#  "$targets": -Werror
+#  "$everything": -O2
+#  some-package: -DSOME_CPP_FLAG
+