From 11963707bf5da847de57396c7fb278db1856e94b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 28 Mar 2025 16:29:39 -0400
Subject: [PATCH] ssh-tpm-agent: 0.7.0 -> 0.8.0

https://github.com/Foxboron/ssh-tpm-agent/releases/tag/v0.8.0
---
 pkgs/by-name/ss/ssh-tpm-agent/package.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
index ca13fe9d84ba..61b24993e3b6 100644
--- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix
+++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
@@ -3,28 +3,40 @@
   buildGoModule,
   fetchFromGitHub,
   nix-update-script,
+  openssh,
   openssl,
 }:
 
 buildGoModule rec {
   pname = "ssh-tpm-agent";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "Foxboron";
     repo = "ssh-tpm-agent";
-    rev = "v${version}";
-    hash = "sha256-yK7G+wZIn+kJazKOFOs8EYlRWZkCQuT0qZfmdqbcOnM=";
+    tag = "v${version}";
+    hash = "sha256-CSxZctiQ/d4gzCUtfx9Oetb8s0XpHf3MPH/H0XaaVgg=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-njKyBfTG/QCPBBsj3Aom42cv2XqLv4YeS4DhwNQNaLA=";
+  vendorHash = "sha256-84ZB1B+RczJS08UToCWvvVfWrD62IQxy0XoBwn+wBkc=";
 
   buildInputs = [
     openssl
   ];
 
+  nativeCheckInputs = [
+    openssh
+  ];
+
+  # disable broken tests, see https://github.com/NixOS/nixpkgs/pull/394097
+  preCheck = ''
+    rm cmd/scripts_test.go
+    substituteInPlace internal/keyring/keyring_test.go --replace-fail ENOKEY ENOENT
+    substituteInPlace internal/keyring/threadkeyring_test.go --replace-fail ENOKEY ENOENT
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {