From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KJy4GeHecGQSugAASxT56A (envelope-from ) for ; Fri, 26 May 2023 18:31:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kNmkGeHecGTIgwEA9RJhRA (envelope-from ) for ; Fri, 26 May 2023 18:31:29 +0200 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 47D5444F0A for ; Fri, 26 May 2023 18:31:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2aLQ-0006Yp-8x; Fri, 26 May 2023 12:31:12 -0400 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 1q2aLJ-0006WI-Cc for guix-patches@gnu.org; Fri, 26 May 2023 12:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2aLG-000723-KM for guix-patches@gnu.org; Fri, 26 May 2023 12:31:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2aLG-0003Hx-FE for guix-patches@gnu.org; Fri, 26 May 2023 12:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49610] [PATCH v3] services: guix: Add channels field. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 May 2023 16:31: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: Simon Tournier Cc: 49610@debbugs.gnu.org, ludo@gnu.org Received: via spool by 49610-submit@debbugs.gnu.org id=B49610.168511860612501 (code B ref 49610); Fri, 26 May 2023 16:31:02 +0000 Received: (at 49610) by debbugs.gnu.org; 26 May 2023 16:30:06 +0000 Received: from localhost ([127.0.0.1]:50687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2aKL-0003FY-U0 for submit@debbugs.gnu.org; Fri, 26 May 2023 12:30:06 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:40216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2aKJ-0003EZ-LT for 49610@debbugs.gnu.org; Fri, 26 May 2023 12:30:04 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4QSVkm15Zzz9sdQ; Fri, 26 May 2023 18:29:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1685118592; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=gwZc8B7a9nJkmQzjiMavOUNKBX0V6ikejFsoFHDFOxQ=; b=iQjeY0KY/630S+35GCtkpwXlwGJdz7RDWNmLVa7fGpzd1HJf5OLDalDprUiC4dsOI8o/la fXqSfefTk/GLEvE/CZb1TjcKaXHgzRaKjkxqR2oof2uYxsKKKScJwtxW914B4y3uevOS3P a5PRnzg1rLw0R5IPS9Qxe4716dMBVE/QKx7CjqX4uqOGJwJWX6J5IWbXO4dfTKdNEri8yK /tEaDxJz028iT+v4igy3XUgmnt2AmoPBKf+sbSVDQjB8SIJMwGnDOxE/VToT8DnhS/M2XV t1jx7Hg8wyd8/v48TMCnW9vGbmRHJma0uMnIQB6tpEyH+kSCE6fIXzlTJkPpCQ== In-Reply-To: <87lehbtlxz.fsf@gmail.com> (Simon Tournier's message of "Fri, 26 May 2023 12:40:40 +0200") References: <20210717205819.380-1-brice@waegenei.re> <20230525201216.16870-1-antero@mailbox.org> <87lehbtlxz.fsf@gmail.com> Date: Fri, 26 May 2023 16:29:49 +0000 Message-ID: <87a5xrvywy.fsf@mailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-MBO-RS-ID: 9983ae3937b45c68e9b X-MBO-RS-META: irpprhbz1wajgyupg7b77ekdxydbf91o 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: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches From: Antero Mejr via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685118689; a=rsa-sha256; cv=none; b=I46/mm5n9Y2NoD09HGQZIjIcNJ0+qJBoC6ZujUEHU8GJP+37fmJudHkjccY+tQSlZ7kBAt n6ENzNbbC1YpEbti9L+P63OjYgRNFfXB9v23aJErnsk5ZJVxP6TuVUNunr8CEBPWDPVPfr X4zdSutf6NolMkV+Q94Dw4exZo3GSCgY90OCGjLry4cJmK4UikCOKacHZq6v3Z99SH/TFv y6WJyE7eC9pYLjoKkGo5doK33m529snGiOGz8QnoiWSw4ZL1lESfA6PCvi289RXWmdL9ag 0kboTmA+ZOF4Nl7ADU7o6YxFtYEVpABZ39CIg7WYI5fZ270ko68P6OuVbMNhjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=iQjeY0KY; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685118689; h=from:from:sender:sender:reply-to: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:dkim-signature; bh=gwZc8B7a9nJkmQzjiMavOUNKBX0V6ikejFsoFHDFOxQ=; b=m6FpBvxlW0ULCk5Bf/DCAoIIAGCxLPHSsjy9wRCZedWf+5956j0e1hpyph6CuL0DgkaAUZ 6wTAB4qppvR8jfMqVAwxhFf3YNwLPtKCY8hIofCqkVZQxnaXmnKBHKGNdFuhqEsNvpNxGV szGFp+97HE0c+bEtfUTq8+bPS1VUMm+N4iqbj3PA6Syuo87E/qk3YugTDEHONI6UWuZGKU FLE6HonjwE/lEYSENnyBuMhNLk3ls4AL0uSSnDxIhqmPLslGK1598Aq33RVaak9tEBwxRX 2tVsDIq668wy4QD3+7WmIimfNvWDP0IUrLmce/I9JpzOSLDnG3EOVdinsJdrcg== X-Migadu-Spam-Score: -2.26 X-Spam-Score: -2.26 X-Migadu-Queue-Id: 47D5444F0A X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=iQjeY0KY; 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-TUID: T/1kAQ0RL5Ml Simon Tournier writes: > Sorry if I am missing something. A comment about the consistency of the > manual. :-) The section =E2=80=9CInvoking guix pull=E2=80=9D mentions: > > (snip) > >> -customized by defining @dfn{channels} in the >> -@file{~/.config/guix/channels.scm} file. A channel specifies a URL and= branch >> +customized by defining @dfn{channels} in the @file{/etc/guix/channels.s= cm} and >> +@file{~/.config/guix/channels.scm} files. A channel specifies a URL an= d branch > > I find this wording confusing. I would suggest: > > A channel specifies a URL and branch customized by defining > @dfn{channels} in the @file{~/.config/guix/channels.scm} file, and/or > the @file{/etc/guix/channels.scm} file and/or the built-in default > specified in the @code{%default-channels} variable. Guix honors the > channels file in that previous order (@xref{Invoking guix pull}). > > or something like that. Keeping in mind that this part is not Guix > System specific. Updated to use that wording in v4. I put the documentation update for the Channels section into a separate patch, as that change isn't related to the guix-configuration changes.