branch master updated: website: Fix build.

[Mathieu Othacehe]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new f5bbb60  website: Fix build.
f5bbb60 is described below

commit f5bbb601e5e896a5a8b4cf575b12062fbdef550c
Author: Mathieu Othacehe <m.othacehe@gmail.com>
AuthorDate: Tue Jun 23 20:13:27 2020 +0200

    website: Fix build.
    
    * website/.guix.scm (haunt-with-guile-3.0.3): New variable,
    (build): use it instead of "haunt".
---
 website/.guix.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index ed2c447..93f3ee6 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -19,10 +19,13 @@
 ;; Run 'guix build -f .guix.scm' to build the web site.
 
 (use-modules (guix) (gnu)
+             (gnu packages guile)
+             (gnu packages guile-xyz)
              (guix modules)
              (guix git-download)
              (guix gexp)
              (guix channels)
+             (srfi srfi-1)
              (srfi srfi-9)
              (ice-9 match))
 
@@ -57,6 +60,16 @@
   ;; build the latest package list.
   (latest-channels %default-channels))
 
+;; Remove on the next rebuild cycle when Haunt will be built with Guile
+;; 3.0.3. Until then, this is needed to avoid a discrepancy when running Haunt
+;; with Guile 3.0.2 but loading Guix modules built for Guile 3.0.3.
+(define haunt-with-guile-3.0.3
+  (package
+    (inherit haunt)
+    (inputs
+     `(("guile" ,guile-3.0/libgc-7)
+       ,@(alist-delete "guile" (package-inputs haunt))))))
+
 (define build
   ;; We need Guile-JSON for 'packages-json-builder'.
   (with-extensions (append (package+propagated-inputs
@@ -106,8 +119,7 @@
           (setenv "XDG_CACHE_HOME" "/tmp/.cache")
 
           (format #t "Running 'haunt build'...~%")
-          (invoke #+(file-append (specification->package "haunt")
-                                 "/bin/haunt")
+          (invoke #+(file-append haunt-with-guile-3.0.3 "/bin/haunt")
                   "build")
 
           (mkdir-p #$output)