From 03cba06747b910290b7eb1e0a2afe01d9423a4ae Mon Sep 17 00:00:00 2001 From: Sophie Dankel <47993817+sdankel@users.noreply.github.com> Date: Tue, 7 Jan 2025 05:52:27 -0800 Subject: [PATCH] fix: patch rust v1.81 as of >2024-12-30 (#153) Patches the version of rust, increases the timeout for the refresh-manifests actions, and moves them to run in build-jet. As a follow up, we should adjust the script to only refresh more recent nightly builds to reduce the time it takes. --------- Co-authored-by: GitHub Action --- .github/workflows/patch-pr.yml | 4 ++-- .github/workflows/refresh-manifests.yml | 4 ++-- flake.lock | 18 +++++++++--------- manifests/forc-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../forc-client-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../forc-crypto-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../forc-debug-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../forc-doc-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../forc-fmt-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../forc-lsp-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../forc-tx-0.66.5-nightly-2025-01-07.nix | 8 ++++++++ .../fuel-core-0.40.2-nightly-2025-01-01.nix | 8 ++++++++ .../fuel-core-0.40.2-nightly-2025-01-03.nix | 8 ++++++++ .../fuel-core-0.40.2-nightly-2025-01-07.nix | 8 ++++++++ ...l-core-client-0.40.2-nightly-2025-01-01.nix | 8 ++++++++ ...l-core-client-0.40.2-nightly-2025-01-03.nix | 8 ++++++++ ...l-core-client-0.40.2-nightly-2025-01-07.nix | 8 ++++++++ patches.nix | 10 ++++++++++ 18 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 manifests/forc-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/forc-client-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/forc-crypto-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/forc-debug-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/forc-doc-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/forc-fmt-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/forc-lsp-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/forc-tx-0.66.5-nightly-2025-01-07.nix create mode 100644 manifests/fuel-core-0.40.2-nightly-2025-01-01.nix create mode 100644 manifests/fuel-core-0.40.2-nightly-2025-01-03.nix create mode 100644 manifests/fuel-core-0.40.2-nightly-2025-01-07.nix create mode 100644 manifests/fuel-core-client-0.40.2-nightly-2025-01-01.nix create mode 100644 manifests/fuel-core-client-0.40.2-nightly-2025-01-03.nix create mode 100644 manifests/fuel-core-client-0.40.2-nightly-2025-01-07.nix diff --git a/.github/workflows/patch-pr.yml b/.github/workflows/patch-pr.yml index 6289a5f1..144ec99f 100644 --- a/.github/workflows/patch-pr.yml +++ b/.github/workflows/patch-pr.yml @@ -11,7 +11,7 @@ concurrency: jobs: refresh-and-commit: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2204 if: github.ref != 'refs/heads/master' permissions: # Give the default GITHUB_TOKEN write permission to commit and push the @@ -31,7 +31,7 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix flake update - run: nix run .#refresh-manifests - timeout-minutes: 120 + timeout-minutes: 240 - name: validate changed nix files run: | files=( $(git diff --name-only '*.nix') ) diff --git a/.github/workflows/refresh-manifests.yml b/.github/workflows/refresh-manifests.yml index 4df0cfd3..62628d81 100644 --- a/.github/workflows/refresh-manifests.yml +++ b/.github/workflows/refresh-manifests.yml @@ -7,7 +7,7 @@ on: jobs: refresh-and-upload-manifests: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2204 steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v22 @@ -18,7 +18,7 @@ jobs: name: fuellabs authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix run .#refresh-manifests - timeout-minutes: 120 + timeout-minutes: 240 - name: validate changed nix files run: | files=( $(git diff --name-only '*.nix') ) diff --git a/flake.lock b/flake.lock index 94ea7070..07d147d7 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1723688259, - "narHash": "sha256-WzeUR1MG9MnJnh9T7qcVe/v12qHvJvzdc3Z5HCeE2ns=", + "lastModified": 1736216977, + "narHash": "sha256-EMueGrzBpryM8mgOyoyJ7DdNRRk09ug1ggcLLp0WrCQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6e75319846684326d900daff1e2e11338cc80d2b", + "rev": "bbe7e4e7a70d235db4bbdcabbf8a2f6671881dd7", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/manifests/forc-0.66.5-nightly-2025-01-07.nix b/manifests/forc-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..96fb4e08 --- /dev/null +++ b/manifests/forc-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/forc-client-0.66.5-nightly-2025-01-07.nix b/manifests/forc-client-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..6bc07043 --- /dev/null +++ b/manifests/forc-client-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc-client"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/forc-crypto-0.66.5-nightly-2025-01-07.nix b/manifests/forc-crypto-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..7048fc12 --- /dev/null +++ b/manifests/forc-crypto-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc-crypto"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/forc-debug-0.66.5-nightly-2025-01-07.nix b/manifests/forc-debug-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..fca42b43 --- /dev/null +++ b/manifests/forc-debug-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc-debug"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/forc-doc-0.66.5-nightly-2025-01-07.nix b/manifests/forc-doc-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..eb74eb3f --- /dev/null +++ b/manifests/forc-doc-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc-doc"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/forc-fmt-0.66.5-nightly-2025-01-07.nix b/manifests/forc-fmt-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..2f70f62a --- /dev/null +++ b/manifests/forc-fmt-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc-fmt"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/forc-lsp-0.66.5-nightly-2025-01-07.nix b/manifests/forc-lsp-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..8f64bc93 --- /dev/null +++ b/manifests/forc-lsp-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc-lsp"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/forc-tx-0.66.5-nightly-2025-01-07.nix b/manifests/forc-tx-0.66.5-nightly-2025-01-07.nix new file mode 100644 index 00000000..fb3ae100 --- /dev/null +++ b/manifests/forc-tx-0.66.5-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "forc-tx"; + version = "0.66.5"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/sway"; + rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea"; + sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4="; +} diff --git a/manifests/fuel-core-0.40.2-nightly-2025-01-01.nix b/manifests/fuel-core-0.40.2-nightly-2025-01-01.nix new file mode 100644 index 00000000..e7e3c40d --- /dev/null +++ b/manifests/fuel-core-0.40.2-nightly-2025-01-01.nix @@ -0,0 +1,8 @@ +{ + pname = "fuel-core"; + version = "0.40.2"; + date = "2025-01-01"; + url = "https://github.com/fuellabs/fuel-core"; + rev = "df0283c2fc32cdf053ce20dfd021e5206c9c5e86"; + sha256 = "sha256-yTQTj709y6lK6HN0pMDGWot5CcSQLDBilHlB7J0krJs="; +} diff --git a/manifests/fuel-core-0.40.2-nightly-2025-01-03.nix b/manifests/fuel-core-0.40.2-nightly-2025-01-03.nix new file mode 100644 index 00000000..ecd7604c --- /dev/null +++ b/manifests/fuel-core-0.40.2-nightly-2025-01-03.nix @@ -0,0 +1,8 @@ +{ + pname = "fuel-core"; + version = "0.40.2"; + date = "2025-01-03"; + url = "https://github.com/fuellabs/fuel-core"; + rev = "d84306f9a83a4a2358ef18a5033dfb0812170a87"; + sha256 = "sha256-xoYEyVP0pK2qBofca9gCzODfOtwZrchrzu5k1QXXBsA="; +} diff --git a/manifests/fuel-core-0.40.2-nightly-2025-01-07.nix b/manifests/fuel-core-0.40.2-nightly-2025-01-07.nix new file mode 100644 index 00000000..fa74448e --- /dev/null +++ b/manifests/fuel-core-0.40.2-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "fuel-core"; + version = "0.40.2"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/fuel-core"; + rev = "4f77f349ed7eba886e04ffe49c385ef635ec69b1"; + sha256 = "sha256-tuLI2jsCyolvWB4BFCYDX6CsxBDCJR0iThZ5TUIlhtY="; +} diff --git a/manifests/fuel-core-client-0.40.2-nightly-2025-01-01.nix b/manifests/fuel-core-client-0.40.2-nightly-2025-01-01.nix new file mode 100644 index 00000000..01a8b97f --- /dev/null +++ b/manifests/fuel-core-client-0.40.2-nightly-2025-01-01.nix @@ -0,0 +1,8 @@ +{ + pname = "fuel-core-client"; + version = "0.40.2"; + date = "2025-01-01"; + url = "https://github.com/fuellabs/fuel-core"; + rev = "df0283c2fc32cdf053ce20dfd021e5206c9c5e86"; + sha256 = "sha256-yTQTj709y6lK6HN0pMDGWot5CcSQLDBilHlB7J0krJs="; +} diff --git a/manifests/fuel-core-client-0.40.2-nightly-2025-01-03.nix b/manifests/fuel-core-client-0.40.2-nightly-2025-01-03.nix new file mode 100644 index 00000000..87e12298 --- /dev/null +++ b/manifests/fuel-core-client-0.40.2-nightly-2025-01-03.nix @@ -0,0 +1,8 @@ +{ + pname = "fuel-core-client"; + version = "0.40.2"; + date = "2025-01-03"; + url = "https://github.com/fuellabs/fuel-core"; + rev = "d84306f9a83a4a2358ef18a5033dfb0812170a87"; + sha256 = "sha256-xoYEyVP0pK2qBofca9gCzODfOtwZrchrzu5k1QXXBsA="; +} diff --git a/manifests/fuel-core-client-0.40.2-nightly-2025-01-07.nix b/manifests/fuel-core-client-0.40.2-nightly-2025-01-07.nix new file mode 100644 index 00000000..d6a4187a --- /dev/null +++ b/manifests/fuel-core-client-0.40.2-nightly-2025-01-07.nix @@ -0,0 +1,8 @@ +{ + pname = "fuel-core-client"; + version = "0.40.2"; + date = "2025-01-07"; + url = "https://github.com/fuellabs/fuel-core"; + rev = "4f77f349ed7eba886e04ffe49c385ef635ec69b1"; + sha256 = "sha256-tuLI2jsCyolvWB4BFCYDX6CsxBDCJR0iThZ5TUIlhtY="; +} diff --git a/patches.nix b/patches.nix index 941833bb..34dfcdd6 100644 --- a/patches.nix +++ b/patches.nix @@ -336,4 +336,14 @@ in [ }; }; } + + # `fuel-core` requires Rust 1.81 as of v0.40.2. + { + condition = m: m.date >= "2024-12-30"; + patch = m: { + rust = pkgs.rust-bin.stable."1.81.0".default.override { + targets = ["wasm32-unknown-unknown"]; + }; + }; + } ]