civodul pushed a commit to branch master
in repository guix.
commit 7b2a47a702b7393cd968640079f8703c932d1405
Author: Ludovic Courtès <[email protected]>
AuthorDate: Fri Jan 17 17:14:20 2020 +0100
build: Allow builds with Guile 3.0.
* configure.ac: Add "3.0" in 'GUILE_PKG' invocation.
* doc/guix.texi (Requirements): Mention 3.0.x.
---
configure.ac | 2 +-
doc/guix.texi | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 69ab9a9..06e86c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ m4_pattern_forbid([^GUIX_])
dnl Search for 'guile' and 'guild'. This macro defines
dnl 'GUILE_EFFECTIVE_VERSION'.
-GUILE_PKG([2.2])
+GUILE_PKG([3.0 2.2])
GUILE_PROGS
if test "x$GUILD" = "x"; then
AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x
installation.])
diff --git a/doc/guix.texi b/doc/guix.texi
index c737a71..ae6c9d7 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -744,7 +744,8 @@ GNU Guix is available for download from its website at
GNU Guix depends on the following packages:
@itemize
-@item @url{https://gnu.org/software/guile/, GNU Guile}, version 2.2.x;
+@item @url{https://gnu.org/software/guile/, GNU Guile}, version 3.0.x or
+2.2.x;
@item @url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version
0.1.0 or later;
@item
