Skip to content

Commit 7ecb16b

Browse files
authored
Merge pull request #12128 from Mikolaj/3.19-cabal-version-bumps
3.19 cabal version bumps on master branch for the 3.18 release
2 parents 4907eec + 0b87dff commit 7ecb16b

22 files changed

Lines changed: 78 additions & 649 deletions

File tree

.github/workflows/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [ubuntu-latest]
22-
ghc: ["9.4.8", "9.6.7", "9.8.4", "9.10.3", "9.12.2"]
22+
ghc: ["9.6.7", "9.8.4", "9.10.3", "9.12.4"]
2323
include:
2424
- os: macos-latest
25-
ghc: "9.12.2"
25+
ghc: "9.12.4"
2626
name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }}
2727
runs-on: ${{ matrix.os }}
2828
steps:

Cabal-QuickCheck/Cabal-QuickCheck.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-QuickCheck
3-
version: 3.17.0.0
3+
version: 3.19.0.0
44
synopsis: QuickCheck instances for types in Cabal
55
category: Testing
66
build-type: Simple
@@ -14,8 +14,8 @@ library
1414
build-depends:
1515
, base
1616
, bytestring
17-
, Cabal ^>=3.17.0.0
18-
, Cabal-syntax ^>=3.17.0.0
17+
, Cabal ^>=3.19.0.0
18+
, Cabal-syntax ^>=3.19.0.0
1919
, QuickCheck >= 2.13.2 && < 2.18
2020

2121
exposed-modules:

Cabal-described/Cabal-described.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-described
3-
version: 3.17.0.0
3+
version: 3.19.0.0
44
synopsis: Described functionality for types in Cabal
55
category: Testing, Parsec
66
description: Provides rere bindings
@@ -12,8 +12,8 @@ library
1212
ghc-options: -Wall
1313
build-depends:
1414
, base
15-
, Cabal ^>=3.17.0.0
16-
, Cabal-syntax ^>=3.17.0.0
15+
, Cabal ^>=3.19.0.0
16+
, Cabal-syntax ^>=3.19.0.0
1717
, containers
1818
, pretty
1919
, QuickCheck

Cabal-hooks/Cabal-hooks.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.6
22
name: Cabal-hooks
3-
version: 3.17
3+
version: 3.19
44
copyright: 2003-2026, Cabal Development Team
55
license: BSD-3-Clause
66
license-file: LICENSE
@@ -27,8 +27,8 @@ library
2727
hs-source-dirs: src
2828

2929
build-depends:
30-
, Cabal-syntax >= 3.17 && < 3.18
31-
, Cabal >= 3.17 && < 3.18
30+
, Cabal-syntax >= 3.19 && < 3.20
31+
, Cabal >= 3.19 && < 3.20
3232
, base >= 4.17 && < 5
3333
, containers >= 0.5.0.0 && < 0.9
3434
, transformers >= 0.5.6.0 && < 0.7

Cabal-syntax/Cabal-syntax.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.6
22
name: Cabal-syntax
3-
version: 3.17.0.0
3+
version: 3.19.0.0
44
copyright: 2003-2026, Cabal Development Team (see AUTHORS file)
55
license: BSD-3-Clause
66
license-file: LICENSE

Cabal-tree-diff/Cabal-tree-diff.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-tree-diff
3-
version: 3.17.0.0
3+
version: 3.19.0.0
44
synopsis: QuickCheck instances for types in Cabal
55
category: Testing
66
description: Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,8 +11,8 @@ library
1111
ghc-options: -Wall
1212
build-depends:
1313
, base
14-
, Cabal-syntax ^>=3.17.0.0
15-
, Cabal ^>=3.17.0.0
14+
, Cabal-syntax ^>=3.19.0.0
15+
, Cabal ^>=3.19.0.0
1616
, tree-diff ^>=0.1 || ^>=0.2 || ^>=0.3
1717

1818
exposed-modules: Data.TreeDiff.Instances.Cabal

Cabal/Cabal.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.8
22
name: Cabal
3-
version: 3.17.0.0
3+
version: 3.19.0.0
44
copyright: 2003-2026, Cabal Development Team (see AUTHORS file)
55
license: BSD-3-Clause
66
license-file: LICENSE
@@ -41,7 +41,7 @@ library
4141
hs-source-dirs: src
4242

4343
build-depends:
44-
, Cabal-syntax ^>= 3.17
44+
, Cabal-syntax ^>= 3.19
4545
, array >= 0.4.0.1 && < 0.6
4646
, base >= 4.17 && < 5
4747
, bytestring >= 0.10.8 && < 0.13

Cabal/src/Distribution/Simple/GHC.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ configureCompiler verbosity hcPath conf0 = do
180180
(userMaybeSpecifyPath "ghc" hcPath conf0)
181181

182182
-- Cabal currently supports GHC less than `maxGhcVersion`
183-
let maxGhcVersion = mkVersion [9, 16]
183+
let maxGhcVersion = mkVersion [10, 2]
184184
unless (ghcVersion < maxGhcVersion) $
185185
info verbosity $
186186
"Unknown/unsupported 'ghc' version detected "

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ bootstrap-subr-%: phony
294294
cd bootstrap && $(CABALCONF) $(CABALRUN) -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
295295
| python3 -m json.tool > linux-$*.json
296296

297-
BOOTSTRAP_GHC_VERSIONS := 9.2.8 9.4.8 9.6.7 9.8.4 9.10.3 9.12.2
297+
BOOTSTRAP_GHC_VERSIONS := 9.6.7 9.8.4 9.10.3 9.12.4
298298

299299
.PHONY: bootstrap-jsons
300300
bootstrap-jsons: ## Generate bootstrap JSONs for Linux (autodetects method).
@@ -372,7 +372,7 @@ users-guide-typos: ## Find typos in users guide.
372372

373373
.PHONY: users-guide-fix-typos
374374
users-guide-fix-typos: ## Fix typos in users guide.
375-
cd doc && $(FIND_NAMED) '*.rst' | xargs typos --config ../.typos-docs.toml --write-changes --force-exclude
375+
cd doc && $(FIND_NAMED) '*.rst' | xargs typos --config ../.typos-docs.toml --write-changes --force-exclude
376376

377377
.PHONY: markdown-typos
378378
markdown-typos: ## Find typos in markdown files.

bootstrap/cabal-bootstrap-gen.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ executable cabal-bootstrap-gen
1111
, aeson ^>=1.5.2.0 || ^>=2.0.3.0 || ^>=2.1.0.0 || ^>=2.2.0.0
1212
, base >=4.17.0.0 && < 5
1313
, bytestring >=0.10.8.2 && <0.13
14-
, Cabal ^>=3.14.1.0 || ^>=3.16.0.0
15-
, Cabal-syntax ^>=3.14.1.0 || ^>=3.16.0.0
14+
, Cabal ^>=3.14.0.0 || ^>=3.18.1.0
15+
, Cabal-syntax ^>=3.14.0.0 || ^>=3.18.1.0
1616
-- For the release process, we need the last *two* Cabal-syntax
1717
-- versions here: one to make CI green when release Cabal-syntax is
1818
-- not yet on Hackage and we are bumping versions. The second for

0 commit comments

Comments
 (0)