Skip to content

Commit e01349d

Browse files
committed
bump versions (master)
also update bootstraps for new hackage-security, and move splitmix constraint to where it will work for more than just validate also updated bootstrap to use ghc 9.10.2, which was missed earlier?
1 parent 1dd3729 commit e01349d

24 files changed

+3164
-3258
lines changed

.github/workflows/bootstrap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [ubuntu-latest]
22-
ghc: ["9.2.8", "9.4.8", "9.6.7", "9.8.4", "9.10.1", "9.12.2"]
22+
ghc: ["9.2.8", "9.4.8", "9.6.7", "9.8.4", "9.10.2", "9.12.2"]
2323
include:
2424
- os: macos-latest
2525
ghc: "9.2.8"

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.15.0.0
3+
version: 3.17.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.15.0.0
18-
, Cabal-syntax ^>=3.15.0.0
17+
, Cabal ^>=3.17.0.0
18+
, Cabal-syntax ^>=3.17.0.0
1919
, QuickCheck >= 2.13.2 && < 2.17
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.15.0.0
3+
version: 3.17.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.15.0.0
16-
, Cabal-syntax ^>=3.15.0.0
15+
, Cabal ^>=3.17.0.0
16+
, Cabal-syntax ^>=3.17.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.16
3+
version: 3.17
44
copyright: 2023, 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.15 && < 3.17
31-
, Cabal >= 3.15 && < 3.17
30+
, Cabal-syntax >= 3.17 && < 3.18
31+
, Cabal >= 3.17 && < 3.18
3232
, base >= 4.13 && < 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.15.0.0
3+
version: 3.17.0.0
44
copyright: 2003-2024, 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.15.0.0
3+
version: 3.17.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.15.0.0
15-
, Cabal ^>=3.15.0.0
14+
, Cabal-syntax ^>=3.17.0.0
15+
, Cabal ^>=3.17.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.6
22
name: Cabal
3-
version: 3.15.0.0
3+
version: 3.17.0.0
44
copyright: 2003-2024, Cabal Development Team (see AUTHORS file)
55
license: BSD-3-Clause
66
license-file: LICENSE
@@ -39,7 +39,7 @@ library
3939
hs-source-dirs: src
4040

4141
build-depends:
42-
, Cabal-syntax ^>= 3.15
42+
, Cabal-syntax ^>= 3.17
4343
, array >= 0.4.0.1 && < 0.6
4444
, base >= 4.13 && < 5
4545
, bytestring >= 0.10.0.0 && < 0.13

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ bootstrap-json-%: phony
274274
cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
275275
| python3 -m json.tool > linux-$*.json
276276

277-
BOOTSTRAP_GHC_VERSIONS := 9.2.8 9.4.8 9.6.7 9.8.4 9.10.1 9.12.2
277+
BOOTSTRAP_GHC_VERSIONS := 9.2.8 9.4.8 9.6.7 9.8.4 9.10.2 9.12.2
278278

279279
.PHONY: bootstrap-jsons
280280
bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)

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.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0 || ^>=4.18.0.0 || ^>=4.19.0.0
1313
, bytestring ^>=0.10.8.2 || ^>=0.11.0.0
14-
, Cabal ^>=3.12.1.0 || ^>=3.14.0.0
15-
, Cabal-syntax ^>=3.12.1.0 || ^>=3.14.0.0
14+
, Cabal ^>=3.14.1.0 || ^>=3.16.0.0
15+
, Cabal-syntax ^>=3.14.1.0 || ^>=3.16.0.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)