Skip to content

Commit 14f66da

Browse files
Kleidukosulysses4ever
Kleidukos
and
ulysses4ever
authored
Update Cabal{,-install,-syntax} to 3.10.2.0 (#9033)
Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
1 parent c97e487 commit 14f66da

File tree

24 files changed

+137
-167
lines changed

24 files changed

+137
-167
lines changed

‎.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: ["8.10.7", "9.0.2", "9.2.6", "9.4.4"]
22+
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.5"]
2323
include:
2424
- os: macos-latest
25-
ghc: "9.2.6"
25+
ghc: "9.2.8"
2626
name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }}
2727
runs-on: ${{ matrix.os }}
2828
steps:

‎.github/workflows/validate.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ on:
2323
env:
2424
# We choose a stable ghc version across all os's
2525
# which will be used to do the next release
26-
GHC_FOR_RELEASE: '9.2.3'
26+
GHC_FOR_RELEASE: '9.2.8'
2727
# Ideally we should use the version about to be released for hackage tests and benchmarks
28-
GHC_FOR_SOLVER_BENCHMARKS: '9.2.3'
29-
GHC_FOR_COMPLETE_HACKAGE_TESTS: '9.2.3'
28+
GHC_FOR_SOLVER_BENCHMARKS: '9.2.8'
29+
GHC_FOR_COMPLETE_HACKAGE_TESTS: '9.2.8'
3030
COMMON_FLAGS: '-j 2 -v'
3131

3232
jobs:
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
os: ["ubuntu-20.04", "macos-latest", "windows-latest"]
41-
ghc: ["9.4.2", "9.2.3", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
41+
ghc: ["9.4.5", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
4242
exclude:
4343
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
4444
- os: "windows-latest"
@@ -71,7 +71,7 @@ jobs:
7171
id: setup-haskell
7272
with:
7373
ghc-version: ${{ matrix.ghc }}
74-
cabal-version: '3.8.1.0'
74+
cabal-version: '3.10.1.0'
7575

7676
# See the following link for a breakdown of the following step
7777
# https://github.com/haskell/actions/issues/7#issuecomment-745697160
@@ -360,7 +360,7 @@ jobs:
360360
id: setup-haskell
361361
with:
362362
ghc-version: ${{ matrix.ghc }}
363-
cabal-version: '3.8.1.0'
363+
cabal-version: '3.10.1.0'
364364

365365
# As we are reusing the cached build dir from the previous step
366366
# the generated artifacts are available here,

‎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: 2.2
22
name: Cabal-syntax
3-
version: 3.10.1.0
3+
version: 3.10.2.0
44
copyright: 2003-2023, Cabal Development Team (see AUTHORS file)
55
license: BSD-3-Clause
66
license-file: LICENSE

‎Cabal/Cabal.cabal

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

‎Cabal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.10.1.0
1+
VERSION=3.10.2.0
22

33
#KIND=devel
44
KIND=rc

‎Makefile

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

198-
BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.6 9.4.4
198+
BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.5
199199

200200
bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)
201201

‎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
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
1313
, bytestring ^>=0.10.8.2 || ^>=0.11.0.0
14-
, Cabal ^>=3.2.0.0 || ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.1.0
15-
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0
14+
, Cabal ^>=3.2.0.0 || ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.2.0
15+
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.2.0
1616
, cabal-install-parsers ^>=0.3.0.1 || ^>=0.4.5 || ^>=0.6
1717
, cabal-plan ^>=0.7.0.0
1818
, containers ^>=0.6.0.1

‎bootstrap/linux-8.10.7.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"revision": null,
103103
"source": "local",
104104
"src_sha256": null,
105-
"version": "3.10.1.0"
105+
"version": "3.10.2.0"
106106
},
107107
{
108108
"cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98",
@@ -120,24 +120,24 @@
120120
"revision": null,
121121
"source": "local",
122122
"src_sha256": null,
123-
"version": "3.10.1.0"
123+
"version": "3.10.2.0"
124124
},
125125
{
126-
"cabal_sha256": "e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568",
126+
"cabal_sha256": "d50e055f45bd09a8238200ec64ffa0f17492c32cdb5807487894388ce1c2f839",
127127
"flags": [
128128
"-devel"
129129
],
130130
"package": "network",
131131
"revision": 0,
132132
"source": "hackage",
133-
"src_sha256": "7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85",
134-
"version": "3.1.2.7"
133+
"src_sha256": "b452a2afac95d9207357eb3820c719c7c7d27871ef4b6ed7bfcd03a036b9158e",
134+
"version": "3.1.4.0"
135135
},
136136
{
137-
"cabal_sha256": "6ca77c4e80b4e4109e30549c269631a9cc295c8fc2431ce4123972a5f80f7bfc",
137+
"cabal_sha256": "e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730",
138138
"flags": [],
139139
"package": "th-compat",
140-
"revision": 0,
140+
"revision": 2,
141141
"source": "hackage",
142142
"src_sha256": "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8",
143143
"version": "0.1.4"
@@ -152,27 +152,27 @@
152152
"version": "2.6.4.2"
153153
},
154154
{
155-
"cabal_sha256": "b878d575c470bd1f72d37af6654d924ab2b9489d88de8a71bd74d9d5d726c013",
155+
"cabal_sha256": "d9220cc1b8c1f287248d650910710b96e62e54530772e3bcd19dbdec6547f8ae",
156156
"flags": [
157157
"-conduit10",
158158
"+network-uri",
159159
"-warn-as-error",
160160
"-warp-tests"
161161
],
162162
"package": "HTTP",
163-
"revision": 1,
163+
"revision": 2,
164164
"source": "hackage",
165165
"src_sha256": "df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453",
166166
"version": "4000.4.1"
167167
},
168168
{
169-
"cabal_sha256": "58d5514b688ec037f53b9d60097b9d87f6b3847da68f65124987d67222c3a334",
169+
"cabal_sha256": "0bdd3486d3a1bcbed0513b46af4a13ca74b395313fa5b6e0068d6b7413b76a04",
170170
"flags": [],
171171
"package": "base-orphans",
172172
"revision": 0,
173173
"source": "hackage",
174-
"src_sha256": "888fd67f0dbe932778f5b170922ce80d0dcab1680ee98f1d6fcc362f20d9e447",
175-
"version": "0.8.7"
174+
"src_sha256": "613ed4d8241ed5a648a59ae6569a6962990bb545711d020d49fb83fa12d16e62",
175+
"version": "0.9.0"
176176
},
177177
{
178178
"cabal_sha256": "2ef1bd3511e82ba56f7f23cd793dd2da84338a1e7c2cbea5b151417afe3baada",
@@ -184,24 +184,24 @@
184184
"version": "0.1.0.1"
185185
},
186186
{
187-
"cabal_sha256": "02acedd7ac829b52756fe481a1d53294d8f5d42aaa56df560c62c6cec3587a14",
187+
"cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a",
188188
"flags": [
189189
"+integer-gmp",
190190
"-random-initial-seed"
191191
],
192192
"package": "hashable",
193-
"revision": 0,
193+
"revision": 1,
194194
"source": "hackage",
195195
"src_sha256": "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8",
196196
"version": "1.4.2.0"
197197
},
198198
{
199-
"cabal_sha256": "2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9",
199+
"cabal_sha256": "46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08",
200200
"flags": [
201201
"-bench"
202202
],
203203
"package": "async",
204-
"revision": 2,
204+
"revision": 3,
205205
"source": "hackage",
206206
"src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725",
207207
"version": "2.2.4"
@@ -267,13 +267,13 @@
267267
"version": "3.10.1.0"
268268
},
269269
{
270-
"cabal_sha256": "facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3",
270+
"cabal_sha256": "72ce9095872eae653addca5f412ac8070d6282d8e1c8578c2237c33f2cbbf4bc",
271271
"flags": [
272272
"-exe",
273273
"+use-cbits"
274274
],
275275
"package": "cryptohash-sha256",
276-
"revision": 1,
276+
"revision": 2,
277277
"source": "hackage",
278278
"src_sha256": "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6",
279279
"version": "0.11.102.1"
@@ -290,38 +290,38 @@
290290
"version": "0.1.4"
291291
},
292292
{
293-
"cabal_sha256": "885c9e2410e5d91a08b199897df0867fecedf818216d7329a2d43a512833dd63",
293+
"cabal_sha256": "3db04d7c18b9e68ba5eef3fa7eeca05e1e248958dd182290c8e6b010c81ef73e",
294294
"flags": [
295295
"+no-donna",
296296
"+test-doctests",
297297
"+test-hlint",
298298
"+test-properties"
299299
],
300300
"package": "ed25519",
301-
"revision": 6,
301+
"revision": 7,
302302
"source": "hackage",
303303
"src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d",
304304
"version": "0.0.5.0"
305305
},
306306
{
307-
"cabal_sha256": "efd4c08c4df1ac3f423858a834c0e3b5b4909febda66a901d12a8e1d57bddaa8",
307+
"cabal_sha256": "9ab54ee4f80bbd8a3fddd639ea142b7039ee2deb27f7df031a93de1819e34146",
308308
"flags": [
309309
"+ofd-locking"
310310
],
311311
"package": "lukko",
312-
"revision": 3,
312+
"revision": 4,
313313
"source": "hackage",
314314
"src_sha256": "a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f",
315315
"version": "0.1.1.3"
316316
},
317317
{
318-
"cabal_sha256": "bc14969ea4adfec6eee20264decf4a07c4002b38b2aa802d58d86b1a2cf7b895",
318+
"cabal_sha256": "63dbcb0f507273a8331363e4c13a1fe91f4ea0c495883cf65f314629582a2630",
319319
"flags": [
320320
"-old-bytestring",
321321
"-old-time"
322322
],
323323
"package": "tar",
324-
"revision": 5,
324+
"revision": 6,
325325
"source": "hackage",
326326
"src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de",
327327
"version": "0.5.1.1"
@@ -340,7 +340,7 @@
340340
"version": "0.6.3.0"
341341
},
342342
{
343-
"cabal_sha256": "18405474813b37ddfc27778c88c549f444661432224999068417dfab3471281e",
343+
"cabal_sha256": "5b225c2d82f0b8f4168a6124840bae353e6b462b90fd1e07c846211ae9bcb5ed",
344344
"flags": [
345345
"+base48",
346346
"+cabal-syntax",
@@ -350,7 +350,7 @@
350350
"+use-network-uri"
351351
],
352352
"package": "hackage-security",
353-
"revision": 2,
353+
"revision": 3,
354354
"source": "hackage",
355355
"src_sha256": "52ee0576971955571d846b8e6c09638f89f4f7881f4a95173e44ccc0d856a066",
356356
"version": "0.6.2.3"
@@ -376,10 +376,10 @@
376376
"version": "0.96.0.1"
377377
},
378378
{
379-
"cabal_sha256": "61e2d98ff634b8b4b3db467772420c0f9c79c2da9ddf3d2daeb2af2417f2c535",
379+
"cabal_sha256": "a1f7edb255edae85ccb9d8001b26fea760f846aee0c6302b177eb59d613214e2",
380380
"flags": [],
381381
"package": "resolv",
382-
"revision": 5,
382+
"revision": 6,
383383
"source": "hackage",
384384
"src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671",
385385
"version": "0.1.2.0"
@@ -403,7 +403,7 @@
403403
"revision": null,
404404
"source": "local",
405405
"src_sha256": null,
406-
"version": "3.10.1.0"
406+
"version": "3.10.2.0"
407407
}
408408
]
409409
}

0 commit comments

Comments
 (0)