From 28f55bb7fdcc3cd9bf8f2d7383f6e9bc3c75cf05 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:31:26 +0100 Subject: [PATCH] ssh-openpgp-auth,sshd-openpgp-auth: 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/ss/ssh-openpgp-auth/daemon.nix | 2 +- pkgs/by-name/ss/ssh-openpgp-auth/generic.nix | 1 + pkgs/by-name/ss/ssh-openpgp-auth/package.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix index a3e0cf324ef5..e7471ef70fb4 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix @@ -8,6 +8,6 @@ callPackage ./generic.nix { pname = "sshd-openpgp-auth"; version = "0.3.0"; srcHash = "sha256-IV0Nhdqyn12HDOp1jaKz3sKTI3ktFd5b6qybCLWt27I="; - cargoHash = "sha256-/+lZkVMeFUMRD7NQ/MHDU5f3rkKDx1kDv5tjA41RExc="; + cargoHash = "sha256-WyYzDzC83iL1c8gCj+mYDq3/gsFxmxEWKwLhWLEygkI="; metaDescription = "Command-line tool for creating and managing OpenPGP based trust anchors for SSH host keys"; } diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index f60424416f08..6de2efdc2821 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -34,6 +34,7 @@ rustPlatform.buildRustPackage { hash = srcHash; }; buildAndTestSubdir = pname; + useFetchCargoVendor = true; inherit cargoHash; nativeBuildInputs = [ diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix b/pkgs/by-name/ss/ssh-openpgp-auth/package.nix index a0850d3dd99b..73f88ceeee1c 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/package.nix @@ -4,6 +4,6 @@ callPackage ./generic.nix { pname = "ssh-openpgp-auth"; version = "0.2.2"; srcHash = "sha256-5ew6jT6Zr54QYaWFQIGYXd8sqC3yHHZjPfoaCossm8o="; - cargoHash = "sha256-/k/XAp7PHIJaJWf4Oa1JC1mMSR5pyeM4SSPCcr77cAg="; + cargoHash = "sha256-PHJiyq7zovn7EA7jDLJQxjxu2ErPHqBMwAlJpb5UVQY="; metaDescription = "Command-line tool that provides client-side functionality to transparently verify the identity of remote SSH hosts"; }