[Git][ghc/ghc][wip/rts-configure-new-cabal] Use Cabal 3.10 for Hadrian
John Ericson (@Ericson2314)
gitlab at gitlab.haskell.org
Tue Sep 12 23:01:57 UTC 2023
John Ericson pushed to branch wip/rts-configure-new-cabal at Glasgow Haskell Compiler / GHC
Commits:
59ff2101 by John Ericson at 2023-09-12T19:01:44-04:00
Use Cabal 3.10 for Hadrian
We need the newer version for `CABAL_FLAG_*` env vars for #17191.
- - - - -
17 changed files:
- hadrian/bootstrap/plan-9_4_1.json
- hadrian/bootstrap/plan-9_4_2.json
- hadrian/bootstrap/plan-9_4_3.json
- hadrian/bootstrap/plan-9_4_4.json
- hadrian/bootstrap/plan-9_4_5.json
- hadrian/bootstrap/plan-9_6_1.json
- hadrian/bootstrap/plan-9_6_2.json
- hadrian/bootstrap/plan-bootstrap-9_4_1.json
- hadrian/bootstrap/plan-bootstrap-9_4_2.json
- hadrian/bootstrap/plan-bootstrap-9_4_3.json
- hadrian/bootstrap/plan-bootstrap-9_4_4.json
- hadrian/bootstrap/plan-bootstrap-9_4_5.json
- hadrian/bootstrap/plan-bootstrap-9_6_1.json
- hadrian/bootstrap/plan-bootstrap-9_6_2.json
- hadrian/hadrian.cabal
- hadrian/stack.yaml
- hadrian/stack.yaml.lock
Changes:
=====================================
hadrian/bootstrap/plan-9_4_1.json
=====================================
@@ -5,8 +5,9 @@
"compiler-id": "ghc-9.4.1",
"install-plan": [
{
+ "component-name": "lib",
"depends": [
- "Cabal-syntax-3.8.1.0",
+ "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
"array-0.5.4.0",
"base-4.17.0.0",
"bytestring-0.11.3.1",
@@ -23,12 +24,25 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+ "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"pkg-name": "Cabal",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
+ "component-name": "lib",
"depends": [
"array-0.5.4.0",
"base-4.17.0.0",
@@ -46,10 +60,22 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-syntax-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+ "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"pkg-name": "Cabal-syntax",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
"depends": [
@@ -341,7 +367,7 @@
"build-info": "/home/matt/ghc-bootstrap/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.1/hadrian-0.1.0.0/x/hadrian/build-info.json",
"component-name": "exe:hadrian",
"depends": [
- "Cabal-3.8.1.0",
+ "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
"base-4.17.0.0",
"base16-bytestring-1.0.2.0-1f4d5cfa7c972d59268ad23a58928ca71cb3b0b4d99ecfb3365582489f8d5c7a",
"bytestring-0.11.3.1",
=====================================
hadrian/bootstrap/plan-9_4_2.json
=====================================
@@ -5,8 +5,9 @@
"compiler-id": "ghc-9.4.2",
"install-plan": [
{
+ "component-name": "lib",
"depends": [
- "Cabal-syntax-3.8.1.0",
+ "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
"array-0.5.4.0",
"base-4.17.0.0",
"bytestring-0.11.3.1",
@@ -23,12 +24,25 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+ "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"pkg-name": "Cabal",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
+ "component-name": "lib",
"depends": [
"array-0.5.4.0",
"base-4.17.0.0",
@@ -46,10 +60,22 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-syntax-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+ "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"pkg-name": "Cabal-syntax",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
"depends": [
@@ -341,7 +367,7 @@
"build-info": "/home/matt/ghc-bootstrap/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.2/hadrian-0.1.0.0/x/hadrian/build-info.json",
"component-name": "exe:hadrian",
"depends": [
- "Cabal-3.8.1.0",
+ "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
"base-4.17.0.0",
"base16-bytestring-1.0.2.0-8845b9b845268782664a9731259247bb8eb1e18dc03a39dadfe77b42101a894d",
"bytestring-0.11.3.1",
=====================================
hadrian/bootstrap/plan-9_4_3.json
=====================================
@@ -5,8 +5,9 @@
"compiler-id": "ghc-9.4.3",
"install-plan": [
{
+ "component-name": "lib",
"depends": [
- "Cabal-syntax-3.8.1.0",
+ "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
"array-0.5.4.0",
"base-4.17.0.0",
"bytestring-0.11.3.1",
@@ -23,12 +24,25 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+ "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"pkg-name": "Cabal",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
+ "component-name": "lib",
"depends": [
"array-0.5.4.0",
"base-4.17.0.0",
@@ -46,10 +60,22 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-syntax-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+ "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"pkg-name": "Cabal-syntax",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
"depends": [
@@ -341,7 +367,7 @@
"build-info": "/home/matt/ghc-bootstrap/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.3/hadrian-0.1.0.0/x/hadrian/build-info.json",
"component-name": "exe:hadrian",
"depends": [
- "Cabal-3.8.1.0",
+ "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
"base-4.17.0.0",
"base16-bytestring-1.0.2.0-022be67a0e4d2e8bed3248f110a529e722a677692e78084e184611e934a069d4",
"bytestring-0.11.3.1",
=====================================
hadrian/bootstrap/plan-9_4_4.json
=====================================
@@ -5,8 +5,9 @@
"compiler-id": "ghc-9.4.4",
"install-plan": [
{
+ "component-name": "lib",
"depends": [
- "Cabal-syntax-3.8.1.0",
+ "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
"array-0.5.4.0",
"base-4.17.0.0",
"bytestring-0.11.3.1",
@@ -23,12 +24,25 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+ "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"pkg-name": "Cabal",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
+ "component-name": "lib",
"depends": [
"array-0.5.4.0",
"base-4.17.0.0",
@@ -46,10 +60,22 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-syntax-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+ "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"pkg-name": "Cabal-syntax",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
"depends": [
@@ -341,7 +367,7 @@
"build-info": "/home/matt/ghc-bootstrap/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.4/hadrian-0.1.0.0/x/hadrian/build-info.json",
"component-name": "exe:hadrian",
"depends": [
- "Cabal-3.8.1.0",
+ "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
"base-4.17.0.0",
"base16-bytestring-1.0.2.0-2c05b63cefa5d7007acd478c1dbfe18a190bfba61d8945d4d5b87798ed9ca8c2",
"bytestring-0.11.3.1",
=====================================
hadrian/bootstrap/plan-9_4_5.json
=====================================
@@ -5,8 +5,9 @@
"compiler-id": "ghc-9.4.5",
"install-plan": [
{
+ "component-name": "lib",
"depends": [
- "Cabal-syntax-3.8.1.0",
+ "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
"array-0.5.4.0",
"base-4.17.1.0",
"bytestring-0.11.4.0",
@@ -23,12 +24,25 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+ "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"pkg-name": "Cabal",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
+ "component-name": "lib",
"depends": [
"array-0.5.4.0",
"base-4.17.1.0",
@@ -46,10 +60,22 @@
"transformers-0.5.6.2",
"unix-2.7.3"
],
- "id": "Cabal-syntax-3.8.1.0",
+ "exe-depends": [],
+ "flags": {},
+ "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+ "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"pkg-name": "Cabal-syntax",
- "pkg-version": "3.8.1.0",
- "type": "pre-existing"
+ "pkg-src": {
+ "repo": {
+ "type": "secure-repo",
+ "uri": "http://hackage.haskell.org/"
+ },
+ "type": "repo-tar"
+ },
+ "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "pkg-version": "3.10.1.0",
+ "style": "global",
+ "type": "configured"
},
{
"depends": [
@@ -341,7 +367,7 @@
"build-info": "/home/matt/ghc-bootstrap/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.5/hadrian-0.1.0.0/x/hadrian/build-info.json",
"component-name": "exe:hadrian",
"depends": [
- "Cabal-3.8.1.0",
+ "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
"base-4.17.1.0",
"base16-bytestring-1.0.2.0-1562190683b25c2fe2deaf09b565f90fb7542655a2a02b012fe1b10df4b7e2f4",
"bytestring-0.11.4.0",
=====================================
hadrian/bootstrap/plan-9_6_1.json
=====================================
@@ -7,7 +7,7 @@
{
"component-name": "lib",
"depends": [
- "Cabal-syntax-3.8.1.0-3ca25e89601c18bd49019a3d1e19420c47007f095f586f14636917297c1fc62a",
+ "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
"array-0.5.5.0",
"base-4.18.0.0",
"bytestring-0.11.4.0",
@@ -26,8 +26,8 @@
],
"exe-depends": [],
"flags": {},
- "id": "Cabal-3.8.1.0-372ffc7841ab6b7a5b1b38fc4fa05a1def6d41a4a28a05b6b16412d8d03e6fd6",
- "pkg-cabal-sha256": "77121d8e1aff14a0fd95684b751599db78a7dd26d55862d9fcef27c88b193e9d",
+ "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+ "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"pkg-name": "Cabal",
"pkg-src": {
"repo": {
@@ -36,8 +36,8 @@
},
"type": "repo-tar"
},
- "pkg-src-sha256": "7464cbe6c2f3d7e5d0232023a1a7330621f8b24853cb259fc89a2af85b736608",
- "pkg-version": "3.8.1.0",
+ "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "pkg-version": "3.10.1.0",
"style": "global",
"type": "configured"
},
@@ -62,8 +62,8 @@
],
"exe-depends": [],
"flags": {},
- "id": "Cabal-syntax-3.8.1.0-3ca25e89601c18bd49019a3d1e19420c47007f095f586f14636917297c1fc62a",
- "pkg-cabal-sha256": "ed2d937ba6c6a20b75850349eedd41374885fc42369ef152d69e2ba70f44f593",
+ "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+ "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"pkg-name": "Cabal-syntax",
"pkg-src": {
"repo": {
@@ -72,8 +72,8 @@
},
"type": "repo-tar"
},
- "pkg-src-sha256": "07e8ddb19fe01781485f1522b6afc22aba680b0ab28ebe6bbfb84a2dd698ce0f",
- "pkg-version": "3.8.1.0",
+ "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "pkg-version": "3.10.1.0",
"style": "global",
"type": "configured"
},
@@ -384,7 +384,7 @@
"build-info": "/home/matt/ghc-bootstrap/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.1/hadrian-0.1.0.0/x/hadrian/build-info.json",
"component-name": "exe:hadrian",
"depends": [
- "Cabal-3.8.1.0-372ffc7841ab6b7a5b1b38fc4fa05a1def6d41a4a28a05b6b16412d8d03e6fd6",
+ "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
"base-4.18.0.0",
"base16-bytestring-1.0.2.0-b5940c21a059d328169082a7bf03f08fec9ea9cb300f6de1499ec2087f455bc8",
"bytestring-0.11.4.0",
=====================================
hadrian/bootstrap/plan-9_6_2.json
=====================================
@@ -7,7 +7,7 @@
{
"component-name": "lib",
"depends": [
- "Cabal-syntax-3.8.1.0-bbbf718cfbbd663054f4341b07dcb273c36b79e2447b99b75bc5e65249495f9f",
+ "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
"array-0.5.5.0",
"base-4.18.0.0",
"bytestring-0.11.4.0",
@@ -26,8 +26,8 @@
],
"exe-depends": [],
"flags": {},
- "id": "Cabal-3.8.1.0-7a8b83f34876a72e56865d5971de85c427928b628cb9a41bbf2a60c4512d85b0",
- "pkg-cabal-sha256": "77121d8e1aff14a0fd95684b751599db78a7dd26d55862d9fcef27c88b193e9d",
+ "id": "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
+ "pkg-cabal-sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"pkg-name": "Cabal",
"pkg-src": {
"repo": {
@@ -36,8 +36,8 @@
},
"type": "repo-tar"
},
- "pkg-src-sha256": "7464cbe6c2f3d7e5d0232023a1a7330621f8b24853cb259fc89a2af85b736608",
- "pkg-version": "3.8.1.0",
+ "pkg-src-sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "pkg-version": "3.10.1.0",
"style": "global",
"type": "configured"
},
@@ -62,8 +62,8 @@
],
"exe-depends": [],
"flags": {},
- "id": "Cabal-syntax-3.8.1.0-bbbf718cfbbd663054f4341b07dcb273c36b79e2447b99b75bc5e65249495f9f",
- "pkg-cabal-sha256": "ed2d937ba6c6a20b75850349eedd41374885fc42369ef152d69e2ba70f44f593",
+ "id": "Cabal-syntax-3.10.1.0-a7e09e0ed12b8981fd4bb5283acfafac1e1e07aeb2b44507502ae461bb01f1b4",
+ "pkg-cabal-sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"pkg-name": "Cabal-syntax",
"pkg-src": {
"repo": {
@@ -72,8 +72,8 @@
},
"type": "repo-tar"
},
- "pkg-src-sha256": "07e8ddb19fe01781485f1522b6afc22aba680b0ab28ebe6bbfb84a2dd698ce0f",
- "pkg-version": "3.8.1.0",
+ "pkg-src-sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "pkg-version": "3.10.1.0",
"style": "global",
"type": "configured"
},
@@ -384,7 +384,7 @@
"build-info": "/home/matt/ghc-bootstrap/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.6.2/hadrian-0.1.0.0/x/hadrian/build-info.json",
"component-name": "exe:hadrian",
"depends": [
- "Cabal-3.8.1.0-7a8b83f34876a72e56865d5971de85c427928b628cb9a41bbf2a60c4512d85b0",
+ "Cabal-3.10.1.0-08e8e38266cef863dfe810047ea2fb0574df80fd2bdeee7f2fbd09dadd0ddc38",
"base-4.18.0.0",
"base16-bytestring-1.0.2.0-53ed4e283858e02cbf91231d1ff6b983d0bc92a6868605ebee0c8b080a87d802",
"bytestring-0.11.4.0",
=====================================
hadrian/bootstrap/plan-bootstrap-9_4_1.json
=====================================
@@ -80,20 +80,30 @@
"package": "parsec",
"version": "3.1.15.0"
},
- {
- "package": "Cabal-syntax",
- "version": "3.8.1.0"
- },
{
"package": "process",
"version": "1.6.15.0"
- },
- {
- "package": "Cabal",
- "version": "3.8.1.0"
}
],
"dependencies": [
+ {
+ "cabal_sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+ "flags": [],
+ "package": "Cabal-syntax",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "version": "3.10.1.0"
+ },
+ {
+ "cabal_sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+ "flags": [],
+ "package": "Cabal",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "version": "3.10.1.0"
+ },
{
"cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
"flags": [],
@@ -211,10 +221,10 @@
"version": "3.3.1"
},
{
- "cabal_sha256": "826bf2a702a26ef87532a135808abad69d74f70ead39f26c06d034b1f0537a19",
+ "cabal_sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
"flags": [],
"package": "primitive",
- "revision": 0,
+ "revision": 1,
"source": "hackage",
"src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
"version": "0.8.0.0"
=====================================
hadrian/bootstrap/plan-bootstrap-9_4_2.json
=====================================
@@ -80,20 +80,30 @@
"package": "parsec",
"version": "3.1.15.0"
},
- {
- "package": "Cabal-syntax",
- "version": "3.8.1.0"
- },
{
"package": "process",
"version": "1.6.15.0"
- },
- {
- "package": "Cabal",
- "version": "3.8.1.0"
}
],
"dependencies": [
+ {
+ "cabal_sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+ "flags": [],
+ "package": "Cabal-syntax",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "version": "3.10.1.0"
+ },
+ {
+ "cabal_sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+ "flags": [],
+ "package": "Cabal",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "version": "3.10.1.0"
+ },
{
"cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
"flags": [],
@@ -211,10 +221,10 @@
"version": "3.3.1"
},
{
- "cabal_sha256": "826bf2a702a26ef87532a135808abad69d74f70ead39f26c06d034b1f0537a19",
+ "cabal_sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
"flags": [],
"package": "primitive",
- "revision": 0,
+ "revision": 1,
"source": "hackage",
"src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
"version": "0.8.0.0"
=====================================
hadrian/bootstrap/plan-bootstrap-9_4_3.json
=====================================
@@ -80,20 +80,30 @@
"package": "parsec",
"version": "3.1.15.0"
},
- {
- "package": "Cabal-syntax",
- "version": "3.8.1.0"
- },
{
"package": "process",
"version": "1.6.16.0"
- },
- {
- "package": "Cabal",
- "version": "3.8.1.0"
}
],
"dependencies": [
+ {
+ "cabal_sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+ "flags": [],
+ "package": "Cabal-syntax",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "version": "3.10.1.0"
+ },
+ {
+ "cabal_sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+ "flags": [],
+ "package": "Cabal",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "version": "3.10.1.0"
+ },
{
"cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
"flags": [],
@@ -211,10 +221,10 @@
"version": "3.3.1"
},
{
- "cabal_sha256": "826bf2a702a26ef87532a135808abad69d74f70ead39f26c06d034b1f0537a19",
+ "cabal_sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
"flags": [],
"package": "primitive",
- "revision": 0,
+ "revision": 1,
"source": "hackage",
"src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
"version": "0.8.0.0"
=====================================
hadrian/bootstrap/plan-bootstrap-9_4_4.json
=====================================
@@ -80,20 +80,30 @@
"package": "parsec",
"version": "3.1.15.0"
},
- {
- "package": "Cabal-syntax",
- "version": "3.8.1.0"
- },
{
"package": "process",
"version": "1.6.16.0"
- },
- {
- "package": "Cabal",
- "version": "3.8.1.0"
}
],
"dependencies": [
+ {
+ "cabal_sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+ "flags": [],
+ "package": "Cabal-syntax",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "version": "3.10.1.0"
+ },
+ {
+ "cabal_sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+ "flags": [],
+ "package": "Cabal",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "version": "3.10.1.0"
+ },
{
"cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
"flags": [],
@@ -211,10 +221,10 @@
"version": "3.3.1"
},
{
- "cabal_sha256": "826bf2a702a26ef87532a135808abad69d74f70ead39f26c06d034b1f0537a19",
+ "cabal_sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
"flags": [],
"package": "primitive",
- "revision": 0,
+ "revision": 1,
"source": "hackage",
"src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
"version": "0.8.0.0"
=====================================
hadrian/bootstrap/plan-bootstrap-9_4_5.json
=====================================
@@ -80,20 +80,30 @@
"package": "parsec",
"version": "3.1.16.1"
},
- {
- "package": "Cabal-syntax",
- "version": "3.8.1.0"
- },
{
"package": "process",
"version": "1.6.16.0"
- },
- {
- "package": "Cabal",
- "version": "3.8.1.0"
}
],
"dependencies": [
+ {
+ "cabal_sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
+ "flags": [],
+ "package": "Cabal-syntax",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "version": "3.10.1.0"
+ },
+ {
+ "cabal_sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
+ "flags": [],
+ "package": "Cabal",
+ "revision": 0,
+ "source": "hackage",
+ "src_sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "version": "3.10.1.0"
+ },
{
"cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
"flags": [],
@@ -211,10 +221,10 @@
"version": "3.3.1"
},
{
- "cabal_sha256": "826bf2a702a26ef87532a135808abad69d74f70ead39f26c06d034b1f0537a19",
+ "cabal_sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
"flags": [],
"package": "primitive",
- "revision": 0,
+ "revision": 1,
"source": "hackage",
"src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
"version": "0.8.0.0"
=====================================
hadrian/bootstrap/plan-bootstrap-9_6_1.json
=====================================
@@ -95,22 +95,22 @@
],
"dependencies": [
{
- "cabal_sha256": "ed2d937ba6c6a20b75850349eedd41374885fc42369ef152d69e2ba70f44f593",
+ "cabal_sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"flags": [],
"package": "Cabal-syntax",
- "revision": 3,
+ "revision": 0,
"source": "hackage",
- "src_sha256": "07e8ddb19fe01781485f1522b6afc22aba680b0ab28ebe6bbfb84a2dd698ce0f",
- "version": "3.8.1.0"
+ "src_sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "version": "3.10.1.0"
},
{
- "cabal_sha256": "77121d8e1aff14a0fd95684b751599db78a7dd26d55862d9fcef27c88b193e9d",
+ "cabal_sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"flags": [],
"package": "Cabal",
- "revision": 2,
+ "revision": 0,
"source": "hackage",
- "src_sha256": "7464cbe6c2f3d7e5d0232023a1a7330621f8b24853cb259fc89a2af85b736608",
- "version": "3.8.1.0"
+ "src_sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "version": "3.10.1.0"
},
{
"cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
@@ -229,10 +229,10 @@
"version": "3.3.1"
},
{
- "cabal_sha256": "826bf2a702a26ef87532a135808abad69d74f70ead39f26c06d034b1f0537a19",
+ "cabal_sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
"flags": [],
"package": "primitive",
- "revision": 0,
+ "revision": 1,
"source": "hackage",
"src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
"version": "0.8.0.0"
=====================================
hadrian/bootstrap/plan-bootstrap-9_6_2.json
=====================================
@@ -95,22 +95,22 @@
],
"dependencies": [
{
- "cabal_sha256": "ed2d937ba6c6a20b75850349eedd41374885fc42369ef152d69e2ba70f44f593",
+ "cabal_sha256": "bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7",
"flags": [],
"package": "Cabal-syntax",
- "revision": 3,
+ "revision": 0,
"source": "hackage",
- "src_sha256": "07e8ddb19fe01781485f1522b6afc22aba680b0ab28ebe6bbfb84a2dd698ce0f",
- "version": "3.8.1.0"
+ "src_sha256": "3b80092355327768a0de8298ac50ee906b7e82462e2ba14542730573b453f522",
+ "version": "3.10.1.0"
},
{
- "cabal_sha256": "77121d8e1aff14a0fd95684b751599db78a7dd26d55862d9fcef27c88b193e9d",
+ "cabal_sha256": "6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94",
"flags": [],
"package": "Cabal",
- "revision": 2,
+ "revision": 0,
"source": "hackage",
- "src_sha256": "7464cbe6c2f3d7e5d0232023a1a7330621f8b24853cb259fc89a2af85b736608",
- "version": "3.8.1.0"
+ "src_sha256": "0bdbab8e4c3178016fb0f070d8b62bc3067f93afabfbd3aa17c8065d0ecc98ee",
+ "version": "3.10.1.0"
},
{
"cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a",
@@ -229,10 +229,10 @@
"version": "3.3.1"
},
{
- "cabal_sha256": "826bf2a702a26ef87532a135808abad69d74f70ead39f26c06d034b1f0537a19",
+ "cabal_sha256": "d0ff45fa6e61f92af23611ceb8b9a6a04c236b50fb70c60e2ed3bfa532703670",
"flags": [],
"package": "primitive",
- "revision": 0,
+ "revision": 1,
"source": "hackage",
"src_sha256": "5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f",
"version": "0.8.0.0"
=====================================
hadrian/hadrian.cabal
=====================================
@@ -150,7 +150,7 @@ executable hadrian
, TypeOperators
other-extensions: MultiParamTypeClasses
, TypeFamilies
- build-depends: Cabal >= 3.2 && < 3.9
+ build-depends: Cabal >= 3.10 && < 3.11
, base >= 4.11 && < 5
, bytestring >= 0.10 && < 0.12
, containers >= 0.5 && < 0.7
=====================================
hadrian/stack.yaml
=====================================
@@ -17,3 +17,7 @@ nix:
- ncurses
- perl
- ghc-toolchain
+
+extra-deps:
+ - Cabal-3.10.1.0
+ - Cabal-syntax-3.10.1.0
=====================================
hadrian/stack.yaml.lock
=====================================
@@ -3,7 +3,21 @@
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files
-packages: []
+packages:
+- completed:
+ hackage: Cabal-3.10.1.0 at sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316
+ pantry-tree:
+ sha256: 3d175ab2e29f17494599bf5844d0037d01fd04287ac5d50c5c788b0633a8ee6f
+ size: 9223
+ original:
+ hackage: Cabal-3.10.1.0
+- completed:
+ hackage: Cabal-syntax-3.10.1.0 at sha256:bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7,7434
+ pantry-tree:
+ sha256: bb1e418f0eb0976bbf4f50491ef4f2b737121bb866e22d07cff1de91f199db7e
+ size: 11052
+ original:
+ hackage: Cabal-syntax-3.10.1.0
snapshots:
- completed:
size: 650475
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/59ff2101129cf585c789bc4ea1291fd99da7a494
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/59ff2101129cf585c789bc4ea1291fd99da7a494
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230912/7f3e7c3b/attachment-0001.html>
More information about the ghc-commits
mailing list