02/02: website: Remove references to the latest Guix in '.guix.scm'.

[Ludovic Courtès]

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

commit fe113595b6f7d8a1e1a0b814521f02783f9209c3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jan 4 22:50:56 2023 +0100

    website: Remove references to the latest Guix in '.guix.scm'.
    
    These tricks are no longer needed now that (apps packages builder) is
    gone; they were used to build /packages.json and /sources.json
    containing data about the latest packages, which proved to be expensive
    and inconvenient to do within the web site.
    
    * website/.guix.scm (<latest-channels>, latest-channels-compiler)
    (latest-guix, inferior-package, haunt-with-latest-guile): Remove.
    (lingua-web-site): Refer to 'guix' instead of 'latest-guix' and 'haunt'
    instead of 'haunt-with-latest-guile'.
---
 website/.guix.scm | 44 +++-----------------------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index c5cb367..fd79a2d 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix web site
-;;; Copyright © 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;;
 ;;; This file is part of the GNU Guix web site.
@@ -37,8 +37,6 @@
              (guix modules)
              (guix git-download)
              (guix gexp)
-             (guix inferior)
-             (guix channels)
              (srfi srfi-1)
              (srfi srfi-9)
              (ice-9 match)
@@ -65,41 +63,6 @@
     (((labels packages) ...)
      (cons package packages))))
 
-;; Representation of the latest channels.  This type exists just so we can
-;; refer to such records in a gexp.
-(define-record-type <latest-channels>
-  (latest-channels channels)
-  latest-channels?
-  (channels latest-channels-channels))
-
-(define-gexp-compiler (latest-channels-compiler (latest <latest-channels>)
-                                                system target)
-  (match latest
-    (($ <latest-channels> channels)
-     (latest-channel-derivation channels))))
-
-(define latest-guix
-  ;; The latest Guix.  Using it rather than the 'guix' package ensures we
-  ;; build the latest package list.
-  (latest-channels %default-channels))
-
-(define (inferior-package spec)
-  (first (lookup-inferior-packages
-          (inferior-for-channels
-           (latest-channels-channels latest-guix))
-          spec)))
-
-;; Make sure that Haunt uses the same Guile as the one from
-;; "latest-guix". Otherwise there could be a mismatch between the Guile
-;; revision used by Haunt and the one from the latest Guix modules used by
-;; Haunt.
-(define haunt-with-latest-guile
-  (package
-    (inherit haunt)
-    (inputs
-     `(("guile" ,(inferior-package "guile"))
-       ,@(package-inputs haunt)))))
-
 (define (lingua-mo-files lingua)
   "Return a directory containing .mo files for LINGUA."
   (define build
@@ -181,7 +144,7 @@
             ;; its dependencies.  To find out the load path of Guix and its
             ;; dependencies, fetch its value over 'guix repl'.
             (let ((pipe (open-pipe* OPEN_BOTH
-                                    #+(file-append latest-guix "/bin/guix")
+                                    #+(file-append guix "/bin/guix")
                                     "repl" "-t" "machine")))
               (pk 'repl-version (read pipe))
               (write '(list %load-path %load-compiled-path) pipe)
@@ -224,8 +187,7 @@
 
             (setenv "LC_ALL" (string-append lingua ".utf8"))
             (format #t "Running 'haunt build' for lingua ~a...~%" lingua)
-            (invoke #+(file-append haunt-with-latest-guile
-                                   "/bin/haunt")
+            (invoke #+(file-append haunt "/bin/haunt")
                     "build")
             (mkdir-p #$output)
             (copy-recursively "/tmp/gnu.org/software/guix" #$output