summaryrefslogtreecommitdiff
path: root/gnu/packages/ssh.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-26 23:59:28 +0100
committerMarius Bakke <marius@gnu.org>2020-11-26 23:59:28 +0100
commit24c86ad0c05bac966c3f5f3c5f40c6b0945adf09 (patch)
tree45160aa4ebe3651a79b5abd76dcefaf8813aa966 /gnu/packages/ssh.scm
parentbff94a5a537c2c484f9f6e98cab75195c3dde9e7 (diff)
parent4a914de930a8317cab5bc11bdb608e3a3da3d1ad (diff)
downloadguix-patches-24c86ad0c05bac966c3f5f3c5f40c6b0945adf09.tar
guix-patches-24c86ad0c05bac966c3f5f3c5f40c6b0945adf09.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/ssh.scm')
-rw-r--r--gnu/packages/ssh.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index e5bcac33f2..7b363e6d2d 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -189,7 +189,8 @@ a server that supports the SSH-2 protocol.")
(method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
"openssh-" version ".tar.gz"))
- (patches (search-patches "openssh-hurd.patch"))
+ (patches (search-patches "openssh-hurd.patch"
+ "openssh-fix-ssh-copy-id.patch"))
(sha256
(base32
"091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as"))))