Skip to content

Commit 541750a

Browse files
authored
Merge pull request #8513 from haskell/mergify/bp/3.8/pr-8503
Work around CI problem from ghcup switch to GHC 9.2 (backport #8503)
2 parents a94904c + 008e970 commit 541750a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/quick-jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ jobs:
6969
- name: ghcup
7070
run: |
7171
ghcup config set cache true
72-
ghcup install ghc recommended
73-
ghcup set ghc recommended
72+
ghcup install ghc 8.10.7
73+
ghcup set ghc 8.10.7
7474
- name: Update Hackage index
7575
run: cabal v2-update
7676
- name: Install doctest

cabal-dev-scripts/cabal-dev-scripts.cabal

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ executable gen-spdx
1717
hs-source-dirs: src
1818
ghc-options: -Wall
1919
build-depends:
20-
, aeson ^>=1.4.1.0 || ^>=1.5.2.0
21-
, base >=4.10 && <4.16
20+
, aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0
21+
, base >=4.10 && <4.17
2222
, bytestring
2323
, containers
2424
, Diff ^>=0.4
25-
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1
25+
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2
2626
, optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0
2727
, text
2828
, zinza ^>=0.2
@@ -34,12 +34,12 @@ executable gen-spdx-exc
3434
hs-source-dirs: src
3535
ghc-options: -Wall
3636
build-depends:
37-
, aeson ^>=1.4.1.0 || ^>=1.5.2.0
38-
, base >=4.10 && <4.16
37+
, aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0
38+
, base >=4.10 && <4.17
3939
, bytestring
4040
, containers
4141
, Diff ^>=0.4
42-
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1
42+
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2
4343
, optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0
4444
, text
4545
, zinza ^>=0.2

0 commit comments

Comments
 (0)