Subject: [PATCH v2] gnu: services: guix: Allow gexps evaluating to a list of build-machines

From: Saku Laesvuori <[email-masked]>
Date: Mon, 11 Dec 2023 09:26:14 +0200

* gnu/services/base.scm (guix-machines-files-installation): Handle
machines being a mixed list of build-machines and lists of
build-machines.
* doc/guix.texi: Document it.

Change-Id: Ie404562ca0b564413233c3a624046da831893dc3
---
 doc/guix.texi         | 6 ++++--
 gnu/services/base.scm | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 1fd2e21608..e74aa631b7 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19316,7 +19316,8 @@ Base Services
 @anchor{guix-configuration-build-machines}
 @item @code{build-machines} (default: @code{#f})
 This field must be either @code{#f} or a list of gexps evaluating to a
-@code{build-machine} record (@pxref{Daemon Offload Setup}).
+@code{build-machine} record or to a list of @code{build-machine} records
+(@pxref{Daemon Offload Setup}).
 
 When it is @code{#f}, the @file{/etc/guix/machines.scm} file is left
 untouched.  Otherwise, the list of of gexps is written to
@@ -19385,7 +19386,8 @@ Base Services
 A list of strings where each element is a substitute URL.
 
 @item @code{build-machines} (default: @code{'()})
-A list of gexps that evaluate to @code{build-machine} records
+A list of gexps that evaluate to @code{build-machine} records or to a list of
+@code{build-machine} records.
 (@pxref{Daemon Offload Setup}).
 
 Using this field, a service may add new build machines to receive builds
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 82c6940780..f060feab12 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1765,7 +1765,13 @@ (define (guix-machines-files-installation machines)
             (mkdir-p (dirname machines-file)))
 
         ;; Installed the declared machines file.
-        (symlink #+(scheme-file "machines.scm" machines)
+        (symlink #+(scheme-file "machines.scm"
+                                #~((@ (srfi srfi-1) concatenate)
+                                   (map (lambda (entry)
+                                          (if (build-machine? entry)
+                                            (list entry)
+                                            entry))
+                                        #$machines)))
                  machines-file))))
 
 (define-record-type* <guix-configuration>

base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767
-- 
2.41.0