Skip to content

Commit

Permalink
Cabal: depend on process-1.6.14.0 to fix waitForProcess error message
Browse files Browse the repository at this point in the history
This is guarded to be for GHC from 8.2 only, since the process release
depends on base-4.10.

Includes an update to the bootstrapping files.
  • Loading branch information
robx committed Jul 9, 2022
1 parent 1b8bf8c commit 5099499
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 20 deletions.
4 changes: 4 additions & 0 deletions Cabal/Cabal.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ library
process >= 1.2.1.0 && < 1.7,
time >= 1.4.0.1 && < 1.13

-- pull in process version with fixed waitForProcess error
if impl(ghc >=8.2)
build-depends: process >= 1.6.14.0

if os(windows)
build-depends: Win32 >= 2.3.0.0 && < 2.14
else
Expand Down
13 changes: 9 additions & 4 deletions bootstrap/linux-8.10.7.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"source": "local",
"version": "3.9.0.0"
},
{
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
"revision": 0,
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
"flags": [],
"package": "process",
"source": "hackage",
"version": "1.6.14.0"
},
{
"cabal_sha256": null,
"revision": null,
Expand Down Expand Up @@ -375,10 +384,6 @@
"package": "parsec",
"version": "3.1.14.0"
},
{
"package": "process",
"version": "1.6.13.2"
},
{
"package": "stm",
"version": "2.5.0.1"
Expand Down
13 changes: 9 additions & 4 deletions bootstrap/linux-8.6.5.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"source": "local",
"version": "3.9.0.0"
},
{
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
"revision": 0,
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
"flags": [],
"package": "process",
"source": "hackage",
"version": "1.6.14.0"
},
{
"cabal_sha256": null,
"revision": null,
Expand Down Expand Up @@ -378,10 +387,6 @@
"package": "pretty",
"version": "1.1.3.6"
},
{
"package": "process",
"version": "1.6.5.0"
},
{
"package": "ghc-boot-th",
"version": "8.6.5"
Expand Down
13 changes: 9 additions & 4 deletions bootstrap/linux-8.8.4.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"source": "local",
"version": "3.9.0.0"
},
{
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
"revision": 0,
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
"flags": [],
"package": "process",
"source": "hackage",
"version": "1.6.14.0"
},
{
"cabal_sha256": null,
"revision": null,
Expand Down Expand Up @@ -386,10 +395,6 @@
"package": "parsec",
"version": "3.1.14.0"
},
{
"package": "process",
"version": "1.6.9.0"
},
{
"package": "stm",
"version": "2.5.0.0"
Expand Down
13 changes: 9 additions & 4 deletions bootstrap/linux-9.0.2.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"source": "local",
"version": "3.9.0.0"
},
{
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
"revision": 0,
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
"flags": [],
"package": "process",
"source": "hackage",
"version": "1.6.14.0"
},
{
"cabal_sha256": null,
"revision": null,
Expand Down Expand Up @@ -375,10 +384,6 @@
"package": "parsec",
"version": "3.1.14.0"
},
{
"package": "process",
"version": "1.6.13.2"
},
{
"package": "stm",
"version": "2.5.0.0"
Expand Down
13 changes: 9 additions & 4 deletions bootstrap/linux-9.2.3.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"source": "local",
"version": "3.9.0.0"
},
{
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
"revision": 0,
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
"flags": [],
"package": "process",
"source": "hackage",
"version": "1.6.14.0"
},
{
"cabal_sha256": null,
"revision": null,
Expand Down Expand Up @@ -366,10 +375,6 @@
"package": "parsec",
"version": "3.1.15.0"
},
{
"package": "process",
"version": "1.6.13.2"
},
{
"package": "stm",
"version": "2.5.0.2"
Expand Down

0 comments on commit 5099499

Please sign in to comment.