Skip to content

Commit f25baa4

Browse files
committed
ssh-tpm-agent: switch from fork to upstream master
PR #114 (ssh-tpm-add -c confirm-before-use and SSH_ASKPASS_PROMPT leak fix) was merged upstream, so we no longer need to carry our own fork. Pin to the merge commit until the next tagged release lands in nixpkgs. Refs: Foxboron/ssh-tpm-agent#114 Refs: #5177
1 parent a1e7020 commit f25baa4

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

‎nixosModules/ssh-tpm-agent.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
...
77
}:
88
let
9-
# Fork until https://github.com/Foxboron/ssh-tpm-agent/pull/114 lands:
10-
# adds ssh-tpm-add -c (confirm before use) and fixes SSH_ASKPASS_PROMPT
11-
# leaking into subsequent passphrase prompts.
9+
# Track upstream master until the next tagged release ships
10+
# https://github.com/Foxboron/ssh-tpm-agent/pull/114 (ssh-tpm-add -c
11+
# confirm-before-use + SSH_ASKPASS_PROMPT leak fix).
1212
# keyring tests require Linux kernel keyring which isn't available in the Nix sandbox
1313
ssh-tpm-agent = pkgs.ssh-tpm-agent.overrideAttrs (_old: {
1414
version = "0.8.0-unstable-2026-03-29";
1515
src = pkgs.fetchFromGitHub {
16-
owner = "Mic92";
16+
owner = "Foxboron";
1717
repo = "ssh-tpm-agent";
18-
rev = "24bc1aa16db225d8fdab160b923c6bcd2933e001";
19-
hash = "sha256-Gy/+SfMNC7tyQTvrqaYv55AqFAoUwm7w9TdWg58Sgrk=";
18+
rev = "a3cde87934ea75ebe721d20c4d6d4da9cec0a7e4";
19+
hash = "sha256-Fx77S7RRXwp65xaQ1huFaAD4/bnpwXki74KuOJ+9BE0=";
2020
};
2121
# nixpkgs carries a backport patch that is already in this tree
2222
patches = [ ];

0 commit comments

Comments
 (0)