Merge pull request #8282 from haskell/mergify/bp/3.8/pr-8279

Bump dependency on process (backport #8279)
haskell · Jul 12, 2022 · 8d42a19 · 8d42a19
2 parents 8b13cb3 + 95cf762
commit 8d42a19
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 20 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -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

diff --git a/bootstrap/linux-8.10.7.json b/bootstrap/linux-8.10.7.json
@@ -9,6 +9,15 @@
             "source": "local",
             "version": "3.8.0.20220526"
         },
+        {
+            "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
+            "revision": 0,
+            "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
+            "flags": [],
+            "package": "process",
+            "source": "hackage",
+            "version": "1.6.14.0"
+        },
         {
             "cabal_sha256": null,
             "revision": null,
@@ -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"

diff --git a/bootstrap/linux-8.6.5.json b/bootstrap/linux-8.6.5.json
@@ -9,6 +9,15 @@
             "source": "local",
             "version": "3.8.0.20220526"
         },
+        {
+            "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
+            "revision": 0,
+            "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
+            "flags": [],
+            "package": "process",
+            "source": "hackage",
+            "version": "1.6.14.0"
+        },
         {
             "cabal_sha256": null,
             "revision": null,
@@ -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"

diff --git a/bootstrap/linux-8.8.4.json b/bootstrap/linux-8.8.4.json
@@ -9,6 +9,15 @@
             "source": "local",
             "version": "3.8.0.20220526"
         },
+        {
+            "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
+            "revision": 0,
+            "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
+            "flags": [],
+            "package": "process",
+            "source": "hackage",
+            "version": "1.6.14.0"
+        },
         {
             "cabal_sha256": null,
             "revision": null,
@@ -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"

diff --git a/bootstrap/linux-9.0.2.json b/bootstrap/linux-9.0.2.json
@@ -9,6 +9,15 @@
             "source": "local",
             "version": "3.8.0.20220526"
         },
+        {
+            "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
+            "revision": 0,
+            "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
+            "flags": [],
+            "package": "process",
+            "source": "hackage",
+            "version": "1.6.14.0"
+        },
         {
             "cabal_sha256": null,
             "revision": null,
@@ -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"

diff --git a/bootstrap/linux-9.2.3.json b/bootstrap/linux-9.2.3.json
@@ -9,6 +9,15 @@
             "source": "local",
             "version": "3.8.0.20220526"
         },
+        {
+            "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d",
+            "revision": 0,
+            "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d",
+            "flags": [],
+            "package": "process",
+            "source": "hackage",
+            "version": "1.6.14.0"
+        },
         {
             "cabal_sha256": null,
             "revision": null,
@@ -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"