From e55f1ac7773841838f82ac10f3bf8cde514ca4dd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Feb 2021 21:24:09 +0100 Subject: gnu: haunt: Switch to 'guile-3.0-latest'. * gnu/packages/guile-xyz.scm (haunt)[inputs]: Use GUILE-3.0-LATEST instead of GUILE-3.0. --- gnu/packages/guile-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c6f25bbdfb..4a7cd8764f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2399,7 +2399,9 @@ (define-public haunt `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs - `(("guile" ,guile-3.0))) + ;; Depend on the latest Guile to avoid bytecode compatibility issues when + ;; using modules built against the latest version. + `(("guile" ,guile-3.0-latest))) (propagated-inputs `(("guile-reader" ,guile-reader) ("guile-commonmark" ,guile-commonmark))) -- cgit v1.2.3 From d39c626cb96a939c994da7de619bc0786f871c33 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Feb 2021 09:39:41 +0100 Subject: gnu: guile2.2-picture-language: Use the 2.2 dependencies. This is a followup to b54b3f5419849286611279231d8a2c61d3e935b4. * gnu/packages/guile-xyz.scm (guile2.2-picture-language)[propagated-inputs]: New field. --- gnu/packages/guile-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4a7cd8764f..49c5e66f5a 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2628,7 +2628,10 @@ (define-public guile2.2-picture-language (package (inherit guile-picture-language) (name "guile2.2-picture-language") - (inputs `(("guile" ,guile-2.2))))) + (inputs `(("guile" ,guile-2.2))) + (propagated-inputs + `(("guile-cairo" ,guile2.2-cairo) + ("guile-rsvg" ,guile2.2-rsvg))))) (define-public guile3.0-picture-language (deprecated-package "guile3.0-picture-language" -- cgit v1.2.3 From 0e4f49f169818717e1cde37ec2495bf4a483ea72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 6 Feb 2021 21:41:44 +0100 Subject: gnu: guile-commonmark: Fix build with Guile 3.0.5. * gnu/packages/guile-xyz.scm (guile-commonmark)[arguments]: Add phase to fix tests when building with Guile 3.0.5. --- gnu/packages/guile-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 49c5e66f5a..20a34635dd 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2506,6 +2506,19 @@ (define-public guile-commonmark "3.0 2.2 2.0")) #t)))) (build-system gnu-build-system) + ;; The tests throw exceptions with Guile 3.0.5, because they evaluate + ;; (exit ...). + ;; + ;; This has been fixed upstream, but there has not been a new release + ;; containing this change. + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests-when-building-with-guile-3.0.5 + (lambda _ + (substitute* (find-files "tests" "\\.scm$") + (("\\(exit.*") "")) + #t))))) (inputs `(("guile" ,guile-3.0))) (native-inputs -- cgit v1.2.3