[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/13: gnu: openssh: Remove input labels.
From: |
guix-commits |
Subject: |
12/13: gnu: openssh: Remove input labels. |
Date: |
Fri, 21 Jul 2023 21:26:25 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 12971d26efa3676b42a026d13d584e6bd8aef975
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 16 02:00:02 2023 +0200
gnu: openssh: Remove input labels.
* gnu/packages/ssh.scm (openssh)[inputs]: Remove input labels.
(openssh-sans-x)[inputs]: Use MODIFY-INPUTS.
---
gnu/packages/ssh.scm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 826edb6996..fba1fc1734 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -210,15 +210,16 @@ a server that supports the SSH-2 protocol.")
"1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
(build-system gnu-build-system)
(native-inputs (list groff pkg-config))
- (inputs `(("libedit" ,libedit)
- ("openssl" ,openssl)
- ,@(if (target-hurd?)
- '()
- `(("pam" ,linux-pam)
- ("libfido2" ,libfido2))) ;fails to build on GNU/Hurd
- ("mit-krb5" ,mit-krb5)
- ("zlib" ,zlib)
- ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y'
+ (inputs
+ (cons* libedit
+ openssl
+ mit-krb5
+ zlib
+ xauth ; for 'ssh -X' and 'ssh -Y'
+ (if (target-hurd?)
+ '()
+ (list linux-pam
+ libfido2)))) ; fails to build on GNU/Hurd
(arguments
`(#:test-target "tests"
;; Otherwise, the test scripts try to use a nonexistent directory and
@@ -324,7 +325,8 @@ Additionally, various channel-specific options can be
negotiated.")
(package
(inherit openssh)
(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")))
(define-public guile-ssh
- branch master updated (eb12f3fd8b -> b56fe521de), guix-commits, 2023/07/21
- 04/13: gnu: gallery-dl: Update to 1.25.8., guix-commits, 2023/07/21
- 08/13: gnu: mygui: Update to 3.4.2., guix-commits, 2023/07/21
- 03/13: gnu: qtractor: Update to 0.9.34., guix-commits, 2023/07/21
- 09/13: gnu: cryfs: Update to 0.11.4., guix-commits, 2023/07/21
- 05/13: gnu: osinfo-db: Update to 20230719., guix-commits, 2023/07/21
- 12/13: gnu: openssh: Remove input labels.,
guix-commits <=
- 02/13: gnu: purescript: Use G-expressions., guix-commits, 2023/07/21
- 01/13: gnu: purescript: Update to 0.15.10., guix-commits, 2023/07/21
- 06/13: gnu: osinfo-db: Use G-expressions., guix-commits, 2023/07/21
- 13/13: gnu: openssh: Use G-expressions., guix-commits, 2023/07/21
- 07/13: gnu: labwc: Update to 0.6.4., guix-commits, 2023/07/21
- 10/13: gnu: gitolite: Update to 3.6.13., guix-commits, 2023/07/21
- 11/13: gnu: openssh: Update to 9.3p2., guix-commits, 2023/07/21