From 4abf4c9150a18bd18146182c64842674a65a4582 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:05:27 +0100 Subject: [PATCH] clash-verge-rev: 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/cl/clash-verge-rev/package.nix | 2 +- pkgs/by-name/cl/clash-verge-rev/service.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 46c5006a21a86..3bbc157b7ffda 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -30,7 +30,7 @@ let hash = "sha256-kZf5O3n0xmNUN0G4hAWQDN9Oj9K7PtLpv6jnhh1C5Hg="; }; - service-cargo-hash = "sha256-uo/2QBsZzoTdwRiW0Kr7GGiQCpQH4lW4h5XHqWd5sTU="; + service-cargo-hash = "sha256-Sof0jnU5+IGWMmbqVqJmhUzDO6CRlFpwwzYx9Z5tZbk="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 841ab702fbeeb..9641abcc922d7 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage { OPENSSL_NO_VENDOR = 1; }; + useFetchCargoVendor = true; cargoHash = service-cargo-hash; }