Skip to content

Commit b5e7132

Browse files
authored
Bump version numbers to 3.15 (#10309)
* Bump version numbers to 3.15 * Bump GHC 9.6.6 for workflows * Update index-state * Bump bootstrap boundaries * Regenerate bootstrap files
1 parent b09b118 commit b5e7132

22 files changed

+651
-158
lines changed

.github/workflows/bootstrap.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
os: [ubuntu-latest]
33-
ghc: ["9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
33+
ghc: ["9.0.2", "9.2.8", "9.4.8", "9.6.6", "9.8.2"]
3434
include:
3535
- os: macos-latest
3636
ghc: "9.2.8"

.github/workflows/validate.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
[
7272
"9.10.1",
7373
"9.8.2",
74-
"9.6.4",
74+
"9.6.6",
7575
"9.4.8",
7676
"9.2.8",
7777
"9.0.2",

Cabal-QuickCheck/Cabal-QuickCheck.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-QuickCheck
3-
version: 3.13.0.0
3+
version: 3.15.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.13.0.0
18-
, Cabal-syntax ^>=3.13.0.0
17+
, Cabal ^>=3.15.0.0
18+
, Cabal-syntax ^>=3.15.0.0
1919
, QuickCheck ^>=2.13.2 || ^>=2.14
2020

2121
exposed-modules:

Cabal-described/Cabal-described.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-described
3-
version: 3.13.0.0
3+
version: 3.15.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.13.0.0
16-
, Cabal-syntax ^>=3.13.0.0
15+
, Cabal ^>=3.15.0.0
16+
, Cabal-syntax ^>=3.15.0.0
1717
, containers
1818
, pretty
1919
, QuickCheck

Cabal-hooks/Cabal-hooks.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ library
2727
hs-source-dirs: src
2828

2929
build-depends:
30-
Cabal-syntax >= 3.13 && < 3.15,
31-
Cabal >= 3.13 && < 3.15,
30+
Cabal-syntax >= 3.15 && < 3.17,
31+
Cabal >= 3.15 && < 3.17,
3232
base >= 4.13 && < 5,
3333
containers >= 0.5.0.0 && < 0.8,
3434
transformers >= 0.5.6.0 && < 0.7

Cabal-syntax/Cabal-syntax.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-syntax
3-
version: 3.13.0.0
3+
version: 3.15.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

+3-3
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.13.0.0
3+
version: 3.15.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.13.0.0
15-
, Cabal ^>=3.13.0.0
14+
, Cabal-syntax ^>=3.15.0.0
15+
, Cabal ^>=3.15.0.0
1616
, tree-diff ^>=0.1 || ^>=0.2 || ^>=0.3
1717

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

Cabal/Cabal.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: Cabal
3-
version: 3.13.0.0
3+
version: 3.15.0.0
44
copyright: 2003-2024, Cabal Development Team (see AUTHORS file)
55
license: BSD-3-Clause
66
license-file: LICENSE
@@ -34,7 +34,7 @@ library
3434
hs-source-dirs: src
3535

3636
build-depends:
37-
Cabal-syntax ^>= 3.13,
37+
Cabal-syntax ^>= 3.15,
3838
array >= 0.4.0.1 && < 0.6,
3939
base >= 4.13 && < 5,
4040
bytestring >= 0.10.0.0 && < 0.13,

Cabal/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.13.0.0
1+
VERSION=3.15.0.0
22

33
#KIND=devel
44
KIND=rc

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ bootstrap-json-%: phony
226226
cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
227227
| python3 -m json.tool > linux-$*.json
228228

229-
BOOTSTRAP_GHC_VERSIONS := 9.0.2 9.2.8 9.4.8 9.6.4 9.8.2
229+
BOOTSTRAP_GHC_VERSIONS := 9.0.2 9.2.8 9.4.8 9.6.6 9.8.2
230230

231231
.PHONY: bootstrap-jsons
232232
bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)

bootstrap/cabal-bootstrap-gen.cabal

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ executable cabal-bootstrap-gen
88
ghc-options: -Wall
99
main-is: Main.hs
1010
build-depends:
11-
, aeson ^>=1.5.2.0 || ^>=2.0.3.0 || ^>=2.1.0.0
12-
, 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
11+
, aeson ^>=1.5.2.0 || ^>=2.0.3.0 || ^>=2.1.0.0 || ^>=2.2.0.0
12+
, 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.4.1.0 || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.1.0
15-
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0 || ^>=3.12.1.0
14+
, Cabal ^>=3.12.1.0 || ^>=3.14.0.0
15+
, Cabal-syntax ^>=3.12.1.0 || ^>=3.14.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

bootstrap/linux-9.0.2.json

+30-30
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,17 @@
172172
"revision": null,
173173
"source": "local",
174174
"src_sha256": null,
175-
"version": "3.13.0.0"
175+
"version": "3.15.0.0"
176176
},
177177
{
178-
"cabal_sha256": "2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03",
178+
"cabal_sha256": "684028fb5ac3d1c7657fe516f2a442d95a53ae2fcf6f6151544f3ed5289f6320",
179179
"component": "lib:process",
180180
"flags": [],
181181
"package": "process",
182-
"revision": 1,
182+
"revision": 0,
183183
"source": "hackage",
184-
"src_sha256": "cefda221c3009fa2316b5cf148215cb340dad7eb8503f22e49e33722559df99a",
185-
"version": "1.6.20.0"
184+
"src_sha256": "a816655978c2527d8d7a6ebfd6f1ca79027f27ac4f2f28888f1581b2d558aea5",
185+
"version": "1.6.23.0"
186186
},
187187
{
188188
"cabal_sha256": null,
@@ -192,7 +192,7 @@
192192
"revision": null,
193193
"source": "local",
194194
"src_sha256": null,
195-
"version": "3.13.0.0"
195+
"version": "3.15.0.0"
196196
},
197197
{
198198
"cabal_sha256": null,
@@ -217,16 +217,16 @@
217217
"version": "0.68.10"
218218
},
219219
{
220-
"cabal_sha256": "25440c1bbd5772fdbbeec068f20138121131e1a56453db0adc113dcdf9044105",
220+
"cabal_sha256": "17b834d2b75df8a8aef05de523280f613bb9c9aa9c31f269d5b90c1431a3749b",
221221
"component": "lib:network",
222222
"flags": [
223223
"-devel"
224224
],
225225
"package": "network",
226226
"revision": 0,
227227
"source": "hackage",
228-
"src_sha256": "c45696744dc437d93a56871a3dd869965b7b50eda3fe3c1a90a35e2fbb9cb9ca",
229-
"version": "3.2.0.0"
228+
"src_sha256": "efb04947946f52cccba802c2a8fc2f4259f0bdfd0bce95094c84e71583647f0c",
229+
"version": "3.2.2.0"
230230
},
231231
{
232232
"cabal_sha256": "129a59ba3ccfcd06192fd6da899e2711ae276a466915a047bd6727e4a0321d2e",
@@ -274,7 +274,7 @@
274274
"version": "0.9.2"
275275
},
276276
{
277-
"cabal_sha256": "82503a1ef0a625c210e118f2785c4138f8502aacbbfd4e5d987f6baffbb87115",
277+
"cabal_sha256": "573f3ab242f75465a0d67ce9d84202650a1606575e6dbd6d31ffcf4767a9a379",
278278
"component": "lib:hashable",
279279
"flags": [
280280
"-arch-native",
@@ -284,17 +284,17 @@
284284
"package": "hashable",
285285
"revision": 0,
286286
"source": "hackage",
287-
"src_sha256": "34652a7a1d2fc9e3d764b150bd35bcd2220761c1d4c6b446b0cfac5ad5b778cb",
288-
"version": "1.4.6.0"
287+
"src_sha256": "3baee4c9027a08830d148ec524cbc0471de645e1e8426d46780ef2758df0e8da",
288+
"version": "1.4.7.0"
289289
},
290290
{
291-
"cabal_sha256": "9d5d9e605f52958d099e13a8b8f30ee56cb137c9192996245e3c533adb682cf8",
291+
"cabal_sha256": "cf9e6afba8e01830ca0d32a12b98d481cf389688762c80d1870a1db2061ebf35",
292292
"component": "lib:async",
293293
"flags": [
294294
"-bench"
295295
],
296296
"package": "async",
297-
"revision": 1,
297+
"revision": 2,
298298
"source": "hackage",
299299
"src_sha256": "1818473ebab9212afad2ed76297aefde5fae8b5d4404daf36939aece6a8f16f7",
300300
"version": "2.2.5"
@@ -362,17 +362,17 @@
362362
"revision": null,
363363
"source": "local",
364364
"src_sha256": null,
365-
"version": "3.13.0.0"
365+
"version": "3.15.0.0"
366366
},
367367
{
368-
"cabal_sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
368+
"cabal_sha256": "acb64f2af52d81b0bb92c266f11d43def726a7a7b74a2c23d219e160b54edec7",
369369
"component": "lib:cryptohash-sha256",
370370
"flags": [
371371
"-exe",
372372
"+use-cbits"
373373
],
374374
"package": "cryptohash-sha256",
375-
"revision": 4,
375+
"revision": 5,
376376
"source": "hackage",
377377
"src_sha256": "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6",
378378
"version": "0.11.102.1"
@@ -417,58 +417,58 @@
417417
"version": "0.1.2"
418418
},
419419
{
420-
"cabal_sha256": "4d4186bb8d711435765253c7dc076c44a1d52896300689507ba135706ab35866",
420+
"cabal_sha256": "7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030",
421421
"component": "lib:os-string",
422422
"flags": [],
423423
"package": "os-string",
424424
"revision": 0,
425425
"source": "hackage",
426-
"src_sha256": "f6b388b9f9002622901d3f71437b98f95f54fbf7fe10490d319cb801c2a061ea",
427-
"version": "2.0.3"
426+
"src_sha256": "22fcc7d5fc66676b5dfc57b714d2caf93cce2d5a79d242168352f9eb0fe2f18a",
427+
"version": "2.0.6"
428428
},
429429
{
430-
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
430+
"cabal_sha256": "e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a",
431431
"component": "lib:tar-internal",
432432
"flags": [],
433433
"package": "tar",
434-
"revision": 0,
434+
"revision": 1,
435435
"source": "hackage",
436436
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
437437
"version": "0.6.3.0"
438438
},
439439
{
440-
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
440+
"cabal_sha256": "e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a",
441441
"component": "lib:tar",
442442
"flags": [],
443443
"package": "tar",
444-
"revision": 0,
444+
"revision": 1,
445445
"source": "hackage",
446446
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
447447
"version": "0.6.3.0"
448448
},
449449
{
450-
"cabal_sha256": "d6696f2b55ab4a50b8de57947abca308604eb7cf8287c40bf69cfa26133e24d3",
450+
"cabal_sha256": "bae1c5a6092d65c5e763246f91e04fef3f43e37cb055130725c9a973c88a250f",
451451
"component": "lib:zlib",
452452
"flags": [
453453
"-bundled-c-zlib",
454454
"+non-blocking-ffi",
455455
"+pkg-config"
456456
],
457457
"package": "zlib",
458-
"revision": 0,
458+
"revision": 1,
459459
"source": "hackage",
460460
"src_sha256": "6edd38b6b81df8d274952aa85affa6968ae86b2231e1d429ce8bc9083e6a55bc",
461461
"version": "0.7.1.0"
462462
},
463463
{
464-
"cabal_sha256": "8ff70524314f9ad706f8e5051d7150ee44cb82170147879b245bdab279604b16",
464+
"cabal_sha256": "a7311a70ce2cc820ee430c389f57f82a082f148230b37526c34eac72b7b3ff34",
465465
"component": "lib:hackage-security",
466466
"flags": [
467467
"+cabal-syntax",
468468
"+lukko"
469469
],
470470
"package": "hackage-security",
471-
"revision": 1,
471+
"revision": 4,
472472
"source": "hackage",
473473
"src_sha256": "2e4261576b3e11b9f5175392947f56a638cc1a3584b8acbb962b809d7c69db69",
474474
"version": "0.6.2.6"
@@ -546,7 +546,7 @@
546546
"revision": null,
547547
"source": "local",
548548
"src_sha256": null,
549-
"version": "3.13.0.0"
549+
"version": "3.15.0.0"
550550
},
551551
{
552552
"cabal_sha256": null,
@@ -559,7 +559,7 @@
559559
"revision": null,
560560
"source": "local",
561561
"src_sha256": null,
562-
"version": "3.13.0.0"
562+
"version": "3.15.0.0"
563563
},
564564
{
565565
"cabal_sha256": "e4be4a206f5ab6ddb5ae4fbb39101529196e20af5670c5d33326fea6eff886fd",

0 commit comments

Comments
 (0)