ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93850 from philandstuff/fix-darwin-yubikey-agent

Browse Source 
yubikey-agent: fix on darwin
This commit is contained in:
Florian Klink 2020-07-26 09:57:11 +02:00 committed by GitHub
commit 12f4c3b357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/security/yubikey-agent/default.nix
View File

@ -25,7 +25,7 @@ buildGoModule rec {
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
''; '';
vendorSha256 = "1x7934p6522i0yyv08xzb4134d0kr5x6igsrp26vh79d8fndbywr"; vendorSha256 = "128mlsagj3im6h0p0ndhzk29ya47g19im9dldx3nmddf2jlccj2h";
subPackages = [ "." ]; subPackages = [ "." ];

24
pkgs/tools/security/yubikey-agent/use-piv-go-75.patch
View File

@ -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 <philip.g.potter@gmail.com> From: Philip Potter <philip.g.potter@gmail.com>
Date: Sun, 12 Jul 2020 16:54:57 +0100 Date: Sat, 25 Jul 2020 21:59:50 +0100
Subject: [PATCH] Pull in go-piv/piv-go#75 Subject: [PATCH] Pull in piv-go#75
--- ---
go.mod | 1 + go.mod | 2 ++
1 file changed, 1 insertion(+) 1 file changed, 2 insertions(+)
diff --git a/go.mod b/go.mod diff --git a/go.mod b/go.mod
index d4d13c8..e24d53d 100644 index d4d13c8..f75be2d 100644
--- a/go.mod --- a/go.mod
+++ b/go.mod +++ b/go.mod
@@ -2,6 +2,7 @@ module filippo.io/yubikey-agent @@ -7,3 +7,5 @@ require (
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
github.com/gopasspw/gopass v1.9.1 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 2.27.0