From 6a4680d56185ceaf4503fa1edfea970ca6e01490 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 23 Aug 2022 00:16:47 +0100 Subject: [PATCH] imp: pkg: drop support for GHC 8.6 and 8.8 Slightly motivated by a desire to depend on the new breakpoint library, which requires GHC 8.10+. With GHC 9.0 in Debian, it seems time to drop these. --- .github/workflows/binaries-mac-x64.yml | 2 - .github/workflows/test-linux-x64.yml | 4 +- hledger-lib/package.yaml | 4 +- hledger-ui/package.yaml | 4 +- hledger-web/package.yaml | 4 +- hledger/package.yaml | 4 +- stack8.6.yaml | 57 -------------------------- stack8.8.yaml | 48 ---------------------- 8 files changed, 9 insertions(+), 118 deletions(-) delete mode 100644 stack8.6.yaml delete mode 100644 stack8.8.yaml diff --git a/.github/workflows/binaries-mac-x64.yml b/.github/workflows/binaries-mac-x64.yml index dc2ed3f58..76e08ad09 100644 --- a/.github/workflows/binaries-mac-x64.yml +++ b/.github/workflows/binaries-mac-x64.yml @@ -18,8 +18,6 @@ jobs: fail-fast: false matrix: plan: - # - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } - # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" } # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) (?) # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } diff --git a/.github/workflows/test-linux-x64.yml b/.github/workflows/test-linux-x64.yml index 200ef9b3f..798e3fede 100644 --- a/.github/workflows/test-linux-x64.yml +++ b/.github/workflows/test-linux-x64.yml @@ -56,9 +56,7 @@ jobs: fail-fast: false matrix: plan: # at least the check(s) required by master should be enabled - - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } # oldest supported ghc - # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" } - # - { ghc: "810", stack: "stack --stack-yaml=stack8.10.yaml" } + - { ghc: "810", stack: "stack --stack-yaml=stack8.10.yaml" } # oldest supported ghc # - { ghc: "90" , stack: "stack --stack-yaml=stack.yaml" } # - { ghc: "92" , stack: "stack --stack-yaml=stack9.2.yaml" } # newest supported ghc diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 4c9d9357d..38a768061 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -21,7 +21,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org stability: stable -tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 +tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.4 extra-source-files: - CHANGES.md @@ -32,7 +32,7 @@ extra-source-files: #data-files: dependencies: -- base >=4.11 && <4.17 +- base >=4.14 && <4.17 - aeson >=1 - aeson-pretty - ansi-terminal >=0.9 diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 493fda8a3..f2b7cbeef 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -21,7 +21,7 @@ github : simonmichael/hledger homepage : http://hledger.org bug-reports : http://bugs.hledger.org stability : stable -tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 +tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.4 extra-source-files: - CHANGES.md @@ -50,11 +50,11 @@ ghc-options: - -Wno-unused-do-bind dependencies: +- base >=4.14 && <4.17 - hledger-lib >=1.26.99 && <1.27 - hledger >=1.26.99 && <1.27 - ansi-terminal >=0.9 - async -- base >=4.11 && <4.17 - cmdargs >=0.8 - containers >=0.5.9 - data-default diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 6d3700b4c..fb0c0b68b 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -22,7 +22,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org stability: stable -tested-with: GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 +tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.4 extra-source-files: - CHANGES.md @@ -99,10 +99,10 @@ library: - Hledger.Web.Widget.AddForm - Hledger.Web.Widget.Common dependencies: + - base >=4.14 && <4.17 - hledger-lib >=1.26.99 && <1.27 - hledger >=1.26.99 && <1.27 - aeson >=1 - - base >=4.11 && <4.17 - base64 - blaze-html - blaze-markup diff --git a/hledger/package.yaml b/hledger/package.yaml index 58c631794..0eba2e6f8 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -21,7 +21,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org stability: stable -tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 +tested-with: GHC==8.10.7, GHC==9.0.2, GHC==9.2.4 extra-source-files: - CHANGES.md @@ -97,10 +97,10 @@ ghc-options: - -optP-Wno-nonportable-include-path dependencies: +- base >=4.14 && <4.17 - hledger-lib >=1.26.99 && <1.27 - aeson >=1 - ansi-terminal >=0.9 -- base >=4.11 && <4.17 - bytestring - cmdargs >=0.10 - containers >=0.5.9 diff --git a/stack8.6.yaml b/stack8.6.yaml deleted file mode 100644 index 56a5d401d..000000000 --- a/stack8.6.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# stack build plan using GHC 8.6.5 - -nix: - pure: false - packages: [perl gmp ncurses zlib] - -resolver: lts-14.27 - -packages: -- hledger-lib -- hledger -- hledger-ui -- hledger-web - -extra-deps: -# for Shake.hs (regex doesn't support base-compat-0.11): -- regex-1.0.2.0@rev:1 -- doclayout-0.3.1.1 -- emojis-0.1.2 -# for testing base-compat 0.11 compatibility (mutually exclusive with the above): -# - aeson-1.4.6.0 -# - aeson-compat-0.3.9 -# - attoparsec-iso8601-1.0.1.0 -# - base-compat-batteries-0.11.0 -# - base-compat-0.11.0 -# - http-api-data-0.4.1.1 -# for hledger-lib: -- pretty-simple-4.0.0.0 -- prettyprinter-1.7.0 -- prettyprinter-ansi-terminal-1.1.2 -- doctest-0.18.1 -- safe-0.3.19 -# for hledger: -- githash-0.1.6.2 -- th-compat-0.1.4 -# for hledger-ui: -- brick-1.0 -- bimap-0.5.0 -- text-zipper-0.12 -- vty-5.36 -- ansi-terminal-0.10.3 -# for hledger-web: -- ghc-byteorder-4.11.0.0.10 -- base64-0.4.2.3 - -# Workaround for https://github.com/commercialhaskell/stack/issues/3922 -# Try dropping this.. after stack 2 has been out a while ? Or now ? How about now ? -#- haskell-src-exts-1.21.0 - -# Use at least 0.46 to work around https://github.com/simonmichael/hledger/issues/1039 -# (hledger-web build failure with GHC 8.6 on Windows 7) -# Might also be fixed by using GHC 8.6.5+, mixed reports -#- unix-time-0.4.6 - -- wai-handler-launch-3.0.3.1 -# - streaming-commons-0.2.1.2 -# - network-2.7.0.0 diff --git a/stack8.8.yaml b/stack8.8.yaml deleted file mode 100644 index 29177e09c..000000000 --- a/stack8.8.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# 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 -- doctest-0.18.1 -- doclayout-0.3.1.1 -- emojis-0.1.2 -# for hledger: -- githash-0.1.6.2 -- th-compat-0.1.4 -# for hledger-ui: -- brick-1.0 -- bimap-0.5.0 -- text-zipper-0.12 -- vty-5.36 -# for hledger-web: -- ghc-byteorder-4.11.0.0.10 -# 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 -