[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: build: Depend on guile-ssh 0.12.0
From: |
guix-commits |
Subject: |
06/07: build: Depend on guile-ssh 0.12.0 |
Date: |
Fri, 21 Feb 2020 18:46:18 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 378918725259d221222dd0b1831fbaa3e0a17e1f
Author: Lars-Dominik Braun <address@hidden>
AuthorDate: Thu Feb 20 12:36:10 2020 +0100
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 <address@hidden>
---
doc/guix.texi | 4 ++--
m4/guix.m4 | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 1349d9b..a66bb3d 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 8be7cca..961ce83 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
- branch master updated (3c4c60f -> 4cb63a5), guix-commits, 2020/02/21
- 01/07: marionette: 'wait-for' procedures no longer leak a port., guix-commits, 2020/02/21
- 02/07: marionette: Provide portable US-layout keystrokes for "<" and ">"., guix-commits, 2020/02/21
- 03/07: installer: Add 'syslog' macro to write to syslog., guix-commits, 2020/02/21
- 05/07: tests: Factorize LUKS passphrase., guix-commits, 2020/02/21
- 04/07: installer: Log important bits to syslog., guix-commits, 2020/02/21
- 06/07: build: Depend on guile-ssh 0.12.0,
guix-commits <=
- 07/07: deduplication: Use nix-base32 encoding for link names., guix-commits, 2020/02/21