From 773fe2a19f7258bed379e705b4d115a15af156ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Aug 2020 11:27:54 +0200 Subject: [PATCH] Add dependency on Guile-lzlib. Guix no longer provides the (guix lzlib) module. This commit arranges to use Guile-lzlib instead. --- configure.ac | 5 +++++ guix-data-service/model/derivation.scm | 2 +- guix-dev.scm | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b7b3aff..32b74c2 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,11 @@ if test "x$have_email" != "xyes"; then AC_MSG_ERROR([Guile email is missing; please install it.]) fi +GUILE_MODULE_AVAILABLE([have_lzlib], [(lzlib)]) +if test "x$have_lzlib" != "xyes"; then + AC_MSG_ERROR([Guile-Lzlib is missing; please install it.]) +fi + guilemoduledir="${datarootdir}/guile/site/${GUILE_EFFECTIVE_VERSION}" AC_SUBST([guilemoduledir]) AC_SUBST([GUILE_EFFECTIVE_VERSION]) diff --git a/guix-data-service/model/derivation.scm b/guix-data-service/model/derivation.scm index 9687ede..c18b548 100644 --- a/guix-data-service/model/derivation.scm +++ b/guix-data-service/model/derivation.scm @@ -27,7 +27,7 @@ #:use-module (guix base16) #:use-module (guix base32) #:use-module (guix serialization) - #:use-module (guix lzlib) + #:use-module (lzlib) #:use-module (guix inferior) #:use-module (guix memoization) #:use-module (guix derivations) diff --git a/guix-dev.scm b/guix-dev.scm index 0fafbff..edc2ed6 100644 --- a/guix-dev.scm +++ b/guix-dev.scm @@ -73,6 +73,7 @@ ("guile-squee" ,guile3.0-squee) ("guile-fibers" ,guile3.0-fibers) ("guile-gcrypt" ,guile3.0-gcrypt) + ("guile-lzlib" ,guile-lzlib) ("guile-readline" ,guile3.0-readline) ("guile" ,guile-next) ("sqitch" ,sqitch)))