Skip to content

Commit aa25c31

Browse files
authored
Merge pull request #783 from haskell-CI/Cabal-3.14
Use Cabal-3.14
2 parents bdc3cb2 + 058246b commit aa25c31

File tree

5 files changed

+36
-38
lines changed

5 files changed

+36
-38
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ jobs:
7070
compilerVersion: 8.8.4
7171
setup-method: ghcup
7272
allow-failure: false
73-
- compiler: ghc-8.6.5
74-
compilerKind: ghc
75-
compilerVersion: 8.6.5
76-
setup-method: ghcup
77-
allow-failure: false
7873
fail-fast: false
7974
steps:
8075
- name: apt-get install

cabal-install-parsers/Changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.6.3
2+
3+
- Drop support for GHC prior 8.8.4
4+
- Use `Cabal-syntax-3.14`
5+
16
## 0.6.2
27

38
- Drop support for GHC prior 8.6.5

cabal-install-parsers/cabal-install-parsers.cabal

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: cabal-install-parsers
3-
version: 0.6.2
3+
version: 0.6.3
44
synopsis: Utilities to work with cabal-install files
55
description:
66
@cabal-install-parsers@ provides parsers for @cabal-install@ files:
@@ -25,8 +25,7 @@ maintainer: [email protected], [email protected]
2525
category: Development
2626
build-type: Simple
2727
tested-with:
28-
GHC ==8.6.5
29-
|| ==8.8.4
28+
GHC ==8.8.4
3029
|| ==8.10.7
3130
|| ==9.0.2
3231
|| ==9.2.8
@@ -66,19 +65,19 @@ library
6665

6766
-- GHC-boot libraries
6867
build-depends:
69-
, base >=4.12 && <4.21
70-
, binary ^>=0.8.6.0
71-
, bytestring ^>=0.10.8.2 || ^>=0.11.1.0 || ^>=0.12.0.2
72-
, Cabal-syntax ^>=3.12.0.0
73-
, containers ^>=0.6.0.1 || ^>=0.7
74-
, deepseq ^>=1.4.2.0 || ^>=1.5.0.0
75-
, directory ^>=1.3.0.0
76-
, filepath ^>=1.4.1.1 || ^>=1.5.2.0
77-
, parsec ^>=3.1.13.0
78-
, pretty ^>=1.1.3.3
79-
, text ^>=1.2.3.0 || ^>=2.0.1 || ^>=2.1
80-
, time ^>=1.8.0.2 || ^>=1.9.3 || ^>=1.11.1.1 || ^>=1.12.2
81-
, transformers ^>=0.5.2.0 || ^>=0.6.1.0
68+
, base >=4.13.0.0 && <4.21
69+
, binary ^>=0.8.7.0
70+
, bytestring ^>=0.10.10.1 || ^>=0.11.1.0 || ^>=0.12.0.2
71+
, Cabal-syntax ^>=3.14.2.0
72+
, containers ^>=0.6.2.1 || ^>=0.7
73+
, deepseq ^>=1.4.4.0 || ^>=1.5.0.0
74+
, directory ^>=1.3.6.0
75+
, filepath ^>=1.4.2.1 || ^>=1.5.2.0
76+
, parsec ^>=3.1.14.0
77+
, pretty ^>=1.1.3.6
78+
, text ^>=1.2.4.0 || ^>=2.0.1 || ^>=2.1
79+
, time ^>=1.9.3 || ^>=1.11.1.1 || ^>=1.12.2
80+
, transformers ^>=0.5.6.2 || ^>=0.6.1.0
8281

8382
-- extra dependencies
8483
build-depends:

haskell-ci.cabal

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ maintainer: [email protected]
2626
category: Development
2727
build-type: Simple
2828
tested-with:
29-
GHC ==8.6.5
30-
|| ==8.8.4
29+
GHC ==8.8.4
3130
|| ==8.10.7
3231
|| ==9.0.2
3332
|| ==9.2.8
@@ -155,28 +154,28 @@ library haskell-ci-internal
155154
ViewPatterns
156155

157156
build-depends:
158-
, base >=4.12 && <4.21
159-
, binary ^>=0.8.5.1
160-
, bytestring ^>=0.10.8.1 || ^>=0.11.1.0 || ^>=0.12.0.2
161-
, Cabal-syntax ^>=3.12.0.0
162-
, containers ^>=0.6.0.1 || ^>=0.7
163-
, deepseq ^>=1.4.2.0 || ^>=1.5.0.0
164-
, directory ^>=1.3.0.0
165-
, filepath ^>=1.4.1.1 || ^>=1.5.2.0
157+
, base >=4.13 && <4.21
158+
, binary ^>=0.8.7.0
159+
, bytestring ^>=0.10.10.1 || ^>=0.11.1.0 || ^>=0.12.0.2
160+
, Cabal-syntax ^>=3.14.2.0
161+
, containers ^>=0.6.2.1 || ^>=0.7
162+
, deepseq ^>=1.4.4.0 || ^>=1.5.0.0
163+
, directory ^>=1.3.6.0
164+
, filepath ^>=1.4.2.1 || ^>=1.5.2.0
166165
, mtl ^>=2.2.2 || ^>=2.3.1
167-
, parsec ^>=3.1.13.0
168-
, pretty ^>=1.1.3.3
169-
, process ^>=1.4.3.0 || ^>=1.6.1.0
170-
, text ^>=1.2.3.0 || ^>=2.0.1 || ^>=2.1
171-
, transformers ^>=0.5.2.0 || ^>=0.6.1.0
166+
, parsec ^>=3.1.14.0
167+
, pretty ^>=1.1.3.6
168+
, process ^>=1.6.9.0
169+
, text ^>=1.2.4.0 || ^>=2.0.1 || ^>=2.1
170+
, transformers ^>=0.5.6.2 || ^>=0.6.1.0
172171

173172
-- other dependencies
174173
build-depends:
175174
, aeson ^>=2.2.0.0
176175
, attoparsec ^>=0.14.1
177176
, base-compat ^>=0.14.0
178177
, base16-bytestring ^>=1.0.1.0
179-
, cabal-install-parsers ^>=0.6.1.1
178+
, cabal-install-parsers ^>=0.6.3
180179
, cryptohash-sha256 ^>=0.11.101.0
181180
, exceptions ^>=0.10.0
182181
, generic-lens-lite ^>=0.1

haskell-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fi
1919

2020
CFG_CABAL_STORE_CACHE=""
2121
CFG_CABAL_REPO_CACHE=""
22-
CFG_JOBS="9.10.2 9.8.4 9.6.7 9.4.8 9.2.8 9.0.2 8.10.7 8.8.4 8.6.5"
22+
CFG_JOBS="9.10.2 9.8.4 9.6.7 9.4.8 9.2.8 9.0.2 8.10.7 8.8.4"
2323
CFG_CABAL_UPDATE=false
2424

2525
SCRIPT_NAME=$(basename "$0")

0 commit comments

Comments
 (0)