branch master updated: website: Build with Guile 3.0.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository guix-artwork.

The following commit(s) were added to refs/heads/master by this push:
     new dd5c075  website: Build with Guile 3.0.
dd5c075 is described below

commit dd5c075406021244ea37efdbdd56eb5d60239f15
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sat Mar 21 11:55:27 2020 +0100

    website: Build with Guile 3.0.
    
    Partly fixes <https://bugs.gnu.org/39425>.
    Reported by Alex ter Weele <address@hidden>.
    
    * website/.guix.scm (build): Use "guile3.0-json",
    "guile3.0-syntax-highlight", and "guile3.0-haunt".
    <top level>: Pass #:guile and #:options to 'computed-file'.
---
 website/.guix.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index 8f44c90..aac1c8c 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix web site
-;;; Copyright © 2017, 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017, 2019, 2020 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of the GNU Guix web site.
 ;;;
@@ -60,10 +60,10 @@
 (define build
   ;; We need Guile-JSON for 'packages-json-builder'.
   (with-extensions (append (package+propagated-inputs
-                            (specification->package "guile-json@3"))
+                            (specification->package "guile3.0-json@3"))
 
                            (package+propagated-inputs
-                            (specification->package "guile-syntax-highlight")))
+                            (specification->package 
"guile3.0-syntax-highlight")))
     (with-imported-modules (source-module-closure
                             '((guix build utils)))
       #~(begin
@@ -106,7 +106,7 @@
           (setenv "XDG_CACHE_HOME" "/tmp/.cache")
 
           (format #t "Running 'haunt build'...~%")
-          (invoke #+(file-append (specification->package "haunt")
+          (invoke #+(file-append (specification->package "guile3.0-haunt")
                                  "/bin/haunt")
                   "build")
 
@@ -115,7 +115,9 @@
                             #:log (%make-void-port "w"))
           (symlink "guix.html" (string-append #$output "/index.html"))))))
 
-(computed-file "guix-web-site" build)
+(computed-file "guix-web-site" build
+               #:guile (specification->package "guile-next@3")
+               #:options '(#:effective-version "3.0"))
 
 ;; Local Variables:
 ;; eval: (put 'let-package 'scheme-indent-function 1)