From eef5458387ae1919324adba09a00cfede6afd667 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 May 2020 00:25:44 +0200 Subject: gnu: guile-sjson: Build with Guile 3.0. * gnu/packages/guile-xyz.scm (guile-sjson)[source]: Add snippet to patch configure file. [inputs]: Replace guile-2.2 with guile-3.0. (guile2.2-sjson): New variable. --- gnu/packages/guile-xyz.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 303b058e99..4ee3a211fe 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -623,20 +623,34 @@ HTML (via SXML) or any other format for rendering.") ".tar.gz")) (sha256 (base32 - "1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3")))) + "1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure" + (("2\\.2 2\\.0") + "3.0 2.2 2.0")) + #t)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (home-page "https://gitlab.com/dustyweb/guile-sjson") (synopsis "S-expression based json reader/writer for Guile") (description "guile-sjson is a json reader/writer for Guile. It has a nice, simple s-expression based syntax.") (license license:lgpl3+))) +(define-public guile2.2-sjson + (package + (inherit guile-sjson) + (name "guile2.2-sjson") + (inputs `(("guile" ,guile-2.2))))) + (define-public guile-squee (let ((commit "a85902a92bf6f58a1d35fd974a01ade163deda8d") (revision "0")) -- cgit v1.2.3