From 340c07bdac90e0195d7afff56a89b1dc8c360065 Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Thu, 4 Aug 2022 19:44:30 +0200 Subject: [PATCH 1/2] Bump package process dependency version to 1.6.15.0 (cherry picked from commit 6be173171efe0a002d5409be1f744d342c73157e) --- Cabal/Cabal.cabal | 2 +- bootstrap/linux-8.10.7.json | 6 +++--- bootstrap/linux-8.6.5.json | 6 +++--- bootstrap/linux-8.8.4.json | 6 +++--- bootstrap/linux-9.0.2.json | 6 +++--- bootstrap/linux-9.2.3.json | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 10efcd4a5ed..1008ffc43f2 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -48,7 +48,7 @@ library -- pull in process version with fixed waitForProcess error if impl(ghc >=8.2) - build-depends: process >= 1.6.14.0 + build-depends: process >= 1.6.15.0 if os(windows) build-depends: Win32 >= 2.3.0.0 && < 2.14 diff --git a/bootstrap/linux-8.10.7.json b/bootstrap/linux-8.10.7.json index 7046bbce6f8..ac30a8328ce 100644 --- a/bootstrap/linux-8.10.7.json +++ b/bootstrap/linux-8.10.7.json @@ -10,13 +10,13 @@ "version": "3.8.1.0" }, { - "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d", + "cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf", "revision": 0, - "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d", + "src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab", "flags": [], "package": "process", "source": "hackage", - "version": "1.6.14.0" + "version": "1.6.15.0" }, { "cabal_sha256": null, diff --git a/bootstrap/linux-8.6.5.json b/bootstrap/linux-8.6.5.json index 9cce33883cd..973a74beb65 100644 --- a/bootstrap/linux-8.6.5.json +++ b/bootstrap/linux-8.6.5.json @@ -10,13 +10,13 @@ "version": "3.8.1.0" }, { - "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d", + "cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf", "revision": 0, - "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d", + "src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab", "flags": [], "package": "process", "source": "hackage", - "version": "1.6.14.0" + "version": "1.6.15.0" }, { "cabal_sha256": null, diff --git a/bootstrap/linux-8.8.4.json b/bootstrap/linux-8.8.4.json index f4ba540915a..9bdebf11c4b 100644 --- a/bootstrap/linux-8.8.4.json +++ b/bootstrap/linux-8.8.4.json @@ -10,13 +10,13 @@ "version": "3.8.1.0" }, { - "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d", + "cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf", "revision": 0, - "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d", + "src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab", "flags": [], "package": "process", "source": "hackage", - "version": "1.6.14.0" + "version": "1.6.15.0" }, { "cabal_sha256": null, diff --git a/bootstrap/linux-9.0.2.json b/bootstrap/linux-9.0.2.json index 7f17b5d9af2..a9515141cb9 100644 --- a/bootstrap/linux-9.0.2.json +++ b/bootstrap/linux-9.0.2.json @@ -10,13 +10,13 @@ "version": "3.8.1.0" }, { - "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d", + "cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf", "revision": 0, - "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d", + "src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab", "flags": [], "package": "process", "source": "hackage", - "version": "1.6.14.0" + "version": "1.6.15.0" }, { "cabal_sha256": null, diff --git a/bootstrap/linux-9.2.3.json b/bootstrap/linux-9.2.3.json index 31557c953f3..480e5093b96 100644 --- a/bootstrap/linux-9.2.3.json +++ b/bootstrap/linux-9.2.3.json @@ -10,13 +10,13 @@ "version": "3.8.1.0" }, { - "cabal_sha256": "b6ad76fd3f4bf133cdc2dc9176e23447f2a0a8e9316047d53154cd11f871446d", + "cabal_sha256": "04df32d9497add5f0b90a27a3eceffa4bad5c2f41d038bd12ed6efc454db3faf", "revision": 0, - "src_sha256": "89d3e89c1367f9046edad58b0a434b6758c76f1b8c62c7c56536e5d1ee9f4a3d", + "src_sha256": "44b31b6cd3129893ac1a007573dedb69dde667fa06ee108526d58f08b1a1f7ab", "flags": [], "package": "process", "source": "hackage", - "version": "1.6.14.0" + "version": "1.6.15.0" }, { "cabal_sha256": null, From ad9e4dc3c63a293bbd89444fc356294e64766556 Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Fri, 5 Aug 2022 17:43:00 +0200 Subject: [PATCH 2/2] Move the drastic bound excluding buggy process to cabal-install In this way we no longer enforce the fixed process in our own tools (except cabal-install) and third-party tools using Cabal the library, but given the possibility of deps conflicts, this less intrusive approach may be better. (cherry picked from commit 304c774f0afdbb6b4d1cc6a2b84d0384daa45483) --- Cabal/Cabal.cabal | 4 ---- cabal-install/cabal-install.cabal | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 1008ffc43f2..a402440d743 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -46,10 +46,6 @@ 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.15.0 - if os(windows) build-depends: Win32 >= 2.3.0.0 && < 2.14 else diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 7c045d1ba45..8c1ae0ad3e1 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -244,6 +244,10 @@ library if flag(lukko) build-depends: lukko >= 0.1 && <0.2 + -- pull in process version with fixed waitForProcess error + if impl(ghc >=8.2) + build-depends: process >= 1.6.15.0 + executable cabal import: warnings, base-dep, cabal-dep, cabal-syntax-dep