From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6CtqCf9ue2VZKAAAkFu2QA (envelope-from ) for ; Thu, 14 Dec 2023 22:09:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id yL8VA/9ue2UZ7wAAqHPOHw (envelope-from ) for ; Thu, 14 Dec 2023 22:09:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="GB/ihIDQ"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702588158; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=4JYpRMUkgXbGrOHVpg2wLNo3RG/qc4ZcAwXOl9GsPI0=; b=JlslHG0G7k7h0BVAjNLelBe9AMKWW63qYkebfsYr5PQ9gq6ybIL1dTDtlEc2QK/8A8kcRR VxYqqeg2ydhjRXhfEMYTP8/2A17PaL2NtKe5c1PAgYjq48GUElZ7R9fMu7QC6O3p4P+LIi BjBcecswZNF8pq0JM9/cQmhEe7PxNxeA9ZgRPl9M6aAa7rTuVTRQIKK8MAKlmCGStB8oNy edXoY9Ocr18BUcfUvmiXgvZcQivwA3vQzkxUGPsSjQyFh8gRyhKhmaa1hsFQqYnbeh3pGh w8xiWX3hF9ORvXNDZ8RZzsA2ayU316ouWS3hoogQr1LwokSN//09pj3H4w9C6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702588158; a=rsa-sha256; cv=none; b=QgyKoopmS7I9c8uMTnTyLq4Otnwl3UgQjBUNRkGaEMVsiHj5IBcba8LJxuwmSur7cKbRbO Ha9NiCYqKx8MZZw2f7tpnphJ+SqzKHjt1uW6kLDxu1Ix1C9cQvUeWYgPjEIv7LBWnoi+Gx EuQI8bY2uwtf+cyqck4lZ4GJaBi3ykqP6l5KbBXdnr0auYFJBCa7ECww9GZTHL+nsxSf3a AH95+GYAU5SUO+mH7uJ3pDH6QgbcX1xp6ZxDaHxpqNTxgfvL7elwA2/icBZ++qTyfcIcFx g7QM+bEuiZe3X+eARhoMfMmfLPoqAbiEzRtQlFty4U7akGs0ptDrUX5ndw3LDw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="GB/ihIDQ"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A201854B45 for ; Thu, 14 Dec 2023 22:09:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDsx8-0001Yy-J3; Thu, 14 Dec 2023 16:09:06 -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 1rDsx6-0001YD-5D for guix-patches@gnu.org; Thu, 14 Dec 2023 16:09:04 -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 1rDsx5-00048J-Rt for guix-patches@gnu.org; Thu, 14 Dec 2023 16:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDsx4-0004sE-D9 for guix-patches@gnu.org; Thu, 14 Dec 2023 16:09:02 -0500 Subject: bug#67598: [PATCH v2] gnu: services: guix: Allow gexps evaluating to a list of build-machines Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 14 Dec 2023 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 67598 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Saku Laesvuori Cc: 67598-done@debbugs.gnu.org Mail-Followup-To: 67598@debbugs.gnu.org, ludo@gnu.org, saku@laesvuori.fi Received: via spool by 67598-done@debbugs.gnu.org id=D67598.170258812618699 (code D ref 67598); Thu, 14 Dec 2023 21:09:02 +0000 Received: (at 67598-done) by debbugs.gnu.org; 14 Dec 2023 21:08:46 +0000 Received: from localhost ([127.0.0.1]:51064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDswn-0004rW-Ig for submit@debbugs.gnu.org; Thu, 14 Dec 2023 16:08:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDswl-0004rI-6L for 67598-done@debbugs.gnu.org; Thu, 14 Dec 2023 16:08:44 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDswf-000467-Sp; Thu, 14 Dec 2023 16:08:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=4JYpRMUkgXbGrOHVpg2wLNo3RG/qc4ZcAwXOl9GsPI0=; b=GB/ihIDQPsr/Zve4eSqU JVBEjQ42B+UitCTsoorpaBqiq/PadN1C4CiWYLXJBtuNoNGNWjIec6+vgEJ3v3EVvYP8MS0Ei20Ac 6DcP1Cb/By9q/FGs6F913EYJS0AzQ0UvliagriojemR58+GC5+RhaJNUMhRBIqAUYNmaB9HrA5mWN DpiDvfPxTWs4y1alG/ucJAvoZNPmi4mTZXNYgO2espRj/NyslBwEpya2atr6dxZ60+U61DXTcN5D8 id8vfCKCGtwdbYCaGUIzAGIVg1Ui1l1icOoA+gVnnYLtmiX8qdWR5hEDQRqy1QK0oV/+4B2WzgtFt fl2q47D1aofCrw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Saku Laesvuori's message of "Mon, 11 Dec 2023 09:26:14 +0200") References: X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 24 Frimaire an 232 de la =?UTF-8?Q?R=C3=A9volution, ?= jour de l'Oseille X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 14 Dec 2023 22:08:34 +0100 Message-ID: <87jzpgtru5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.85 X-Spam-Score: -5.85 X-Migadu-Queue-Id: A201854B45 X-Migadu-Scanner: mx11.migadu.com X-TUID: h2PksCbXjUE1 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Saku Laesvuori 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=E2=80=99t realized earlier that we could use =E2=80=98append-map=E2=80=99). Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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* --=-=-=--