From patchwork Mon Dec 11 07:26:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57513 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 79E0127BBEA; Mon, 11 Dec 2023 07:29:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B73BE27BBE2 for ; Mon, 11 Dec 2023 07:29:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCaih-0004qK-18; Mon, 11 Dec 2023 02:28:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rCaie-0004q3-0c for guix-patches@gnu.org; Mon, 11 Dec 2023 02:28:48 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rCaid-0008QX-NN for guix-patches@gnu.org; Mon, 11 Dec 2023 02:28:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rCais-0006XL-32 for guix-patches@gnu.org; Mon, 11 Dec 2023 02:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67598] [PATCH v2] gnu: services: guix: Allow gexps evaluating to a list of build-machines References: <4cb4eac27ae7990eb9c79bcea0c05dbdbe0bdf37.1701595902.git.saku@laesvuori.fi> In-Reply-To: <4cb4eac27ae7990eb9c79bcea0c05dbdbe0bdf37.1701595902.git.saku@laesvuori.fi> Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Dec 2023 07:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67598 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Cc: 67598@debbugs.gnu.org, Saku Laesvuori Received: via spool by 67598-submit@debbugs.gnu.org id=B67598.170227968525019 (code B ref 67598); Mon, 11 Dec 2023 07:29:02 +0000 Received: (at 67598) by debbugs.gnu.org; 11 Dec 2023 07:28:05 +0000 Received: from localhost ([127.0.0.1]:52360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCahx-0006VR-8i for submit@debbugs.gnu.org; Mon, 11 Dec 2023 02:28:05 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:54892 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCahr-0006Uu-Hq for 67598@debbugs.gnu.org; Mon, 11 Dec 2023 02:28:03 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 9313E3400FA; Mon, 11 Dec 2023 08:27:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702279665; bh=pzUunZPkbAcING6ZtDIBHLt86H43dYtG1KlsZtNqk24=; h=From:To:Cc:Subject:Date; b=hvo8tS55S3TexS2E5koxuonQQPyPvBLh5XvoUOInHBeAw2I2PZjxyDYega5ulBrD1 Ohog+2YkFKDypVpSsy9+bye1z0QGulhHy04DcNJUQ8zSdkXiqbEFxxBF0HR1+fWWin tiHj+4uND0Snn8OZ12CwcFR6K/oqc5gSsBoWRl9I= Date: Mon, 11 Dec 2023 09:26:14 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 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*