From 5ecef29242fbf2cae6e9eb0d0e0dbc2f25466b77 Mon Sep 17 00:00:00 2001 From: Vika Date: Wed, 12 Jul 2023 17:36:57 +0300 Subject: [PATCH 1/2] age-plugin-tpm: unstable-2023-05-02 -> 0.1.0 --- pkgs/tools/security/age-plugin-tpm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/age-plugin-tpm/default.nix b/pkgs/tools/security/age-plugin-tpm/default.nix index d79f8805c943..200a3e67f22d 100644 --- a/pkgs/tools/security/age-plugin-tpm/default.nix +++ b/pkgs/tools/security/age-plugin-tpm/default.nix @@ -4,18 +4,18 @@ , swtpm }: -buildGoModule { +buildGoModule rec { pname = "age-plugin-tpm"; - version = "unstable-2023-05-02"; + version = "0.1.0"; src = fetchFromGitHub { owner = "Foxboron"; repo = "age-plugin-tpm"; - rev = "c570739b05c067087c44f651efce6890eedc0647"; - hash = "sha256-xlJtyNAYi/6vBWLsjymFLGfr30w80OplwG2xGTEB118="; + rev = "v${version}"; + hash = "sha256-Gp7n2/+vgQbsm/En6PQ1to/W6lvFam4Wh3LHdCZnafc="; }; - vendorHash = "sha256-S9wSxw0ZMibCOspgGt5vjzFhPL+bZncjTdIX2mkX5vE="; + vendorHash = "sha256-oZni/n2J0N3ZxNhf+RlUWyWeOFwL4+6KUIk6DQF8YpA="; postConfigure = '' substituteInPlace vendor/github.com/foxboron/swtpm_test/swtpm.go \ From 75a465890e56439f27b54f5cbfaf307fbf4d9eff Mon Sep 17 00:00:00 2001 From: Vika Date: Wed, 12 Jul 2023 18:10:17 +0300 Subject: [PATCH 2/2] maintainer-list.nix: replace @vikanezrimaya's PGP keys Old fingerprint: B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A New fingerprint: 5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D This commit should be signed with the old key to prove its authenticity. The key was not compromised, rather it is superceded. --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 25f0a18edbc6..2b1df9ae0b31 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17262,7 +17262,7 @@ githubId = 7953163; name = "Vika Shleina"; keys = [{ - fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A"; + fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; }]; }; vincentbernat = {