Skip to content

Commit 6ad8bf1

Browse files
authored
Merge pull request #8378 from haskell/mergify/bp/3.8/pr-8342
Bump package process dependency version to 1.6.15.0 and move from Cabal to cabal-install (backport #8342)
2 parents c8acbfe + ad9e4dc commit 6ad8bf1

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

Cabal/Cabal.cabal

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ library
4646
process >= 1.2.1.0 && < 1.7,
4747
time >= 1.4.0.1 && < 1.13
4848

49-
-- pull in process version with fixed waitForProcess error
50-
if impl(ghc >=8.2)
51-
build-depends: process >= 1.6.14.0
52-
5349
if os(windows)
5450
build-depends: Win32 >= 2.3.0.0 && < 2.14
5551
else

bootstrap/linux-8.10.7.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"version": "3.8.1.0"
1111
},
1212
{
13-
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
13+
"cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf",
1414
"revision": 0,
15-
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
15+
"src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab",
1616
"flags": [],
1717
"package": "process",
1818
"source": "hackage",
19-
"version": "1.6.14.0"
19+
"version": "1.6.15.0"
2020
},
2121
{
2222
"cabal_sha256": null,

bootstrap/linux-8.6.5.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"version": "3.8.1.0"
1111
},
1212
{
13-
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
13+
"cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf",
1414
"revision": 0,
15-
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
15+
"src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab",
1616
"flags": [],
1717
"package": "process",
1818
"source": "hackage",
19-
"version": "1.6.14.0"
19+
"version": "1.6.15.0"
2020
},
2121
{
2222
"cabal_sha256": null,

bootstrap/linux-8.8.4.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"version": "3.8.1.0"
1111
},
1212
{
13-
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
13+
"cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf",
1414
"revision": 0,
15-
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
15+
"src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab",
1616
"flags": [],
1717
"package": "process",
1818
"source": "hackage",
19-
"version": "1.6.14.0"
19+
"version": "1.6.15.0"
2020
},
2121
{
2222
"cabal_sha256": null,

bootstrap/linux-9.0.2.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"version": "3.8.1.0"
1111
},
1212
{
13-
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
13+
"cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf",
1414
"revision": 0,
15-
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
15+
"src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab",
1616
"flags": [],
1717
"package": "process",
1818
"source": "hackage",
19-
"version": "1.6.14.0"
19+
"version": "1.6.15.0"
2020
},
2121
{
2222
"cabal_sha256": null,

bootstrap/linux-9.2.3.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"version": "3.8.1.0"
1111
},
1212
{
13-
"cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
13+
"cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf",
1414
"revision": 0,
15-
"src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
15+
"src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab",
1616
"flags": [],
1717
"package": "process",
1818
"source": "hackage",
19-
"version": "1.6.14.0"
19+
"version": "1.6.15.0"
2020
},
2121
{
2222
"cabal_sha256": null,

cabal-install/cabal-install.cabal

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,10 @@ library
244244
if flag(lukko)
245245
build-depends: lukko >= 0.1 && <0.2
246246

247+
-- pull in process version with fixed waitForProcess error
248+
if impl(ghc >=8.2)
249+
build-depends: process >= 1.6.15.0
250+
247251

248252
executable cabal
249253
import: warnings, base-dep, cabal-dep, cabal-syntax-dep

0 commit comments

Comments
 (0)