diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2021-12-05 19:17:41 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2021-12-05 19:17:41 +0100 |
| commit | 9bc0f45df5d6aed217020b1183dca54989844fb0 (patch) | |
| tree | d927e89949ff7f65b5059bc94273c53fd43d0763 /gnu/packages/ssh.scm | |
| parent | 6db3c536e89deb8a204e756f427614925a7d2582 (diff) | |
| parent | 10554e0a57feeea470127a1d0441957d1776b0bd (diff) | |
| download | guix-patches-9bc0f45df5d6aed217020b1183dca54989844fb0.tar guix-patches-9bc0f45df5d6aed217020b1183dca54989844fb0.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c6de2736e3..5181e9e378 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages security-token) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) @@ -199,6 +200,7 @@ a server that supports the SSH-2 protocol.") (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) (inputs `(("libedit" ,libedit) + ("libfido2" ,libfido2) ("openssl" ,openssl) ,@(if (hurd-target?) '() @@ -229,6 +231,9 @@ a server that supports the SSH-2 protocol.") '() '("--with-pam")) + ;; supports creation and use of ecdsa-sk, ed25519-sk keys + "--with-security-key-builtin" + ;; "make install" runs "install -s" by default, ;; which doesn't work for cross-compiled binaries ;; because it invokes 'strip' instead of @@ -831,15 +836,16 @@ framework.") (define-public clustershell (package (name "clustershell") - (version "1.8.3") + (version "1.8.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cea-hpc/clustershell/releases" - "/download/v" version - "/ClusterShell-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cea-hpc/clustershell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1qdcgh733szwj9r1gambrgfkizvbjci0bnnkds9a8mnyb3sasnan")))) + (base32 "11b87vyamcw4rvgxz74jxwkr9ly0h9ldp2wqsi5wc19p0r06la5j")))) (build-system python-build-system) (inputs `(("openssh" ,openssh))) (propagated-inputs `(("python-pyyaml" ,python-pyyaml))) @@ -851,8 +857,7 @@ framework.") (substitute* "lib/ClusterShell/Worker/Ssh.py" (("info\\(\"ssh_path\"\\) or \"ssh\"") (string-append "info(\"ssh_path\") or \"" - ssh "/bin/ssh\""))) - #t)))))) + ssh "/bin/ssh\""))))))))) (home-page "https://cea-hpc.github.io/clustershell/") (synopsis "Scalable event-driven Python framework for cluster administration") (description |