From: "Ludovic Courtès" <ludo@gnu.org>
To: Saku Laesvuori <saku@laesvuori.fi>
Cc: 67598-done@debbugs.gnu.org
Subject: bug#67598: [PATCH v2] gnu: services: guix: Allow gexps evaluating to a list of build-machines
Date: Thu, 14 Dec 2023 22:08:34 +0100 [thread overview]
Message-ID: <87jzpgtru5.fsf@gnu.org> (raw)
In-Reply-To: <ee039e56f323923f94fc15205cecd551ff02ea3a.1702279574.git.saku@laesvuori.fi> (Saku Laesvuori's message of "Mon, 11 Dec 2023 09:26:14 +0200")
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
Hi,
Saku Laesvuori <saku@laesvuori.fi> skribis:
> * 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
Applied with the small change below (hadn’t realized earlier that we
could use ‘append-map’). Thanks!
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1103 bytes --]
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 3a4d8e789c..6539bfd6ce 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1768,12 +1768,12 @@ (define (guix-machines-files-installation machines)
;; Installed the declared machines file.
(symlink #+(scheme-file "machines.scm"
- #~((@ (srfi srfi-1) concatenate)
- (map (lambda (entry)
- (if (build-machine? entry)
- (list entry)
- entry))
- #$machines)))
+ #~((@ (srfi srfi-1) append-map)
+ (lambda (entry)
+ (if (build-machine? entry)
+ (list entry)
+ entry))
+ #$machines))
machines-file))))
(define-record-type* <guix-configuration>
prev parent reply other threads:[~2023-12-14 21:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-03 9:31 [bug#67598] [PATCH] gnu: services: guix: Allow gexps evaluating to a list of build-machines Saku Laesvuori via Guix-patches via
2023-12-10 21:18 ` Ludovic Courtès
2023-12-11 7:26 ` [bug#67598] [PATCH v2] " Saku Laesvuori via Guix-patches via
2023-12-14 21:08 ` Ludovic Courtès [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87jzpgtru5.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=67598-done@debbugs.gnu.org \
--cc=saku@laesvuori.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).