From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wEK6Ac7f0mFD+QAAgWs5BA (envelope-from ) for ; Mon, 03 Jan 2022 12:36:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id +G7+Nc3f0mFm+QAAG6o9tA (envelope-from ) for ; Mon, 03 Jan 2022 12:36:45 +0100 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 7221417BCF for ; Mon, 3 Jan 2022 12:36:45 +0100 (CET) Received: from localhost ([::1]:40494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4Lds-0003uz-Ei for larch@yhetil.org; Mon, 03 Jan 2022 06:36:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4LaI-0006sg-RV for guix-patches@gnu.org; Mon, 03 Jan 2022 06:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4LaI-0004Mi-IM for guix-patches@gnu.org; Mon, 03 Jan 2022 06:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4LaI-0006Jo-Be for guix-patches@gnu.org; Mon, 03 Jan 2022 06:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49610] [PATCH v2] sevices: guix: Add channels field. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jan 2022 11:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49610 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 49610@debbugs.gnu.org Received: via spool by 49610-submit@debbugs.gnu.org id=B49610.164120956424256 (code B ref 49610); Mon, 03 Jan 2022 11:33:02 +0000 Received: (at 49610) by debbugs.gnu.org; 3 Jan 2022 11:32:44 +0000 Received: from localhost ([127.0.0.1]:34278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4LZz-0006JA-UT for submit@debbugs.gnu.org; Mon, 03 Jan 2022 06:32:44 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:55562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4LZw-0006Is-MW for 49610@debbugs.gnu.org; Mon, 03 Jan 2022 06:32:42 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B2B4A2C3; Mon, 3 Jan 2022 12:32:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KOiKNH4C6J-d; Mon, 3 Jan 2022 12:32:32 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 1AF6113B; Mon, 3 Jan 2022 12:32:32 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87sg07e3kv.fsf_-_@gnu.org> <20211221210042.6302-1-brice@waegenei.re> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 14 =?UTF-8?Q?Niv=C3=B4se?= an 230 de la =?UTF-8?Q?R=C3=A9volution?= 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: Mon, 03 Jan 2022 12:32:31 +0100 In-Reply-To: <20211221210042.6302-1-brice@waegenei.re> (Brice Waegeneire's message of "Tue, 21 Dec 2021 22:00:42 +0100") Message-ID: <87v8z1kqb4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / X-Rspamd-Server: hera X-Rspamd-Queue-Id: B2B4A2C3 X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641209805; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: 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; bh=swOshIls0gGIxt88kK5qd6yUC6B0HfsvuEJf8jLHtTY=; b=s3alACH/SbDFz676XDLPBpIKvCbviD4ZTsVY7xRL2qCgkqjddDMSi/Cgm0TqjfUqEGndw2 mmBjOk8pSKPOdzB1CSYfEDC9XwHgLPLXSIP7urP489en2oUb8N6C+UJ08iICruap/XkwZs hKjjuKZ5UQ4s+9NjWJazJhj29M0juZ/k1Ql2eTMgBkBbt445aEsGcdWYxO9K62+2oUAsqZ yBMk9oGEeR20O/ZLuh9cx4+7K2GwQkkNz3W5RDNZMRAjd9imxDpkh4vJMYoNTUhZ6jAx1v 12lOQ3pMEKQWXzb0v2Q9c3qo8HpzNb5ajJXMaUnwL4TnGA0G5NHpjx3VjUaXgA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641209805; a=rsa-sha256; cv=none; b=fiB5Jq0o5RoRQ6FrCzhH+i8ZJlcPtQezbIW1hnX87S2RnKoKWW6W+/2jixQ6wJ2LPmqgX9 dXrsy7tKN2yW+LJ5vJBgInJsS8lHzwqI3bIQ8LiSiyFO/e9EOoQQTj6s09tcLZT+5NsmCa GnXEn/WFPuk/903vaDHAvz+eq1TCpMFcWpDu+TM7El+lOumKuUHfJ/IOsTufciORzBeUwg 2nVU3ys2TM7rBLm1R8xseTkzMTOypAVacbGuY692aCcFLqDD56V+peAazZO/Eg+GUUXxCw vosIwNKh7DLFfuUbeR1O3WirgUXOZWn1d54Pk7jhwcJdZH4vvGnCQruwaUSP7w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -4.09 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: 7221417BCF X-Spam-Score: -4.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: xRa7vguo8llS Hi Brice, Brice Waegeneire skribis: > * doc/guix.texi (Channels): Specify that '/etc/guix/channels.scm' > contains channels configuration. > (Base Services): Document 'guix-configuration-channels' field. > * gnu/services/base.scm (install-channels-file): New procedure. > (guix-configuration): Add channels field. > (guix-activation): Use 'install-channels-file' procedure. > --- > doc/guix.texi | 15 ++++++++++++++- > gnu/services/base.scm | 42 ++++++++++++++++++++++++++++++++++++++++-- > 2 files changed, 54 insertions(+), 3 deletions(-) > > I've changed the type of the new field from a list to a s-expression, I'm= not > sure if it should be a G-exp instead. The documentation of the > 'channels' field as been updated as suggested. It=E2=80=99s OK to keep it this way. > Ludovic Court=C3=A8s writes: > >>> +;; FIXME Does this gexp should be build before boot, such as >>> +;; substitute-key-authorization does? >> >> There=E2=80=99s a grammatical issue :-), but also I=E2=80=99m not sure: = what are you >> worried about? > > This is related to your commit 8b3ad455be7e8ace35a2eaebf7fffbb611280852, = where > you added pre-computation of the ACL to make =C2=AB [...] the first boot = slightly > faster =C2=BB. Should this be done in this case too? Ah no, commit 8b3ad455be7e8ace35a2eaebf7fffbb611280852 is about pre-generating /etc/guix/acl. In the case of /etc/guix/channels.scm, there=E2=80=99s nothing to pre-generate though since we=E2=80=99re just dum= ping the sexp as-is to /etc/guix/channels.scm, so I think this comment can be safely removed. [...] > +@item @code{channels} (default: @code{'(cons* %default-channels)}) I=E2=80=99d make the default #~%default-channels, no need for =E2=80=98cons= *=E2=80=99. > +@quotation Note > +When booting or reconfiguring to a system where @code{channels} > +is not null, the existing @file{/etc/guix/channels.scm} file is backed u= p as > +@file{/etc/guix/channels.scm.bak} if it was determined to be a manually = modified > +file. This is to facilitate migration from earlier versions, which > +allowed for in-place modifications to @file{/etc/guix/channels.scm}. > +@end quotation =E2=80=9CWhen (=E2=80=A6) where @code{channels} is not null=E2=80=9D does n= ot match the actual code, does it? Otherwise LGTM, thanks! Ludo=E2=80=99.