diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-01-17 17:14:20 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-01-17 17:14:20 +0100 |
| commit | 7b2a47a702b7393cd968640079f8703c932d1405 (patch) | |
| tree | fdcf3df78e569da261c7d92fb8aef20c04620b73 | |
| parent | 1bb30aa35b0a7cf999c570113b5836cff46bc8fa (diff) | |
| download | guix-7b2a47a702b7393cd968640079f8703c932d1405.tar guix-7b2a47a702b7393cd968640079f8703c932d1405.tar.gz | |
build: Allow builds with Guile 3.0.
* configure.ac: Add "3.0" in 'GUILE_PKG' invocation.
* doc/guix.texi (Requirements): Mention 3.0.x.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/guix.texi | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 69ab9a97b8..06e86c209f 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 c737a71698..ae6c9d791c 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 |