From 04a8526d2279ad286871f080360529635815ebd9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 30 Jan 2025 15:48:30 +0100 Subject: [PATCH 1/2] Revert "turn-rs: 3.2.0 -> 3.3.2" This reverts commit e3967be41119743b76d1ff234e2b8737ec2efd1b. The 3.3.2 tag appears to have been deleted before Hydra had a chance to fetch it. Revert to a version that we can actually build. (An attempt to update to 3.3.3 is currently stuck with failing CI.) --- pkgs/by-name/tu/turn-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index f15d22117714..9e43f62cc310 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.3.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-ITs6kNI1g7k8bcSSG6GwPGY5U+mFGqCTU6JIEj9mH/Q="; + hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8="; }; - cargoHash = "sha256-bmeTDMa/khX7fTDCGpf3U2LZPnkXL+bi69sv6NPnANI="; + cargoHash = "sha256-yRlfqG6WEtF9ebHm8Mh4FtzfoRoaQhBnOQotSpisLck="; passthru = { updateScript = nix-update-script { }; From d3f1aa43e6ab2a961cd5d30dcbf77c64bf7bdfbb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 30 Jan 2025 15:50:45 +0100 Subject: [PATCH 2/2] turn-rs: useFetchCargoVendor 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/by-name/tu/turn-rs/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index 9e43f62cc310..62d57d898168 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8="; }; - cargoHash = "sha256-yRlfqG6WEtF9ebHm8Mh4FtzfoRoaQhBnOQotSpisLck="; + useFetchCargoVendor = true; + cargoHash = "sha256-qSYGcZdMn7uelufs6z1UQtLxrRbBGNf3o1a1jR+qiqo="; passthru = { updateScript = nix-update-script { };