summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorSaku Laesvuori <saku@laesvuori.fi>2023-12-11 09:26:14 +0200
committerLudovic Courtès <ludo@gnu.org>2023-12-14 23:12:24 +0100
commit59d65f66c505884cc46d7277889d34d3672a8378 (patch)
treeaf498718b337f20dddfc76f4f225952c11bb38da /gnu
parenta1347d09f12ed315507e5c0b8644ba1eb350eca7 (diff)
services: guix: Allow gexps evaluating to a list of build-machines.
* 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 (Base Services): Document it. Change-Id: Ie404562ca0b564413233c3a624046da831893dc3 Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/base.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index dc001fdef6..6539bfd6ce 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1767,7 +1767,13 @@ archive' public keys, with GUIX."
(mkdir-p (dirname machines-file)))
;; Installed the declared machines file.
- (symlink #+(scheme-file "machines.scm" machines)
+ (symlink #+(scheme-file "machines.scm"
+ #~((@ (srfi srfi-1) append-map)
+ (lambda (entry)
+ (if (build-machine? entry)
+ (list entry)
+ entry))
+ #$machines))
machines-file))))
(define-record-type* <guix-configuration>