From 025cd4a44601e3c0fd767149ded94ec8702fa1e7 Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Thu, 1 Jun 2023 12:20:43 +1000 Subject: [PATCH 1/6] Specify CoreFoundation framework as nativeBuildInput Currently, the frameworks are provided as build inputs - this is an attempt to provide the CoreFoundation framework as a nativeBuildInput to see if it addresses the current CI error tracked in #64. --- patches.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/patches.nix b/patches.nix index 1ef4945e..636c3c5a 100644 --- a/patches.nix +++ b/patches.nix @@ -303,4 +303,16 @@ in [ buildInputs = (m.buildInputs or []) ++ [pkgs.openssl]; }; } + + # Try adding `CoreFoundation` to `nativeBuildInputs` to address recent CI error. + { + condition = m: pkgs.lib.hasInfix "darwin" pkgs.system; + patch = m: { + nativeBuildInputs = + (m.nativeBuildInputs or []) + ++ [ + pkgs.darwin.apple_sdk.frameworks.CoreFoundation + ]; + }; + } ] From 851ca8623a3bb5aeb085cddfd5afc2928d1ae7ca Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Thu, 1 Jun 2023 12:32:30 +1000 Subject: [PATCH 2/6] Only apply patch to new package commits --- patches.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.nix b/patches.nix index 636c3c5a..e5631dba 100644 --- a/patches.nix +++ b/patches.nix @@ -306,7 +306,7 @@ in [ # Try adding `CoreFoundation` to `nativeBuildInputs` to address recent CI error. { - condition = m: pkgs.lib.hasInfix "darwin" pkgs.system; + condition = m: m.date >= "2023-05-27" && pkgs.lib.hasInfix "darwin" pkgs.system; patch = m: { nativeBuildInputs = (m.nativeBuildInputs or []) From 81039cfc4ba4c594c489a2774a913b99567e2ca3 Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Thu, 1 Jun 2023 13:11:26 +1000 Subject: [PATCH 3/6] Try propagatedBuildInputs (inputs also required at runtime) --- patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches.nix b/patches.nix index e5631dba..ad931322 100644 --- a/patches.nix +++ b/patches.nix @@ -304,12 +304,12 @@ in [ }; } - # Try adding `CoreFoundation` to `nativeBuildInputs` to address recent CI error. + # Try adding `CoreFoundation` to `propagatedBuildInputs` to address recent CI error. { condition = m: m.date >= "2023-05-27" && pkgs.lib.hasInfix "darwin" pkgs.system; patch = m: { - nativeBuildInputs = - (m.nativeBuildInputs or []) + propagatedBuildInputs = + (m.propagatedBuildInputs or []) ++ [ pkgs.darwin.apple_sdk.frameworks.CoreFoundation ]; From 99e4613772e398cd1dd554207145722126744bbc Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Thu, 1 Jun 2023 14:47:52 +1000 Subject: [PATCH 4/6] Remove propagatedBuildInputs CoreFoundation patch - not working --- patches.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/patches.nix b/patches.nix index ad931322..1ef4945e 100644 --- a/patches.nix +++ b/patches.nix @@ -303,16 +303,4 @@ in [ buildInputs = (m.buildInputs or []) ++ [pkgs.openssl]; }; } - - # Try adding `CoreFoundation` to `propagatedBuildInputs` to address recent CI error. - { - condition = m: m.date >= "2023-05-27" && pkgs.lib.hasInfix "darwin" pkgs.system; - patch = m: { - propagatedBuildInputs = - (m.propagatedBuildInputs or []) - ++ [ - pkgs.darwin.apple_sdk.frameworks.CoreFoundation - ]; - }; - } ] From 13a8abd1de2216950ac0f5b0de39437144691c0b Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Thu, 1 Jun 2023 14:48:42 +1000 Subject: [PATCH 5/6] Rm 2023-05-31 nightlies to find the most recent working versions --- manifests/forc-0.39.1-nightly-2023-05-31.nix | 8 -------- manifests/forc-client-0.39.1-nightly-2023-05-31.nix | 8 -------- manifests/forc-doc-0.39.1-nightly-2023-05-31.nix | 8 -------- manifests/forc-fmt-0.39.1-nightly-2023-05-31.nix | 8 -------- manifests/forc-index-0.15.1-nightly-2023-05-31.nix | 8 -------- manifests/forc-lsp-0.39.1-nightly-2023-05-31.nix | 8 -------- manifests/forc-tx-0.39.1-nightly-2023-05-31.nix | 8 -------- manifests/fuel-indexer-0.15.1-nightly-2023-05-31.nix | 8 -------- 8 files changed, 64 deletions(-) delete mode 100644 manifests/forc-0.39.1-nightly-2023-05-31.nix delete mode 100644 manifests/forc-client-0.39.1-nightly-2023-05-31.nix delete mode 100644 manifests/forc-doc-0.39.1-nightly-2023-05-31.nix delete mode 100644 manifests/forc-fmt-0.39.1-nightly-2023-05-31.nix delete mode 100644 manifests/forc-index-0.15.1-nightly-2023-05-31.nix delete mode 100644 manifests/forc-lsp-0.39.1-nightly-2023-05-31.nix delete mode 100644 manifests/forc-tx-0.39.1-nightly-2023-05-31.nix delete mode 100644 manifests/fuel-indexer-0.15.1-nightly-2023-05-31.nix diff --git a/manifests/forc-0.39.1-nightly-2023-05-31.nix b/manifests/forc-0.39.1-nightly-2023-05-31.nix deleted file mode 100644 index b824c510..00000000 --- a/manifests/forc-0.39.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc"; - version = "0.39.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/sway"; - rev = "08c5bc164a057531bfd0265336f147a0c4828bb3"; - sha256 = "sha256-xJXli+x2UnSLsWYxA5YaitVr297DZr0cj3CxKGhrhG8="; -} diff --git a/manifests/forc-client-0.39.1-nightly-2023-05-31.nix b/manifests/forc-client-0.39.1-nightly-2023-05-31.nix deleted file mode 100644 index e4af01d2..00000000 --- a/manifests/forc-client-0.39.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-client"; - version = "0.39.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/sway"; - rev = "08c5bc164a057531bfd0265336f147a0c4828bb3"; - sha256 = "sha256-xJXli+x2UnSLsWYxA5YaitVr297DZr0cj3CxKGhrhG8="; -} diff --git a/manifests/forc-doc-0.39.1-nightly-2023-05-31.nix b/manifests/forc-doc-0.39.1-nightly-2023-05-31.nix deleted file mode 100644 index ae68ca61..00000000 --- a/manifests/forc-doc-0.39.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-doc"; - version = "0.39.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/sway"; - rev = "08c5bc164a057531bfd0265336f147a0c4828bb3"; - sha256 = "sha256-xJXli+x2UnSLsWYxA5YaitVr297DZr0cj3CxKGhrhG8="; -} diff --git a/manifests/forc-fmt-0.39.1-nightly-2023-05-31.nix b/manifests/forc-fmt-0.39.1-nightly-2023-05-31.nix deleted file mode 100644 index 03725133..00000000 --- a/manifests/forc-fmt-0.39.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-fmt"; - version = "0.39.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/sway"; - rev = "08c5bc164a057531bfd0265336f147a0c4828bb3"; - sha256 = "sha256-xJXli+x2UnSLsWYxA5YaitVr297DZr0cj3CxKGhrhG8="; -} diff --git a/manifests/forc-index-0.15.1-nightly-2023-05-31.nix b/manifests/forc-index-0.15.1-nightly-2023-05-31.nix deleted file mode 100644 index 36440120..00000000 --- a/manifests/forc-index-0.15.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-index"; - version = "0.15.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/fuel-indexer"; - rev = "0076a7bf976c03594521115e3fbd962010562bfd"; - sha256 = "sha256-Ji7wtZMNYM5VDVPo6xcLNBtwzHGNe8EK+p3vG4qTKNQ="; -} diff --git a/manifests/forc-lsp-0.39.1-nightly-2023-05-31.nix b/manifests/forc-lsp-0.39.1-nightly-2023-05-31.nix deleted file mode 100644 index cb93c98b..00000000 --- a/manifests/forc-lsp-0.39.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-lsp"; - version = "0.39.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/sway"; - rev = "08c5bc164a057531bfd0265336f147a0c4828bb3"; - sha256 = "sha256-xJXli+x2UnSLsWYxA5YaitVr297DZr0cj3CxKGhrhG8="; -} diff --git a/manifests/forc-tx-0.39.1-nightly-2023-05-31.nix b/manifests/forc-tx-0.39.1-nightly-2023-05-31.nix deleted file mode 100644 index eaedaccf..00000000 --- a/manifests/forc-tx-0.39.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-tx"; - version = "0.39.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/sway"; - rev = "08c5bc164a057531bfd0265336f147a0c4828bb3"; - sha256 = "sha256-xJXli+x2UnSLsWYxA5YaitVr297DZr0cj3CxKGhrhG8="; -} diff --git a/manifests/fuel-indexer-0.15.1-nightly-2023-05-31.nix b/manifests/fuel-indexer-0.15.1-nightly-2023-05-31.nix deleted file mode 100644 index fe3afec1..00000000 --- a/manifests/fuel-indexer-0.15.1-nightly-2023-05-31.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "fuel-indexer"; - version = "0.15.1"; - date = "2023-05-31"; - url = "https://github.com/fuellabs/fuel-indexer"; - rev = "0076a7bf976c03594521115e3fbd962010562bfd"; - sha256 = "sha256-Ji7wtZMNYM5VDVPo6xcLNBtwzHGNe8EK+p3vG4qTKNQ="; -} From e7dbd14899ac0067e1b297b68c8c20ab192278c2 Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Thu, 1 Jun 2023 15:33:08 +1000 Subject: [PATCH 6/6] RM 2023-05-30 nightlies to find the most recent working versions --- manifests/forc-0.39.1-nightly-2023-05-30.nix | 8 -------- manifests/forc-client-0.39.1-nightly-2023-05-30.nix | 8 -------- manifests/forc-doc-0.39.1-nightly-2023-05-30.nix | 8 -------- manifests/forc-fmt-0.39.1-nightly-2023-05-30.nix | 8 -------- manifests/forc-lsp-0.39.1-nightly-2023-05-30.nix | 8 -------- manifests/forc-tx-0.39.1-nightly-2023-05-30.nix | 8 -------- manifests/fuel-core-0.18.1-nightly-2023-05-30.nix | 8 -------- manifests/fuel-core-client-0.18.1-nightly-2023-05-30.nix | 8 -------- 8 files changed, 64 deletions(-) delete mode 100644 manifests/forc-0.39.1-nightly-2023-05-30.nix delete mode 100644 manifests/forc-client-0.39.1-nightly-2023-05-30.nix delete mode 100644 manifests/forc-doc-0.39.1-nightly-2023-05-30.nix delete mode 100644 manifests/forc-fmt-0.39.1-nightly-2023-05-30.nix delete mode 100644 manifests/forc-lsp-0.39.1-nightly-2023-05-30.nix delete mode 100644 manifests/forc-tx-0.39.1-nightly-2023-05-30.nix delete mode 100644 manifests/fuel-core-0.18.1-nightly-2023-05-30.nix delete mode 100644 manifests/fuel-core-client-0.18.1-nightly-2023-05-30.nix diff --git a/manifests/forc-0.39.1-nightly-2023-05-30.nix b/manifests/forc-0.39.1-nightly-2023-05-30.nix deleted file mode 100644 index 7499d7d7..00000000 --- a/manifests/forc-0.39.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc"; - version = "0.39.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/sway"; - rev = "8844b4f60ef19ba5b1972e8e4932e023ec0415c0"; - sha256 = "sha256-bjH9jXuWxYBdwc/2ofNLE4NIUu6+Dqds0CajUmnsO9s="; -} diff --git a/manifests/forc-client-0.39.1-nightly-2023-05-30.nix b/manifests/forc-client-0.39.1-nightly-2023-05-30.nix deleted file mode 100644 index 838d2159..00000000 --- a/manifests/forc-client-0.39.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-client"; - version = "0.39.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/sway"; - rev = "8844b4f60ef19ba5b1972e8e4932e023ec0415c0"; - sha256 = "sha256-bjH9jXuWxYBdwc/2ofNLE4NIUu6+Dqds0CajUmnsO9s="; -} diff --git a/manifests/forc-doc-0.39.1-nightly-2023-05-30.nix b/manifests/forc-doc-0.39.1-nightly-2023-05-30.nix deleted file mode 100644 index d8a6054d..00000000 --- a/manifests/forc-doc-0.39.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-doc"; - version = "0.39.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/sway"; - rev = "8844b4f60ef19ba5b1972e8e4932e023ec0415c0"; - sha256 = "sha256-bjH9jXuWxYBdwc/2ofNLE4NIUu6+Dqds0CajUmnsO9s="; -} diff --git a/manifests/forc-fmt-0.39.1-nightly-2023-05-30.nix b/manifests/forc-fmt-0.39.1-nightly-2023-05-30.nix deleted file mode 100644 index 32279d0f..00000000 --- a/manifests/forc-fmt-0.39.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-fmt"; - version = "0.39.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/sway"; - rev = "8844b4f60ef19ba5b1972e8e4932e023ec0415c0"; - sha256 = "sha256-bjH9jXuWxYBdwc/2ofNLE4NIUu6+Dqds0CajUmnsO9s="; -} diff --git a/manifests/forc-lsp-0.39.1-nightly-2023-05-30.nix b/manifests/forc-lsp-0.39.1-nightly-2023-05-30.nix deleted file mode 100644 index 8898d224..00000000 --- a/manifests/forc-lsp-0.39.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-lsp"; - version = "0.39.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/sway"; - rev = "8844b4f60ef19ba5b1972e8e4932e023ec0415c0"; - sha256 = "sha256-bjH9jXuWxYBdwc/2ofNLE4NIUu6+Dqds0CajUmnsO9s="; -} diff --git a/manifests/forc-tx-0.39.1-nightly-2023-05-30.nix b/manifests/forc-tx-0.39.1-nightly-2023-05-30.nix deleted file mode 100644 index 40c56ec9..00000000 --- a/manifests/forc-tx-0.39.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "forc-tx"; - version = "0.39.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/sway"; - rev = "8844b4f60ef19ba5b1972e8e4932e023ec0415c0"; - sha256 = "sha256-bjH9jXuWxYBdwc/2ofNLE4NIUu6+Dqds0CajUmnsO9s="; -} diff --git a/manifests/fuel-core-0.18.1-nightly-2023-05-30.nix b/manifests/fuel-core-0.18.1-nightly-2023-05-30.nix deleted file mode 100644 index fed4f9e9..00000000 --- a/manifests/fuel-core-0.18.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "fuel-core"; - version = "0.18.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/fuel-core"; - rev = "ea438b7d8f9404f185239f3f6896bd4c1dd33701"; - sha256 = "sha256-cJnwue+SjqLhgMqngHrupcsAHBHfUKG4hfVmFvwWoBo="; -} diff --git a/manifests/fuel-core-client-0.18.1-nightly-2023-05-30.nix b/manifests/fuel-core-client-0.18.1-nightly-2023-05-30.nix deleted file mode 100644 index 389bda77..00000000 --- a/manifests/fuel-core-client-0.18.1-nightly-2023-05-30.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pname = "fuel-core-client"; - version = "0.18.1"; - date = "2023-05-30"; - url = "https://github.com/fuellabs/fuel-core"; - rev = "ea438b7d8f9404f185239f3f6896bd4c1dd33701"; - sha256 = "sha256-cJnwue+SjqLhgMqngHrupcsAHBHfUKG4hfVmFvwWoBo="; -}