From e2afb6a831940aba237b16cd33c9b595b1fcf911 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 21:53:46 +0100 Subject: [PATCH] treewide: migrate to fetchCargoVendor, batch 6 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. These cases could have been included in batch 1, except that nix-update also changes the formatting of source hash. It should be possible to verify this in the same way as batch 1, except that the commands will additionally result in non-functional source hash changes that I didn't include here. --- pkgs/by-name/ca/cargo-espmonitor/package.nix | 3 ++- pkgs/by-name/co/colorpanes/package.nix | 3 ++- pkgs/by-name/co/commit-formatter/package.nix | 3 ++- pkgs/by-name/dd/ddh/package.nix | 3 ++- pkgs/by-name/di/didu/package.nix | 3 ++- pkgs/by-name/nu/nux/package.nix | 3 ++- pkgs/by-name/pe/peertube-viewer/package.nix | 3 ++- pkgs/by-name/pr/present-cli/package.nix | 3 ++- pkgs/by-name/pr/proton-vpn-local-agent/package.nix | 3 ++- pkgs/by-name/to/todo/package.nix | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ca/cargo-espmonitor/package.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix index 4d81694e385e..af6658d63559 100644 --- a/pkgs/by-name/ca/cargo-espmonitor/package.nix +++ b/pkgs/by-name/ca/cargo-espmonitor/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4="; }; - cargoHash = "sha256-d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Fb/xJLhmInYOanJC6XGsxxsCJNCLvHDe04+wtvXMecE="; meta = with lib; { description = "Cargo tool for monitoring ESP32/ESP8266 execution"; diff --git a/pkgs/by-name/co/colorpanes/package.nix b/pkgs/by-name/co/colorpanes/package.nix index 534b153aa95e..15d818037786 100644 --- a/pkgs/by-name/co/colorpanes/package.nix +++ b/pkgs/by-name/co/colorpanes/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU="; }; - cargoHash = "sha256-eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M="; + useFetchCargoVendor = true; + cargoHash = "sha256-+ltcTuLksNwe7KIt8apYNZkMoA2w4EObG5dhJliRb6Y="; postInstall = '' ln -s $out/bin/colp $out/bin/colorpanes diff --git a/pkgs/by-name/co/commit-formatter/package.nix b/pkgs/by-name/co/commit-formatter/package.nix index 640a952d1262..3f24dc99fe70 100644 --- a/pkgs/by-name/co/commit-formatter/package.nix +++ b/pkgs/by-name/co/commit-formatter/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA="; }; - cargoHash = "sha256-AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-uW+mmArQZ5Pl2TlKIRd00dB6615Nn/Q8KtRE/ahl5V4="; meta = with lib; { description = "CLI tool to help you write git commit"; diff --git a/pkgs/by-name/dd/ddh/package.nix b/pkgs/by-name/dd/ddh/package.nix index ecfa8c702ab9..61cd4ae7c79f 100644 --- a/pkgs/by-name/dd/ddh/package.nix +++ b/pkgs/by-name/dd/ddh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw="; }; - cargoHash = "sha256-6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI="; + useFetchCargoVendor = true; + cargoHash = "sha256-rl9+3JSFkqZwaIWCuZBDhDF0QBr+aB2I7kB1o9LWCEw="; meta = with lib; { description = "Fast duplicate file finder"; diff --git a/pkgs/by-name/di/didu/package.nix b/pkgs/by-name/di/didu/package.nix index bdf1b51a7cb8..f9f7e7fc1f14 100644 --- a/pkgs/by-name/di/didu/package.nix +++ b/pkgs/by-name/di/didu/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0="; }; - cargoHash = "sha256-O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA="; + useFetchCargoVendor = true; + cargoHash = "sha256-NDri4VuTI/ZsY3ZvpWmu/2I5GpmldQaoUSzyjGlq9lE="; meta = with lib; { description = "Duration conversion between units"; diff --git a/pkgs/by-name/nu/nux/package.nix b/pkgs/by-name/nu/nux/package.nix index a457bbd7b001..b682cde9c6c2 100644 --- a/pkgs/by-name/nu/nux/package.nix +++ b/pkgs/by-name/nu/nux/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-k3HRaWN8/MTZRGWBxI8RRK0tcSYBbSLs3vHkUdLGTc8"; }; - cargoHash = "sha256-wfUr3dcdALMEgJ6CaXhK4Gqk6xflCnov9tELA63drV4="; + useFetchCargoVendor = true; + cargoHash = "sha256-iemfLIiT2BOsf0Q4X8fmEHmgHMd0WQk1t2rmRUuF5pY="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix index 749948f2ccf2..4aa5dca89d33 100644 --- a/pkgs/by-name/pe/peertube-viewer/package.nix +++ b/pkgs/by-name/pe/peertube-viewer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZzeWk01migUrKR7GndtNo0kLYSCUXCg0H0eCXgrDXaM=="; }; - cargoHash = "sha256-5u5240PL5cKhnHsT7sRdccrbZBAbRN+fa+FhJP1gX/4=="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pf8Jj8XGYbNOAyYEBdAysOK92S3S7bZHerQh/2UlrbQ="; meta = with lib; { description = "A simple CLI browser for the peertube federated video platform"; diff --git a/pkgs/by-name/pr/present-cli/package.nix b/pkgs/by-name/pr/present-cli/package.nix index 8df4ea1e21fc..1898477156fb 100644 --- a/pkgs/by-name/pr/present-cli/package.nix +++ b/pkgs/by-name/pr/present-cli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "+kCHe84ikdCLd7j5YwP2j3xz+XTzzo/kLy+b9YUFDnI="; }; - cargoHash = "sha256-VKY/FQUrFWtLxKoK6LP6qPMqNN4absZvnAbH9mha1fI="; + useFetchCargoVendor = true; + cargoHash = "sha256-NZUxgS4iCmXsQa2bOdFiw7EqAAT22bgJjYaDZjJgL6I="; # required for tests postPatch = '' diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix index 28447625151c..d4d7fb7a68b4 100644 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { pname = "proton-vpn-local-agent"; version = "1.2.0"; - cargoHash = "sha256-qxNbHM6KmBmLbruOhbFIp3klz6RuKWBLioVsBPDQiLI="; + useFetchCargoVendor = true; + cargoHash = "sha256-KD+cTEmezTiGL+OmMryS/Q1mRR0n9jx80o3hb5X3ZYM="; src = fetchFromGitHub { owner = "ProtonVPN"; diff --git a/pkgs/by-name/to/todo/package.nix b/pkgs/by-name/to/todo/package.nix index 222eef329a7d..34d97ea887d7 100644 --- a/pkgs/by-name/to/todo/package.nix +++ b/pkgs/by-name/to/todo/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40="; }; - cargoHash = "sha256-B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-mRLTQYkKXxhcwI2Ra/HCkxejDl3nnraJw+VCqRgCUig="; nativeBuildInputs = [ pkg-config ];