From 38cfe61780f03b8cc029e1346a11bae2c0231625 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Fri, 12 May 2023 08:44:46 +0100
Subject: gnu: guix-build-coordinator: Neaten up the package definitions.

Remove duplication and redundant append calls.

* gnu/packages/package-management.scm (guix-build-coordinator)[inputs]: Always
add sqitch.
[propagated-inputs]: Always add guile-fibers-next.
(guix-build-coordinator-agent-only)[arguments]: Remove unnecessary duplication
of phases.
[propagated-inputs]: Remove unnecessary append.
---
 gnu/packages/package-management.scm | 109 +++++++++---------------------------
 1 file changed, 26 insertions(+), 83 deletions(-)

(limited to 'gnu/packages/package-management.scm')

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 7be497c534..494ae7445d 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1474,27 +1474,21 @@ environments.")
              guile-lib
              (first (assoc-ref (package-native-inputs guix) "guile"))))
       (inputs
-       (append
-        (list (first (assoc-ref (package-native-inputs guix) "guile"))
-              sqlite
-              bash-minimal)
-        (if (hurd-target?)
-            '()
-            (list sqitch))))
+       (list (first (assoc-ref (package-native-inputs guix) "guile"))
+             sqlite
+             bash-minimal
+             sqitch))
       (propagated-inputs
-       (append
-        (list guile-prometheus
-              guile-gcrypt
-              guile-json-4
-              guile-lib
-              guile-lzlib
-              guile-zlib
-              guile-sqlite3
-              guix
-              guile-gnutls)
-        (if (hurd-target?)
-            '()
-            (list guile-fibers-next))))
+       (list guile-prometheus
+             guile-gcrypt
+             guile-json-4
+             guile-lib
+             guile-lzlib
+             guile-zlib
+             guile-sqlite3
+             guix
+             guile-gnutls
+             guile-fibers-next))
       (home-page "https://git.cbaines.net/guix/build-coordinator/")
       (synopsis "Tool to help build derivations")
       (description
@@ -1508,62 +1502,12 @@ outputs of those builds.")
     (inherit guix-build-coordinator)
     (name "guix-build-coordinator-agent-only")
     (arguments
-     `(#:modules (((guix build guile-build-system)
+     (list
+      #:modules `(((guix build guile-build-system)
                    #:select (target-guile-effective-version))
                   ,@%gnu-build-system-modules)
-       #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'set-GUILE_AUTO_COMPILE
-           (lambda _
-             ;; To avoid warnings relating to 'guild'.
-             (setenv "GUILE_AUTO_COMPILE" "0")
-             #t))
-         (add-after 'install 'wrap-executable
-           (lambda* (#:key inputs outputs target #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (guile (assoc-ref inputs "guile"))
-                    (version (target-guile-effective-version))
-                    (scm (string-append out "/share/guile/site/" version))
-                    (go  (string-append out "/lib/guile/" version "/site-ccache")))
-               (for-each
-                (lambda (file)
-                  (simple-format (current-error-port) "wrapping: ~A\n" file)
-                  (let ((guile-inputs (list
-                                       "guile-json"
-                                       "guile-gcrypt"
-                                       "guix"
-                                       "guile-prometheus"
-                                       "guile-lib"
-                                       "guile-lzlib"
-                                       "guile-zlib"
-                                       "guile-sqlite3"
-                                       "guile-gnutls")))
-                    (wrap-program file
-                      `("PATH" ":" prefix (,bin))
-                      `("GUILE_LOAD_PATH" ":" prefix
-                        (,scm ,(string-join
-                                (map (lambda (input)
-                                       (simple-format
-                                        #f "~A/share/guile/site/~A"
-                                        (assoc-ref inputs input)
-                                        version))
-                                     guile-inputs)
-                                ":")))
-                      `("GUILE_LOAD_COMPILED_PATH" ":" prefix
-                        (,go ,(string-join
-                               (map (lambda (input)
-                                      (simple-format
-                                       #f "~A/lib/guile/~A/site-ccache"
-                                       (assoc-ref inputs input)
-                                       version))
-                                    guile-inputs)
-                               ":"))))))
-                (find-files bin)))
-             #t))
-         (delete 'strip))))             ; As the .go files aren't compatible
+      #:imported-modules `((guix build guile-build-system)
+                           ,@%gnu-build-system-modules)))
     (native-inputs
      (list pkg-config
            autoconf
@@ -1581,15 +1525,14 @@ outputs of those builds.")
      (list (first (assoc-ref (package-native-inputs guix) "guile"))
            bash-minimal))
     (propagated-inputs
-     (append
-         (list guile-prometheus
-               guile-gcrypt
-               guile-json-4
-               guile-lib
-               guile-lzlib
-               guile-zlib
-               guix
-               guile-gnutls)))
+     (list guile-prometheus
+           guile-gcrypt
+           guile-json-4
+           guile-lib
+           guile-lzlib
+           guile-zlib
+           guix
+           guile-gnutls))
     (description
      "The Guix Build Coordinator helps with performing lots of builds across
 potentially many machines, and with doing something with the results and
-- 
cgit v1.2.3