me
/
guix
Archived
1
0
Fork 0
Code

gnu: openssh: Remove input labels. 

* gnu/packages/ssh.scm (openssh)[inputs]: Remove input labels.
(openssh-sans-x)[inputs]: Use MODIFY-INPUTS.
master
Tobias Geerinckx-Rice 2023-07-16 02:00:02 +02:00
parent 4372610731
commit 12971d26ef
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/ssh.scm
View File

@ -210,15 +210,16 @@ a server that supports the SSH-2 protocol.")
"1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0")))) "1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list groff pkg-config)) (native-inputs (list groff pkg-config))
(inputs `(("libedit" ,libedit) (inputs
("openssl" ,openssl) (cons* libedit
,@(if (target-hurd?) openssl
'() mit-krb5
`(("pam" ,linux-pam) zlib
("libfido2" ,libfido2))) ;fails to build on GNU/Hurd xauth ; for 'ssh -X' and 'ssh -Y'
("mit-krb5" ,mit-krb5) (if (target-hurd?)
("zlib" ,zlib) '()
("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' (list linux-pam
libfido2)))) ; fails to build on GNU/Hurd
(arguments (arguments
`(#:test-target "tests" `(#:test-target "tests"
;; Otherwise, the test scripts try to use a nonexistent directory and ;; Otherwise, the test scripts try to use a nonexistent directory and
@ -324,7 +325,8 @@ Additionally, various channel-specific options can be negotiated.")
(package (package
(inherit openssh) (inherit openssh)
(name "openssh-sans-x") (name "openssh-sans-x")
(inputs (alist-delete "xauth" (package-inputs openssh))) (inputs (modify-inputs (package-inputs openssh)
(delete "xauth")))
(synopsis "OpenSSH client and server without X11 support"))) (synopsis "OpenSSH client and server without X11 support")))
(define-public guile-ssh (define-public guile-ssh