diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
| commit | dd2d3ed2d30b5d705f9ed8695ab3171c29469f76 (patch) | |
| tree | 22e909cfe9de99fab471621a907b9f87045bb3bd /gnu/packages/ssh.scm | |
| parent | 24b61fb8ea8a9e8c5320d1db1447f9b62ad04b3d (diff) | |
| parent | 1fd2c00efbe701a81d86c254d5f4f285e63c1cde (diff) | |
| download | guix-dd2d3ed2d30b5d705f9ed8695ab3171c29469f76.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 73841db6b5..d42971d4f0 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -43,7 +43,6 @@ #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages libedit) - #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages m4) @@ -150,9 +149,7 @@ a server that supports the SSH-2 protocol.") ("pam" ,linux-pam) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) - ,@(if (hurd-target?) - '() - `(("xauth" ,xauth))))) ; for 'ssh -X' and 'ssh -Y' + ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' (arguments `(#:test-target "tests" ;; Otherwise, the test scripts try to use a nonexistent directory and @@ -239,6 +236,15 @@ Additionally, various channel-specific options can be negotiated.") "See LICENSE in the distribution.")) (home-page "https://www.openssh.com/"))) +;; OpenSSH without X support. This allows to use OpenSSH without dragging X +;; libraries to the closure. +(define-public openssh-sans-x + (package + (inherit openssh) + (name "openssh-sans-x") + (inputs (alist-delete "xauth" (package-inputs openssh))) + (synopsis "OpenSSH client and server without X11 support"))) + (define-public guile-ssh (package (name "guile-ssh") |