summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-18 18:41:03 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-19 23:11:36 +0100
commit1fa342323619372326106fb923e72ae7beecb5e6 (patch)
tree9bad6aa5915ab2c481387148232347254bc933d8
parentbed24ecfcd68ca6fbc21f02b477cffff3b4c0450 (diff)
downloadguix-1fa342323619372326106fb923e72ae7beecb5e6.tar.gz
gnu: guile-commonmark: Add "guile3.0-commonmark" variant.
* gnu/packages/guile-xyz.scm (guile-commonmark)[source]: Add 'modules'
and 'snippet'.
(guile3.0-commonmark): New variable.
-rw-r--r--gnu/packages/guile-xyz.scm16
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 755d1ef62d..7d5621eaa4 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2025,7 +2025,15 @@ key-value cache and store.")
                                   "/" name "-" version ".tar.gz"))
               (sha256
                (base32
-                "17lrsdisa3kckh24q114vfmzdc4wkqa6ccwl4hdlrng5wpn1iman"))))
+                "17lrsdisa3kckh24q114vfmzdc4wkqa6ccwl4hdlrng5wpn1iman"))
+              (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)
     (inputs
      `(("guile" ,guile-2.2)))
@@ -2041,6 +2049,12 @@ is no support for parsing block and inline level HTML.")
     (home-page "https://github.com/OrangeShark/guile-commonmark")
     (license license:lgpl3+)))
 
+(define-public guile3.0-commonmark
+  (package
+    (inherit guile-commonmark)
+    (name "guile3.0-commonmark")
+    (inputs `(("guile" ,guile-3.0)))))
+
 (define-public guile2.0-commonmark
   (package
     (inherit guile-commonmark)