02/02: website: Simplify manifest.

[Ludovic Courtès]

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

commit 28c6e724a44807b6d2f9d848b21531a27f5aa355
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jan 19 16:53:28 2023 +0100

    website: Simplify manifest.
    
    * website/manifest.scm (the-good-guile, haunt-the-ghost): Remove.
    Use 'guile-3.0-latest' and 'haunt' instead.
---
 website/manifest.scm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/website/manifest.scm b/website/manifest.scm
index 16e0cae..0eee44f 100644
--- a/website/manifest.scm
+++ b/website/manifest.scm
@@ -1,21 +1,11 @@
 (use-modules (guix packages)
              ((gnu packages package-management) #:select (guix))
              ((gnu packages guile-xyz)          #:select (haunt))
+             ((gnu packages guile)              #:select (guile-3.0-latest))
              (gnu system locale)
              (ice-9 rdelim)
              (srfi srfi-1))
 
-(define the-good-guile
-  (car (assoc-ref (package-native-inputs guix) "guile")))
-
-(define haunt-the-ghost
-  (package
-    (inherit haunt)
-    (name "haunt-for-guix-website")
-    (inputs
-     `(("guile" ,the-good-guile)
-       ,@(alist-delete "guile" (package-inputs haunt))))))
-
 (define locales
   (locale-directory
    (call-with-input-file "po/LINGUAS"
@@ -55,10 +45,7 @@
    (packages->manifest
     (append
      ;; Guile needs to be compatible
-     (list
-      guix
-      the-good-guile
-      haunt-the-ghost)
+     (list guix guile-3.0-latest haunt)
 
      ;; Other packages
      (map specification->package