From ad9714410e3f427de049ddbeca7dfd3779cafdce Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 12 Nov 2025 21:58:07 +0000
Subject: [PATCH 1/5] tkey-ssh-agent: Set ldflags for version

---
 pkgs/by-name/tk/tkey-ssh-agent/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index d4d509098bc9..75df2b843ee7 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -24,6 +24,11 @@ buildGoModule rec {
     "cmd/tkey-ssh-agent"
   ];
 
+  ldflags = [
+    "-w"
+    "-X main.version=${version}"
+  ];
+
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
     tests = {

From 4a1ff22bb2cbb721189ff9a64f1ca7d863d73c0d Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 12 Nov 2025 21:58:51 +0000
Subject: [PATCH 2/5] tkey-ssh-agent: Add versionCheckHook

---
 pkgs/by-name/tk/tkey-ssh-agent/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index 75df2b843ee7..36deda847925 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -5,6 +5,7 @@
   gitUpdater,
   testers,
   tkey-ssh-agent,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -38,6 +39,11 @@ buildGoModule rec {
     };
   };
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   meta = with lib; {
     description = "SSH Agent for TKey, the flexible open hardware/software USB security key";
     homepage = "https://tillitis.se/app/tkey-ssh-agent/";

From 64b2373ae763bb54b5e4567f97f62b6061f400d9 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 12 Nov 2025 21:59:45 +0000
Subject: [PATCH 3/5] tkey-ssh-agent: Add changelog

---
 pkgs/by-name/tk/tkey-ssh-agent/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index 36deda847925..b449b6d5fa56 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -47,6 +47,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "SSH Agent for TKey, the flexible open hardware/software USB security key";
     homepage = "https://tillitis.se/app/tkey-ssh-agent/";
+    changelog = "https://github.com/tillitis/tkey-ssh-agent/releases/tag/v${version}";
     license = licenses.gpl2;
     maintainers = with maintainers; [ bbigras ];
     mainProgram = "tkey-ssh-agent";

From 4228ac7308825868360073fcf57ce4d554ef65e2 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Thu, 13 Nov 2025 09:33:26 +0000
Subject: [PATCH 4/5] tkey-ssh-agent: Use finalAttrs

---
 pkgs/by-name/tk/tkey-ssh-agent/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index b449b6d5fa56..87ffeb31f893 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -8,14 +8,14 @@
   versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "tkey-ssh-agent";
   version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "tillitis";
     repo = "tkey-ssh-agent";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Uf3VJJfZn4UYX1q79JdaOfrore+L/Mic3whzpP32JV0=";
   };
 
@@ -27,7 +27,7 @@ buildGoModule rec {
 
   ldflags = [
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   passthru = {
@@ -47,10 +47,10 @@ buildGoModule rec {
   meta = with lib; {
     description = "SSH Agent for TKey, the flexible open hardware/software USB security key";
     homepage = "https://tillitis.se/app/tkey-ssh-agent/";
-    changelog = "https://github.com/tillitis/tkey-ssh-agent/releases/tag/v${version}";
+    changelog = "https://github.com/tillitis/tkey-ssh-agent/releases/tag/v${finalAttrs.version}";
     license = licenses.gpl2;
     maintainers = with maintainers; [ bbigras ];
     mainProgram = "tkey-ssh-agent";
     platforms = platforms.all;
   };
-}
+})

From d0312869279fe9bc09b4d547f4b44bcb9a778e1e Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Thu, 13 Nov 2025 15:57:26 +0000
Subject: [PATCH 5/5] tkey-ssh-agent: Remove redundant passthru.tests

---
 pkgs/by-name/tk/tkey-ssh-agent/package.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index 87ffeb31f893..b6cb3b4b9c56 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -3,8 +3,6 @@
   fetchFromGitHub,
   buildGoModule,
   gitUpdater,
-  testers,
-  tkey-ssh-agent,
   versionCheckHook,
 }:
 
@@ -32,11 +30,6 @@ buildGoModule (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
-    tests = {
-      tkey-ssh-agent-version = testers.testVersion {
-        package = tkey-ssh-agent;
-      };
-    };
   };
 
   nativeInstallCheckInputs = [