From b73b1f98c687a2c33cd181a87a890928bc05065f Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 30 Sep 2024 15:44:06 -1000
Subject: [PATCH] ;ci: add base-compat 0.14 to extra-deps

---
 .github/workflows/oldest.yml | 27 +++++++++++++++------------
 stack.yaml                   |  2 ++
 stack8.10.yaml               | 13 +++++++++++++
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/oldest.yml b/.github/workflows/oldest.yml
index ccc5dcfbe2b..057795824f4 100644
--- a/.github/workflows/oldest.yml
+++ b/.github/workflows/oldest.yml
@@ -138,15 +138,18 @@ jobs:
       run: |
         $stack install --test --bench hledger-web --fast --ghc-options=-Werror
 
-
-    - name: Install shelltestrunner
-      run: |
-        export PATH=~/.local/bin:$PATH
-        if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install shelltestrunner-1.10; fi
-        shelltest --version
-
-    - name: Test functional tests (excluding addons)
-      run: |
-        export PATH=~/.local/bin:$PATH
-        COLUMNS=80 $stack exec -- shelltest --execdir -j16 hledger/test -x /_ -x /addons -x ledger-compat/ledger-baseline -x ledger-compat/ledger-regress -x ledger-compat/ledger-collected
-        # XXX run the bin/ func tests corresponding to the GHC version enabled above, only
+    # XXX disable until this is fixed: shelltestrunner-1.10/src/shelltest.hs:125:20: error:
+    # shelltestrunner      >     Not in scope: ‘configFailFast’
+    # shelltestrunner      >     Perhaps you meant ‘configFastFail’ (imported from Test.Hspec.Core.Runner)
+
+    # - name: Install shelltestrunner
+    #   run: |
+    #     export PATH=~/.local/bin:$PATH
+    #     if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install shelltestrunner-1.10; fi
+    #     shelltest --version
+
+    # - name: Test functional tests (excluding addons)
+    #   run: |
+    #     export PATH=~/.local/bin:$PATH
+    #     COLUMNS=80 $stack exec -- shelltest --execdir -j16 hledger/test -x /_ -x /addons -x ledger-compat/ledger-baseline -x ledger-compat/ledger-regress -x ledger-compat/ledger-collected
+    #     # XXX run the bin/ func tests corresponding to the GHC version enabled above, only
diff --git a/stack.yaml b/stack.yaml
index 9622f11077b..50f555e83c3 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -14,6 +14,8 @@ packages:
 - hledger-web
 
 extra-deps:
+- base-compat-0.14.0
+- base-compat-batteries-0.14.0
 # for hledger-lib
 - Cabal-3.12.0.0
 - Cabal-syntax-3.12.0.0
diff --git a/stack8.10.yaml b/stack8.10.yaml
index d08bdfcb7ff..4535456d2f2 100644
--- a/stack8.10.yaml
+++ b/stack8.10.yaml
@@ -8,8 +8,21 @@ packages:
 - hledger-ui
 - hledger-web
 
+# I give up, go with this for now
+allow-newer: true
+
 extra-deps:
 - safe-0.3.21
+
+- base-compat-0.14.0
+# needed for the above:
+- base-compat-batteries-0.14.0
+- data-array-byte-0.1.0.1
+- foldable1-classes-compat-0.1
+- hashable-1.4.7.0
+- OneTuple-0.4.2
+# etc etc etc.
+
 # for hledger-lib:
 - doctest-0.20.0
 - ansi-terminal-0.11.4