From 2e894f71c46fa867b76ea9cd5507310afacea03a Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Fri, 30 Sep 2022 12:51:00 +0200 Subject: [PATCH 1/4] Bump base bump for cabal-dev-scripts to GHC 9.2 base --- cabal-dev-scripts/cabal-dev-scripts.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal index 5c783dd7ccc..908e5377dfc 100644 --- a/cabal-dev-scripts/cabal-dev-scripts.cabal +++ b/cabal-dev-scripts/cabal-dev-scripts.cabal @@ -18,7 +18,7 @@ executable gen-spdx ghc-options: -Wall build-depends: , aeson ^>=1.4.1.0 || ^>=1.5.2.0 - , base >=4.10 && <4.16 + , base >=4.10 && <4.17 , bytestring , containers , Diff ^>=0.4 @@ -35,7 +35,7 @@ executable gen-spdx-exc ghc-options: -Wall build-depends: , aeson ^>=1.4.1.0 || ^>=1.5.2.0 - , base >=4.10 && <4.16 + , base >=4.10 && <4.17 , bytestring , containers , Diff ^>=0.4 From 24bb7313903a2e46ff07e42d73458ccda2b0a7da Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Fri, 30 Sep 2022 12:59:05 +0200 Subject: [PATCH 2/4] Bump also TH version bound --- cabal-dev-scripts/cabal-dev-scripts.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal index 908e5377dfc..4a3e1ce3536 100644 --- a/cabal-dev-scripts/cabal-dev-scripts.cabal +++ b/cabal-dev-scripts/cabal-dev-scripts.cabal @@ -22,7 +22,7 @@ executable gen-spdx , bytestring , containers , Diff ^>=0.4 - , lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 + , lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2 , optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0 , text , zinza ^>=0.2 @@ -39,7 +39,7 @@ executable gen-spdx-exc , bytestring , containers , Diff ^>=0.4 - , lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 + , lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2 , optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0 , text , zinza ^>=0.2 From 3af0e00a3a5acf364fdbbe2b86f64ea8373b0a0c Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Fri, 30 Sep 2022 13:09:42 +0200 Subject: [PATCH 3/4] Bump also aeson version bound --- cabal-dev-scripts/cabal-dev-scripts.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal index 4a3e1ce3536..dcf40f84371 100644 --- a/cabal-dev-scripts/cabal-dev-scripts.cabal +++ b/cabal-dev-scripts/cabal-dev-scripts.cabal @@ -17,7 +17,7 @@ executable gen-spdx hs-source-dirs: src ghc-options: -Wall build-depends: - , aeson ^>=1.4.1.0 || ^>=1.5.2.0 + , aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0 , base >=4.10 && <4.17 , bytestring , containers @@ -34,7 +34,7 @@ executable gen-spdx-exc hs-source-dirs: src ghc-options: -Wall build-depends: - , aeson ^>=1.4.1.0 || ^>=1.5.2.0 + , aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0 , base >=4.10 && <4.17 , bytestring , containers From a66f183a9f91e6b471a22805e1e43a2a4b5e6676 Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Fri, 30 Sep 2022 13:18:19 +0200 Subject: [PATCH 4/4] Stick to GHC 8.10.7 until doctest is properly upgraded --- .github/workflows/quick-jobs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml index 710d8606c6f..3def7fd66f3 100644 --- a/.github/workflows/quick-jobs.yml +++ b/.github/workflows/quick-jobs.yml @@ -69,8 +69,8 @@ jobs: - name: ghcup run: | ghcup config set cache true - ghcup install ghc recommended - ghcup set ghc recommended + ghcup install ghc 8.10.7 + ghcup set ghc 8.10.7 - name: Update Hackage index run: cabal v2-update - name: Install doctest