Skip to content

Commit

Permalink
yubikey-agent: fix on darwin
Browse files Browse the repository at this point in the history
Mea culpa: in #92936, I did originally test on macOS but I forgot to
retest after adding the piv-go patch.  Unfortunately, the piv-go patch
was broken on macOS.  This pulls in the latest version of
go-piv/piv-go#75 which works on macOS now.
  • Loading branch information
philandstuff committed Jul 25, 2020
1 parent 1d097a6 commit e01583a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pkgs/tools/security/yubikey-agent/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ buildGoModule rec {
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
'';

vendorSha256 = "1x7934p6522i0yyv08xzb4134d0kr5x6igsrp26vh79d8fndbywr";
vendorSha256 = "128mlsagj3im6h0p0ndhzk29ya47g19im9dldx3nmddf2jlccj2h";

subPackages = [ "." ];

Expand Down
24 changes: 11 additions & 13 deletions pkgs/tools/security/yubikey-agent/use-piv-go-75.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
From 56a465d463273b2a2a24cf668c4c33938b198b16 Mon Sep 17 00:00:00 2001
From 547695fff9cbfc4037168cdeb07cfe16bd89b6db Mon Sep 17 00:00:00 2001
From: Philip Potter <[email protected]>
Date: Sun, 12 Jul 2020 16:54:57 +0100
Subject: [PATCH] Pull in go-piv/piv-go#75
Date: Sat, 25 Jul 2020 21:59:50 +0100
Subject: [PATCH] Pull in piv-go#75

---
go.mod | 1 +
1 file changed, 1 insertion(+)
go.mod | 2 ++
1 file changed, 2 insertions(+)

diff --git a/go.mod b/go.mod
index d4d13c8..e24d53d 100644
index d4d13c8..f75be2d 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,7 @@ module filippo.io/yubikey-agent

go 1.14

+replace github.com/go-piv/piv-go => github.com/rawkode/piv-go v1.5.1-0.20200711221619-a4158f9b8204
require (
github.com/go-piv/piv-go v1.5.1-0.20200523071327-a3e5767e8b72
@@ -7,3 +7,5 @@ require (
github.com/gopasspw/gopass v1.9.1
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
)
+
+replace github.com/go-piv/piv-go => github.com/rawkode/piv-go v1.5.1-0.20200725154545-1c3200c75a28
--
2.27.0

0 comments on commit e01583a

Please sign in to comment.