From 51169532ba6ff8cc5a8520a442459dc900535927 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 27 Jan 2025 05:18:47 +0100 Subject: [PATCH] scx.rustscheds: useFetchCargoVendor (#377086) Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/os-specific/linux/scx/scx_rustscheds.nix | 1 + pkgs/os-specific/linux/scx/version.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix index 1502f6fbb352..2e4cabfb95ea 100644 --- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix @@ -13,6 +13,7 @@ rustPlatform.buildRustPackage { pname = "scx_rustscheds"; inherit (scx-common) version src; + useFetchCargoVendor = true; inherit (scx-common.versionInfo.scx) cargoHash; # Copy compiled headers and libs from scx.cscheds diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json index f1c52f59fe75..e603cab61294 100644 --- a/pkgs/os-specific/linux/scx/version.json +++ b/pkgs/os-specific/linux/scx/version.json @@ -2,7 +2,7 @@ "scx": { "version": "1.0.8", "hash": "sha256-eXui9fvi8C/HHp8wU7STrDC8b950YZzyhoLoGHXZ6S8=", - "cargoHash": "sha256-ymFO6w4Y/VIKrnf0uF0Sso4OSc1MY2CeEwaXsAL5cgo=" + "cargoHash": "sha256-TdwymmaP6rG+Shh/9ByhXIlo+9yZapi9vWN5/5Rd3RY=" }, "bpftool": { "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",