From 56a54b0810c2909e159f8bad057cb07bf09bb173 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:09:45 +0800
Subject: [PATCH 01/19] gopass: 1.16.0 -> 1.16.1

---
 pkgs/tools/security/gopass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 1e5cdadde472..e66efbe3ee01 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -28,7 +28,7 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "gopass";
-  version = "1.16.0";
+  version = "1.16.1";
 
   nativeBuildInputs = [
     installShellFiles
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
     owner = "gopasspw";
     repo = "gopass";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JBa/PhVj0cKr9Btz9KzhGgsL4APAfZ/ixHGHWzd2TfA=";
+    hash = "sha256-Yr66+LUEoONNkSQUQhIWtLvxN0a5YtRVbn/nJRLqn+E=";
   };
 
   vendorHash = "sha256-ebnnnAD7SQJrSVOPborHUWd8ThOstIgihEIUjrnCztQ=";

From 81a7c7bd53f0a68ea174a57f249f0eb0a742929a Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 11:12:31 +0800
Subject: [PATCH 02/19] gopass: add yzx9 to maintainers

---
 pkgs/tools/security/gopass/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index e66efbe3ee01..e22d472a5d6b 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -90,6 +90,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       rvolosatovs
       sikmir
+      yzx9
     ];
     changelog = "https://github.com/gopasspw/gopass/blob/v${finalAttrs.version}/CHANGELOG.md";
 

From 90477d5f53fd35c5be880a107c6e5d5223d3634f Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 15 Dec 2025 10:51:10 +0800
Subject: [PATCH 03/19] gopass: remove `versionCheckProgramArg`

---
 pkgs/tools/security/gopass/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index e22d472a5d6b..7f9bbea39498 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -75,7 +75,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
     gitMinimal
   ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     inherit wrapperPath;

From 123beb1ddd55648ab4c0f7afadc20fed9e065df4 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 15 Dec 2025 11:55:01 +0800
Subject: [PATCH 04/19] gopass: move to by-name

---
 .../gopass/default.nix => by-name/go/gopass/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/gopass/default.nix => by-name/go/gopass/package.nix} (100%)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/by-name/go/gopass/package.nix
similarity index 100%
rename from pkgs/tools/security/gopass/default.nix
rename to pkgs/by-name/go/gopass/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1566cd682797..189ee4b01572 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1645,8 +1645,6 @@ with pkgs;
 
   passExtensions = recurseIntoAttrs pass.extensions;
 
-  gopass = callPackage ../tools/security/gopass { };
-
   gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
 
   git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };

From 1d7f38dc3be5636ed47858f455a60e97e0d3deb4 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:37:47 +0800
Subject: [PATCH 05/19] gopass-hibp: 1.16.0 -> 1.16.1

---
 pkgs/tools/security/gopass/hibp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix
index 6d19f7972909..d115e981240a 100644
--- a/pkgs/tools/security/gopass/hibp.nix
+++ b/pkgs/tools/security/gopass/hibp.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gopass-hibp";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-hibp";
     rev = "v${version}";
-    hash = "sha256-S4X2DWaktAfoqjLz7yAF5I0v+01bQbQLSgEb/105iCk=";
+    hash = "sha256-BlZxXN14bOO7LMdjS/ooqVKmRZQTpNYlYp4A4rTew4Q=";
   };
 
-  vendorHash = "sha256-8LC271XuMeDGWZnysMMumoqLwklQpDKr8VF/zyCvwNA=";
+  vendorHash = "sha256-LUmxstDE0paYaNS2Em1Xc6pJmHHWk/IJEjTZXq5qWW8=";
 
   subPackages = [ "." ];
 

From 25914763dc6fe32bf16f82e76fcb087f897b0b86 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:39:44 +0800
Subject: [PATCH 06/19] gopass-hibp: modernize

---
 pkgs/tools/security/gopass/hibp.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix
index d115e981240a..650ad11f61e0 100644
--- a/pkgs/tools/security/gopass/hibp.nix
+++ b/pkgs/tools/security/gopass/hibp.nix
@@ -1,19 +1,19 @@
 {
   lib,
-  makeWrapper,
   buildGoModule,
   fetchFromGitHub,
+  makeWrapper,
   gopass,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gopass-hibp";
   version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-hibp";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BlZxXN14bOO7LMdjS/ooqVKmRZQTpNYlYp4A4rTew4Q=";
   };
 
@@ -26,8 +26,8 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
-    "-X main.commit=${src.rev}"
+    "-X main.version=${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.src.rev}"
   ];
 
   postFixup = ''
@@ -40,9 +40,9 @@ buildGoModule rec {
   meta = {
     description = "Gopass haveibeenpwnd.com integration";
     homepage = "https://github.com/gopasspw/gopass-hibp";
-    changelog = "https://github.com/gopasspw/gopass-hibp/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/gopasspw/gopass-hibp/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sikmir ];
     mainProgram = "gopass-hibp";
   };
-}
+})

From b6638b48e95fef89ae62bf75238aaefe3dcffb05 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:41:53 +0800
Subject: [PATCH 07/19] gopass-hibp: remove dependency on gopass, add version
 check

---
 pkgs/tools/security/gopass/hibp.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix
index 650ad11f61e0..7b7b54b201c6 100644
--- a/pkgs/tools/security/gopass/hibp.nix
+++ b/pkgs/tools/security/gopass/hibp.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   makeWrapper,
   gopass,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -32,7 +34,18 @@ buildGoModule (finalAttrs: {
 
   postFixup = ''
     wrapProgram $out/bin/gopass-hibp \
-      --prefix PATH : "${lib.makeBinPath [ gopass ]}"
+      --prefix PATH : "${gopass.wrapperPath}"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+    gopass
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  preVersionCheck = ''
+    gopass setup --name "user" --email "user@localhost"
   '';
 
   __darwinAllowLocalNetworking = true;

From e12dccdc36a08cf015fe07464ee6ada663bf0675 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 15 Dec 2025 11:57:23 +0800
Subject: [PATCH 08/19] gopass-hibp: move to by-name

---
 .../gopass/hibp.nix => by-name/go/gopass-hibp/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/gopass/hibp.nix => by-name/go/gopass-hibp/package.nix} (100%)

diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/by-name/go/gopass-hibp/package.nix
similarity index 100%
rename from pkgs/tools/security/gopass/hibp.nix
rename to pkgs/by-name/go/gopass-hibp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 189ee4b01572..105a4c615f1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1645,8 +1645,6 @@ with pkgs;
 
   passExtensions = recurseIntoAttrs pass.extensions;
 
-  gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
-
   git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
 
   gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };

From 3af0835334ea37d387698d424d4fd2fc0d52555e Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:51:05 +0800
Subject: [PATCH 09/19] gopass-jsonapi: 1.16.0 -> 1.16.1

---
 pkgs/by-name/go/gopass-jsonapi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index de9d0d47098f..a1f18cb30850 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -26,16 +26,16 @@ let
 in
 buildGoModule rec {
   pname = "gopass-jsonapi";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-jsonapi";
     rev = "v${version}";
-    hash = "sha256-LPGAK/vwcbsAvL3TXX78cPCbNbYXh2++Ta1D8RjbKK4=";
+    hash = "sha256-JN/SC7lvPVTONNbOUmgu//xK/GaR5Tljxn99Zb1J/kQ=";
   };
 
-  vendorHash = "sha256-TTTjQRUYKqtyE/vFHol0ewbkh+2oGo9Pjr1qTmfXrq4=";
+  vendorHash = "sha256-Ki0gzhDkoUvgTCN4bYrqvN0u3AgdG22MWxcVHIE9lUQ=";
 
   subPackages = [ "." ];
 

From 5c929520c5857e97725bdb7ac5c4219775be10a5 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:52:45 +0800
Subject: [PATCH 10/19] gopass-jsonapi: modernize

---
 pkgs/by-name/go/gopass-jsonapi/package.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index a1f18cb30850..38afe6504f61 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   makeWrapper,
   buildGoModule,
   fetchFromGitHub,
@@ -11,7 +10,6 @@
 }:
 
 let
-
   # https://github.com/gopasspw/gopass-jsonapi/blob/v1.16.0/internal/jsonapi/manifest/manifest_path_linux.go
   manifestPaths = {
     firefox = "$out/lib/mozilla/native-messaging-hosts/com.justwatch.gopass.json";
@@ -22,16 +20,15 @@ let
     iridium = "$out/etc/iridium-browser/native-messaging-hosts/com.justwatch.gopass.json";
     slimjet = "$out/etc/opt/slimjet/native-messaging-hosts/com.justwatch.gopass.json";
   };
-
 in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gopass-jsonapi";
   version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-jsonapi";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-JN/SC7lvPVTONNbOUmgu//xK/GaR5Tljxn99Zb1J/kQ=";
   };
 
@@ -47,8 +44,8 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
-    "-X main.commit=${src.rev}"
+    "-X main.version=${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.src.rev}"
   ];
 
   postInstall = ''
@@ -64,7 +61,7 @@ buildGoModule rec {
       in
       # The options after `--print=false` are of no effect, but if missing
       # `gopass-jsonapi configure` will ask for them. (`--libpath` and `--global`
-      # are overriden by `--manifest-path`. `--libpath` is only used to
+      # are overridden by `--manifest-path`. `--libpath` is only used to
       # compute Firefox's global manifest path. See
       # https://github.com/gopasspw/gopass-jsonapi/blob/v1.16.0/setup_others.go#L33-L46)
       #
@@ -99,7 +96,7 @@ buildGoModule rec {
   meta = {
     description = "Enables communication with gopass via JSON messages";
     homepage = "https://github.com/gopasspw/gopass-jsonapi";
-    changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       maxhbr
@@ -107,4 +104,4 @@ buildGoModule rec {
     ];
     mainProgram = "gopass-jsonapi";
   };
-}
+})

From 27a4bf22d18773053dc0b4c3cd678549bbfa882a Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:54:53 +0800
Subject: [PATCH 11/19] gopass-jsonapi: add version check

---
 pkgs/by-name/go/gopass-jsonapi/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index 38afe6504f61..e8f18eb1f1f0 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -4,9 +4,11 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  writableTmpDirAsHomeHook,
   jq,
   gnupg,
   gopass,
+  versionCheckHook,
 }:
 
 let
@@ -39,6 +41,7 @@ buildGoModule (finalAttrs: {
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
+    writableTmpDirAsHomeHook
   ];
 
   ldflags = [
@@ -50,7 +53,6 @@ buildGoModule (finalAttrs: {
 
   postInstall = ''
     # Generate native messaging manifests for Chrome and Firefox.
-    export HOME=$(mktemp -d)
     ${gnupg}/bin/gpg --batch --passphrase "" --quick-generate-key "user <user@localhost>"
     ${gopass}/bin/gopass setup --name "user" --email "user@localhost"
 
@@ -93,6 +95,12 @@ buildGoModule (finalAttrs: {
       --prefix PATH : "${gopass.wrapperPath}"
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+
   meta = {
     description = "Enables communication with gopass via JSON messages";
     homepage = "https://github.com/gopasspw/gopass-jsonapi";

From 28ab363fc6e94045d0819db228a20524dec48ea3 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:47:11 +0800
Subject: [PATCH 12/19] gopass-summon-provider: 1.16.0 -> 1.16.1

---
 pkgs/tools/security/gopass/summon.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix
index 70390ec48e4e..65e1cd74b695 100644
--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gopass-summon-provider";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-summon-provider";
     rev = "v${version}";
-    hash = "sha256-ES+lU0iBwzkomWoVKQrKElOaH9XiumnzpBVRjWbI/cM=";
+    hash = "sha256-j3N/snUCsw/NlMQO9CoVRf6JCG48DEHqrJnZ7wiVUPk=";
   };
 
-  vendorHash = "sha256-gE8x+81DFzw0TSkxwU5s+OQccSvfRVH6dV+sWhMdBxI=";
+  vendorHash = "sha256-FhS79dSY9FjlScoXd6EbYRRwEBObZLO9g/SXBEXQpjM=";
 
   subPackages = [ "." ];
 

From 301f65340ce719541e04f8cc00b6235ac9bb092f Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:47:24 +0800
Subject: [PATCH 13/19] gopass-summon-provider: modernize

---
 pkgs/tools/security/gopass/summon.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix
index 65e1cd74b695..0255633e0c4a 100644
--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -1,19 +1,19 @@
 {
   lib,
-  makeWrapper,
   buildGoModule,
   fetchFromGitHub,
+  makeWrapper,
   gopass,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gopass-summon-provider";
   version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-summon-provider";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-j3N/snUCsw/NlMQO9CoVRf6JCG48DEHqrJnZ7wiVUPk=";
   };
 
@@ -26,8 +26,8 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
-    "-X main.commit=${src.rev}"
+    "-X main.version=${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.src.rev}"
   ];
 
   postFixup = ''
@@ -38,9 +38,9 @@ buildGoModule rec {
   meta = {
     description = "Gopass Summon Provider";
     homepage = "https://github.com/gopasspw/gopass-summon-provider";
-    changelog = "https://github.com/gopasspw/gopass-summon-provider/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/gopasspw/gopass-summon-provider/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sikmir ];
     mainProgram = "gopass-summon-provider";
   };
-}
+})

From 5fb785fb66481976f26dbcdd3750d92faa5a1717 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:48:39 +0800
Subject: [PATCH 14/19] gopass-summon-provider: remove dependency on gopass,
 add version check

---
 pkgs/tools/security/gopass/summon.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix
index 0255633e0c4a..599daa4b4bce 100644
--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   makeWrapper,
   gopass,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -32,7 +34,18 @@ buildGoModule (finalAttrs: {
 
   postFixup = ''
     wrapProgram $out/bin/gopass-summon-provider \
-      --prefix PATH : "${lib.makeBinPath [ gopass ]}"
+      --prefix PATH : "${gopass.wrapperPath}"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+    gopass
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  preVersionCheck = ''
+    gopass setup --name "user" --email "user@localhost"
   '';
 
   meta = {

From 9bffde2ba66db0057c469f8c458a369b586d688c Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 15 Dec 2025 11:59:03 +0800
Subject: [PATCH 15/19] gopass-summon-provider: move to by-name

---
 .../go/gopass-summon-provider/package.nix}                      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/gopass/summon.nix => by-name/go/gopass-summon-provider/package.nix} (100%)

diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/by-name/go/gopass-summon-provider/package.nix
similarity index 100%
rename from pkgs/tools/security/gopass/summon.nix
rename to pkgs/by-name/go/gopass-summon-provider/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 105a4c615f1c..278617b29e5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1647,8 +1647,6 @@ with pkgs;
 
   git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
 
-  gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
-
   kerf = kerf_1; # kerf2 is WIP
   kerf_1 = callPackage ../development/interpreters/kerf {
     stdenv = clangStdenv;

From 6193e8abf674e2286c3bb54e16a9cd625db06a3c Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:12:38 +0800
Subject: [PATCH 16/19] git-credential-gopass: 1.16.0 -> 1.16.1

---
 pkgs/tools/security/gopass/git-credential.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix
index 47664681bbc8..a5a457f04a10 100644
--- a/pkgs/tools/security/gopass/git-credential.nix
+++ b/pkgs/tools/security/gopass/git-credential.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "git-credential-gopass";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "git-credential-gopass";
     rev = "v${version}";
-    hash = "sha256-1045Ui8/WKNkAi6iSpJ1nsryA9J3U5KMAElYwN6Dho8=";
+    hash = "sha256-IEur3Sw2zRYJxlwAhgpb2OnBt+FcC+OdeT7M/LzJwoY=";
   };
 
-  vendorHash = "sha256-JDrC0h4+ltdMHOR36BDkVpcFDDaHGv6IDnW0O4QvWVI=";
+  vendorHash = "sha256-mtJIm7dH3jP7p0R0KxN0Yf7mi9rkJ73u8biy2Ygvk3k=";
 
   subPackages = [ "." ];
 

From d1347ec90896878d892b7a83966ca4096642eaad Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:13:30 +0800
Subject: [PATCH 17/19] git-credential-gopass: modernize

---
 pkgs/tools/security/gopass/git-credential.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix
index a5a457f04a10..61e2751c1294 100644
--- a/pkgs/tools/security/gopass/git-credential.nix
+++ b/pkgs/tools/security/gopass/git-credential.nix
@@ -1,19 +1,19 @@
 {
   lib,
-  makeWrapper,
   buildGoModule,
   fetchFromGitHub,
+  makeWrapper,
   gopass,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "git-credential-gopass";
   version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "git-credential-gopass";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-IEur3Sw2zRYJxlwAhgpb2OnBt+FcC+OdeT7M/LzJwoY=";
   };
 
@@ -26,8 +26,8 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
-    "-X main.commit=${src.rev}"
+    "-X main.version=${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.src.rev}"
   ];
 
   postFixup = ''
@@ -38,9 +38,9 @@ buildGoModule rec {
   meta = {
     description = "Manage git credentials using gopass";
     homepage = "https://github.com/gopasspw/git-credential-gopass";
-    changelog = "https://github.com/gopasspw/git-credential-gopass/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/gopasspw/git-credential-gopass/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ benneti ];
     mainProgram = "git-credential-gopass";
   };
-}
+})

From 14b4dacdbb4ea7570346df68709217a6bee6ed77 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 14 Dec 2025 10:16:02 +0800
Subject: [PATCH 18/19] git-credential-gopass: remove dependency on gopass, add
 version check

---
 pkgs/tools/security/gopass/git-credential.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix
index 61e2751c1294..c5b2ad2852db 100644
--- a/pkgs/tools/security/gopass/git-credential.nix
+++ b/pkgs/tools/security/gopass/git-credential.nix
@@ -3,7 +3,9 @@
   buildGoModule,
   fetchFromGitHub,
   makeWrapper,
+  writableTmpDirAsHomeHook,
   gopass,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -21,7 +23,10 @@ buildGoModule (finalAttrs: {
 
   subPackages = [ "." ];
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    writableTmpDirAsHomeHook
+  ];
 
   ldflags = [
     "-s"
@@ -32,7 +37,17 @@ buildGoModule (finalAttrs: {
 
   postFixup = ''
     wrapProgram $out/bin/git-credential-gopass \
-      --prefix PATH : "${lib.makeBinPath [ gopass ]}"
+      --prefix PATH : "${gopass.wrapperPath}"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    gopass
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  preVersionCheck = ''
+    gopass setup --name "user" --email "user@localhost"
   '';
 
   meta = {

From 6420de02042485a2da6c1932dbe547cc189cd4e9 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 15 Dec 2025 12:00:45 +0800
Subject: [PATCH 19/19] git-credential-gopass: move to by-name

---
 .../gi/git-credential-gopass/package.nix}                       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/gopass/git-credential.nix => by-name/gi/git-credential-gopass/package.nix} (100%)

diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/by-name/gi/git-credential-gopass/package.nix
similarity index 100%
rename from pkgs/tools/security/gopass/git-credential.nix
rename to pkgs/by-name/gi/git-credential-gopass/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 278617b29e5a..dc9b46c7e8d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1645,8 +1645,6 @@ with pkgs;
 
   passExtensions = recurseIntoAttrs pass.extensions;
 
-  git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
-
   kerf = kerf_1; # kerf2 is WIP
   kerf_1 = callPackage ../development/interpreters/kerf {
     stdenv = clangStdenv;