diff options
| author | Lars-Dominik Braun <ldb@leibniz-psychology.org> | 2020-02-20 12:36:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-02-22 00:45:58 +0100 |
| commit | 378918725259d221222dd0b1831fbaa3e0a17e1f (patch) | |
| tree | 8a3c76642001055aa982c6d9f03e00daf5e1e657 | |
| parent | 43e282accc17c8ff2156448e4e8fdd0d04d7ba1c (diff) | |
| download | patches-378918725259d221222dd0b1831fbaa3e0a17e1f.tar patches-378918725259d221222dd0b1831fbaa3e0a17e1f.tar.gz | |
build: Depend on guile-ssh 0.12.0
This is a followup to 35f35111678e6622301b414f3d464acb71e106bb.
* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Check for userauth-gssapi!
* doc/guix.texi: Document version requirement
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | m4/guix.m4 | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 1349d9b27a..a66bb3d646 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -772,11 +772,11 @@ The following dependencies are optional: @itemize @item -@c Note: We need at least 0.10.2 for 'channel-send-eof'. +@c Note: We need at least 0.12.0 for 'userauth-gssapi!'. Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, -version 0.10.2 or later. +version 0.12.0 or later. @item When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib diff --git a/m4/guix.m4 b/m4/guix.m4 index 8be7cca54f..961ce838ac 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -142,13 +142,14 @@ dnl GUIX_CHECK_GUILE_SSH dnl dnl Check whether a recent-enough Guile-SSH is available. AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ - dnl Check whether 'channel-send-eof' (introduced in 0.10.2) is present. + dnl Check whether 'userauth-gssapi!' (introduced in 0.12.0) is present. AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], [guix_cv_have_recent_guile_ssh], [GUILE_CHECK([retval], [(and (@ (ssh channel) channel-send-eof) (@ (ssh popen) open-remote-pipe) - (@ (ssh dist node) node-eval))]) + (@ (ssh dist node) node-eval) + (@ (ssh auth) userauth-gssapi!))]) if test "$retval" = 0; then guix_cv_have_recent_guile_ssh="yes" else |