Skip to content

Commit f54d0dc

Browse files
mergify[bot]mpickeringgeekosaur
authored
Depend on tar-0.6.3.0 (backport haskell#10120) (haskell#10123)
* Bump index state to allow tar-0.6.3.0 tar-0.6.3.0 has much improved performance of deserialising .tar index which has significant ramifications for the start-up time of cabal-install. See haskell#10110 (cherry picked from commit 827256a) * Update bootstrap plans to include tar-0.6.3 Using the updated version of this library improves performance of cabal-install so it's worthwhile to make sure the bootstrap plans use this version. (cherry picked from commit 4d787e1) # Conflicts: # bootstrap/linux-8.10.7.json # bootstrap/linux-9.0.2.json # bootstrap/linux-9.2.8.json # bootstrap/linux-9.4.8.json # bootstrap/linux-9.6.4.json # bootstrap/linux-9.8.2.json * fixup! Update bootstrap plans to include tar-0.6.3 --------- Co-authored-by: Matthew Pickering <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent a29092e commit f54d0dc

File tree

9 files changed

+39
-39
lines changed

9 files changed

+39
-39
lines changed

‎bootstrap/generate_bootstrap_plans‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH+=:$PWD/jq-bin/bin
33

44
ghcs_nix="https://gitlab.haskell.org/bgamari/ghcs-nix/-/archive/master/ghcs-nix-master.tar.gz"
55

6-
nix build -f "$ghcs_nix" ghc-8_10_7 -o boot_ghc
6+
nix build -f "$ghcs_nix" ghc-9_6_5 -o boot_ghc
77

88
run() {
99
local ver="$1"

‎bootstrap/linux-9.0.2.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,24 +414,24 @@
414414
"version": "2.0.2"
415415
},
416416
{
417-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
417+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
418418
"component": "lib:tar-internal",
419419
"flags": [],
420420
"package": "tar",
421421
"revision": 0,
422422
"source": "hackage",
423-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
424-
"version": "0.6.2.0"
423+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
424+
"version": "0.6.3.0"
425425
},
426426
{
427-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
427+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
428428
"component": "lib:tar",
429429
"flags": [],
430430
"package": "tar",
431431
"revision": 0,
432432
"source": "hackage",
433-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
434-
"version": "0.6.2.0"
433+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
434+
"version": "0.6.3.0"
435435
},
436436
{
437437
"cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",

‎bootstrap/linux-9.2.8.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,24 +374,24 @@
374374
"version": "2.0.2"
375375
},
376376
{
377-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
377+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
378378
"component": "lib:tar-internal",
379379
"flags": [],
380380
"package": "tar",
381381
"revision": 0,
382382
"source": "hackage",
383-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
384-
"version": "0.6.2.0"
383+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
384+
"version": "0.6.3.0"
385385
},
386386
{
387-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
387+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
388388
"component": "lib:tar",
389389
"flags": [],
390390
"package": "tar",
391391
"revision": 0,
392392
"source": "hackage",
393-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
394-
"version": "0.6.2.0"
393+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
394+
"version": "0.6.3.0"
395395
},
396396
{
397397
"cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",

‎bootstrap/linux-9.4.8.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -364,24 +364,24 @@
364364
"version": "2.0.2"
365365
},
366366
{
367-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
367+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
368368
"component": "lib:tar-internal",
369369
"flags": [],
370370
"package": "tar",
371371
"revision": 0,
372372
"source": "hackage",
373-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
374-
"version": "0.6.2.0"
373+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
374+
"version": "0.6.3.0"
375375
},
376376
{
377-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
377+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
378378
"component": "lib:tar",
379379
"flags": [],
380380
"package": "tar",
381381
"revision": 0,
382382
"source": "hackage",
383-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
384-
"version": "0.6.2.0"
383+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
384+
"version": "0.6.3.0"
385385
},
386386
{
387387
"cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",

‎bootstrap/linux-9.6.4.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,24 +336,24 @@
336336
"version": "2.0.2"
337337
},
338338
{
339-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
339+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
340340
"component": "lib:tar-internal",
341341
"flags": [],
342342
"package": "tar",
343343
"revision": 0,
344344
"source": "hackage",
345-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
346-
"version": "0.6.2.0"
345+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
346+
"version": "0.6.3.0"
347347
},
348348
{
349-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
349+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
350350
"component": "lib:tar",
351351
"flags": [],
352352
"package": "tar",
353353
"revision": 0,
354354
"source": "hackage",
355-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
356-
"version": "0.6.2.0"
355+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
356+
"version": "0.6.3.0"
357357
},
358358
{
359359
"cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",

‎bootstrap/linux-9.8.1.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,24 +340,24 @@
340340
"version": "2.0.2"
341341
},
342342
{
343-
"cabal_sha256": "3ed979ee1bb00b4e488537988ee6bb3c2c67e66678804125e2df08a527822b4e",
343+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
344344
"component": "lib:tar-internal",
345345
"flags": [],
346346
"package": "tar",
347347
"revision": 0,
348348
"source": "hackage",
349-
"src_sha256": "edfef2e126440839d34f23fff7f3616d0bfffa0345ea13d4d0fee9a669d305da",
350-
"version": "0.6.1.0"
349+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
350+
"version": "0.6.3.0"
351351
},
352352
{
353-
"cabal_sha256": "3ed979ee1bb00b4e488537988ee6bb3c2c67e66678804125e2df08a527822b4e",
353+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
354354
"component": "lib:tar",
355355
"flags": [],
356356
"package": "tar",
357357
"revision": 0,
358358
"source": "hackage",
359-
"src_sha256": "edfef2e126440839d34f23fff7f3616d0bfffa0345ea13d4d0fee9a669d305da",
360-
"version": "0.6.1.0"
359+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
360+
"version": "0.6.3.0"
361361
},
362362
{
363363
"cabal_sha256": "13aee0a157b2362cf079a4fa0156927403aef2a9540694c9d170ac8339d17bda",

‎bootstrap/linux-9.8.2.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,24 +340,24 @@
340340
"version": "2.0.2"
341341
},
342342
{
343-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
343+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
344344
"component": "lib:tar-internal",
345345
"flags": [],
346346
"package": "tar",
347347
"revision": 0,
348348
"source": "hackage",
349-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
350-
"version": "0.6.2.0"
349+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
350+
"version": "0.6.3.0"
351351
},
352352
{
353-
"cabal_sha256": "619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba",
353+
"cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
354354
"component": "lib:tar",
355355
"flags": [],
356356
"package": "tar",
357357
"revision": 0,
358358
"source": "hackage",
359-
"src_sha256": "08c61e82b59ed6fe7e85e9fe7cceaaf853ba54511d1ec57efa511ddc55ef1998",
360-
"version": "0.6.2.0"
359+
"src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
360+
"version": "0.6.3.0"
361361
},
362362
{
363363
"cabal_sha256": "64a1925c93e9a26cd4c40c470736950c4b5ea7bae68418cb996c5c7df4873cba",

‎cabal.bootstrap.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ packages:
99
tests: False
1010
benchmarks: False
1111

12-
index-state: hackage.haskell.org 2024-04-22T06:16:57Z
12+
index-state: hackage.haskell.org 2024-06-17T00:00:01Z

‎cabal.release.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import: project-cabal/pkgs/cabal.config
22
import: project-cabal/pkgs/install.config
33
import: project-cabal/pkgs/tests.config
44

5-
index-state: hackage.haskell.org 2024-04-22T06:16:57Z
5+
index-state: hackage.haskell.org 2024-06-17T00:00:01Z

0 commit comments

Comments
 (0)