From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 22 12:07:16 2019 Received: (at submit) by debbugs.gnu.org; 22 Oct 2019 16:07:16 +0000 Received: from localhost ([127.0.0.1]:60351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMwgm-0007IX-6v for submit@debbugs.gnu.org; Tue, 22 Oct 2019 12:07:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:50567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMwgk-0007IQ-8E for submit@debbugs.gnu.org; Tue, 22 Oct 2019 12:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35067) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMwgi-0003C4-9i for guix-patches@gnu.org; Tue, 22 Oct 2019 12:07:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_40, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iMwgh-0000VZ-LL; Tue, 22 Oct 2019 12:07:11 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=39570 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iMwgh-00027n-4y; Tue, 22 Oct 2019 12:07:11 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH] pull: Honor '/etc/guix/channels.scm'. Date: Tue, 22 Oct 2019 18:07:03 +0200 Message-Id: <20191022160703.20897-1-ludo@gnu.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: Ludovic Courtès * guix/scripts/pull.scm (channel-list)[global-file]: New variable. [channels]: Honor it. * doc/guix.texi (Invoking guix pull): Document it. --- doc/guix.texi | 18 +++++++++++++++++- guix/scripts/pull.scm | 5 +++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index b550b1c34a..ec331c37cd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3666,6 +3666,21 @@ descriptions, and deploys it. Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official GNU@tie{}Guix repository, though this can be customized. +Specifically, @command{guix pull} downloads code from the @dfn{channels} +(@pxref{Channels}) specified by one of the followings, in this order: + +@enumerate +@item +the @option{--channels} option; +@item +the user's @file{~/.config/guix/channels.scm} file; +@item +the system-wide @file{/etc/guix/channels.scm} file; +@item +the built-in default channels specified in the @code{%default-channels} +variable. +@end enumerate + On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix. Not only that, but all the Guix commands and Scheme modules will also be taken from that latest @@ -3763,7 +3778,8 @@ configuration in the @file{~/.config/guix/channels.scm} file or using the @item --channels=@var{file} @itemx -C @var{file} Read the list of channels from @var{file} instead of -@file{~/.config/guix/channels.scm}. @var{file} must contain Scheme code that +@file{~/.config/guix/channels.scm} or @file{/etc/guix/channels.scm}. +@var{file} must contain Scheme code that evaluates to a list of channel objects. @xref{Channels}, for more information. diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 7876019eac..80d070652b 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -714,6 +714,9 @@ transformations specified in OPTS (resulting from '--url', '--commit', or (define default-file (string-append (config-directory) "/channels.scm")) + (define global-file + (string-append %sysconfdir "/guix/channels.scm")) + (define (load-channels file) (let ((result (load* file (make-user-module '((guix channels)))))) (if (and (list? result) (every channel? result)) @@ -725,6 +728,8 @@ transformations specified in OPTS (resulting from '--url', '--commit', or (load-channels file)) ((file-exists? default-file) (load-channels default-file)) + ((file-exists? global-file) + (load-channels global-file)) (else %default-channels))) -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 22 12:13:37 2019 Received: (at 37869) by debbugs.gnu.org; 22 Oct 2019 16:13:37 +0000 Received: from localhost ([127.0.0.1]:60362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMwmv-0007S1-HT for submit@debbugs.gnu.org; Tue, 22 Oct 2019 12:13:37 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:13991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMwmt-0007Rl-Bu for 37869@debbugs.gnu.org; Tue, 22 Oct 2019 12:13:35 -0400 X-IronPort-AV: E=Sophos;i="5.68,216,1569276000"; d="scan'208";a="323797118" Received: from unknown (HELO ribbon) ([193.50.110.83]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/AES256-GCM-SHA384; 22 Oct 2019 18:13:26 +0200 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 37869@debbugs.gnu.org Subject: Re: [bug#37869] [PATCH] pull: Honor '/etc/guix/channels.scm'. References: <20191022160703.20897-1-ludo@gnu.org> Date: Tue, 22 Oct 2019 18:13:26 +0200 In-Reply-To: <20191022160703.20897-1-ludo@gnu.org> ("Ludovic \=\?utf-8\?Q\?Cou\?\= \=\?utf-8\?Q\?rt\=C3\=A8s\=22's\?\= message of "Tue, 22 Oct 2019 18:07:03 +0200") Message-ID: <875zkgzrkp.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 37869 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello, Ludovic Court=C3=A8s skribis: > +Specifically, @command{guix pull} downloads code from the @dfn{channels} > +(@pxref{Channels}) specified by one of the followings, in this order: > + > +@enumerate > +@item > +the @option{--channels} option; > +@item > +the user's @file{~/.config/guix/channels.scm} file; > +@item > +the system-wide @file{/etc/guix/channels.scm} file; > +@item > +the built-in default channels specified in the @code{%default-channels} > +variable. > +@end enumerate A word on the use case: on clusters at work and in other research institutes, having a system-wide default channel file allows newcomers to get started right away, without having to look for the =E2=80=98channels= .scm=E2=80=99 file that their colleagues happen to be using. Nothing revolutionary, but it can be convenient. :-) Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 25 11:14:05 2019 Received: (at 37869) by debbugs.gnu.org; 25 Oct 2019 15:14:05 +0000 Received: from localhost ([127.0.0.1]:39226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO1Hw-0001V1-MY for submit@debbugs.gnu.org; Fri, 25 Oct 2019 11:14:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO1Hu-0001UO-Ne for 37869@debbugs.gnu.org; Fri, 25 Oct 2019 11:14:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iO1Ho-0001qc-AD; Fri, 25 Oct 2019 11:13:56 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=43790 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iO1Hn-0001lF-Gt; Fri, 25 Oct 2019 11:13:56 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 37869@debbugs.gnu.org Subject: Re: [bug#37869] [PATCH] pull: Honor '/etc/guix/channels.scm'. References: <20191022160703.20897-1-ludo@gnu.org> <875zkgzrkp.fsf@gnu.org> Date: Fri, 25 Oct 2019 17:13:53 +0200 In-Reply-To: <875zkgzrkp.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 22 Oct 2019 18:13:26 +0200") Message-ID: <8736fgrh72.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37869 Cc: guix-i18n@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi there! I=E2=80=99d like to add this news entry for this patch when I push it (with= in a day or two if there aren=E2=80=99t any objections): (entry (commit "XXX") (title (en "@command{guix pull} now honors @file{/etc/guix/channels= .scm")) (body (en "The @command{guix pull} command will now read the @file{/etc/guix/channels.scm} file if it exists and if the per-user @file{~/.config/guix/channels.scm} is not present. This allows administrat= ors of multi-user systems to define site-wide defaults."))) (See for context.) Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 25 14:20:26 2019 Received: (at 37869) by debbugs.gnu.org; 25 Oct 2019 18:20:26 +0000 Received: from localhost ([127.0.0.1]:39333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO4CI-0006PE-21 for submit@debbugs.gnu.org; Fri, 25 Oct 2019 14:20:26 -0400 Received: from lepiller.eu ([89.234.186.109]:50242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iO4CG-0006P3-HN for 37869@debbugs.gnu.org; Fri, 25 Oct 2019 14:20:25 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 64a9449e; Fri, 25 Oct 2019 18:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=6QMDqfQCzo0p apvrqh5OF7WlT2o=; b=QQ2mMMlxMG1of8cMCjq3IeBMyN2FprbO6TwZXkdF4zcA 6Xy6Tk020bec7pXN8NfOGSnjYagB+3+x8jzige8s53vBaQacxfNTvgutMs1ME/Dy rpQ7qIoX5upubt3AWKbkrQ9MIBqa/+biSnf/T7Nez4Pe/IZdFAGPMtZce40/n+fP EpogHt2UCz3tRv/8ZoD3shBdysGcbfZJLxDrXSSXKKb5nDc3keU+tsrqX38ysGC/ eIrOmaZAlfkqZxgmWZjdiu3DLgcTLlUOVh/UCuYZOqyz7gcaIAyi8LLi1sI3+ouP eMu/QOvJ+RTeDYKbVCD5bPsmWLiNPklEo5DsebGpng== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 734e5366 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 25 Oct 2019 18:20:21 +0000 (UTC) Date: Fri, 25 Oct 2019 20:20:17 +0200 From: Julien Lepiller To: Ludovic =?UTF-8?B?Q291cnTDqHM=?= Subject: Re: [bug#37869] [PATCH] pull: Honor '/etc/guix/channels.scm'. Message-ID: <20191025202017.1df7baaa@sybil.lepiller.eu> In-Reply-To: <8736fgrh72.fsf@gnu.org> References: <20191022160703.20897-1-ludo@gnu.org> <875zkgzrkp.fsf@gnu.org> <8736fgrh72.fsf@gnu.org> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 37869 Cc: guix-i18n@gnu.org, 37869@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Fri, 25 Oct 2019 17:13:53 +0200, Ludovic Court=C3=A8s a =C3=A9crit : > Hi there! >=20 > I=E2=80=99d like to add this news entry for this patch when I push it (wi= thin > a day or two if there aren=E2=80=99t any objections): >=20 > (entry (commit "XXX") > (title (en "@command{guix pull} now honors > @file{/etc/guix/channels.scm")) (body > (en "The @command{guix pull} command will now read the > @file{/etc/guix/channels.scm} file if it exists and if the per-user > @file{~/.config/guix/channels.scm} is not present. This allows > administrators of multi-user systems to define site-wide defaults."))) >=20 > (See for context.) >=20 > Thanks, > Ludo=E2=80=99. >=20 >=20 >=20 French: (entry (commit "XXX") (title (en "@command{guix pull} lit maintenant @file{/etc/guix/channels.scm}")) (body (en "La commande @command{guix pull} lira maintenant le fichier @file{/etc/guix/channels.scm} s'il existe et si le fichier @file{~/.config/guix/channels.scm} par utilisateur n'est pas pr=C3=A9sent. Cela permet aux administrateurs de syst=C3=A8mes multi-utilisateurs de d=C3=A9finir les param=C3=A8tres par d=C3=A9faut."))) As always, feel free to adapt or change anything :) From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 27 18:23:34 2019 Received: (at 37869-done) by debbugs.gnu.org; 27 Oct 2019 22:23:34 +0000 Received: from localhost ([127.0.0.1]:43622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iOqwg-0005RZ-Hx for submit@debbugs.gnu.org; Sun, 27 Oct 2019 18:23:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iOqwf-0005RN-44 for 37869-done@debbugs.gnu.org; Sun, 27 Oct 2019 18:23:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iOqwa-00030G-13 for 37869-done@debbugs.gnu.org; Sun, 27 Oct 2019 18:23:28 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=46114 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iOqwZ-0005ox-Hg for 37869-done@debbugs.gnu.org; Sun, 27 Oct 2019 18:23:27 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 37869-done@debbugs.gnu.org Subject: Re: [bug#37869] [PATCH] pull: Honor '/etc/guix/channels.scm'. References: <20191022160703.20897-1-ludo@gnu.org> Date: Sun, 27 Oct 2019 23:23:25 +0100 In-Reply-To: <20191022160703.20897-1-ludo@gnu.org> ("Ludovic \=\?utf-8\?Q\?Cou\?\= \=\?utf-8\?Q\?rt\=C3\=A8s\=22's\?\= message of "Tue, 22 Oct 2019 18:07:03 +0200") Message-ID: <87tv7thlpe.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37869-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Ludovic Court=C3=A8s skribis: > From: Ludovic Court=C3=A8s > > * guix/scripts/pull.scm (channel-list)[global-file]: New variable. > [channels]: Honor it. > * doc/guix.texi (Invoking guix pull): Document it. Pushed as 49af34cfac89d384c46269bfd9388b2c73b1220a. Julien Lepiller skribis: > French: Thank you, Julien; added with minor tweaks. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 28 16:30:37 2019 Received: (at 37869) by debbugs.gnu.org; 28 Oct 2019 20:30:37 +0000 Received: from localhost ([127.0.0.1]:46422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPBev-0004CD-1j for submit@debbugs.gnu.org; Mon, 28 Oct 2019 16:30:37 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:42051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPBet-0004By-NT for 37869@debbugs.gnu.org; Mon, 28 Oct 2019 16:30:36 -0400 Received: by mail-wr1-f48.google.com with SMTP id r1so11290261wrs.9 for <37869@debbugs.gnu.org>; Mon, 28 Oct 2019 13:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:message-id:user-agent :mime-version; bh=/O2PtM9aAwpV5GfCGYtdl9xrcOge4I+LF65nPcpKN48=; b=IPOs1iMf16gKK9Op9qHsXCIfbz9N5RYcHoKVug9IVXQXswMyeGaqcTLVRXVAx9xvrb skqtT/x8AaAizIu5frxb5mydO+dLvpj/+DRLVHSyujzIyWzGSVr1M6RR4Nj+Tsy0vXkC 75+19da6e4FqX9WIXKIqoQJ5rewWEcQ0u1DsgJI5t60jbAO3ChWUgS2fMYb7d9POGAx1 WF9cSwQk+gpPJxydNB5SYKuT5UjH3VKKbEyy+GKU/MIAsYtqjs3wUgTnpqkYdZL3bPcE 7fQyBTaBW3o28728N5ZL8YPVfJowtKW9cfh/0QZ9wsYcGxgZdDtWtD6PF8VmYbLlSack mzUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:message-id :user-agent:mime-version; bh=/O2PtM9aAwpV5GfCGYtdl9xrcOge4I+LF65nPcpKN48=; b=OjUZ1GrcQAb5D6yQrQeWLQev4UO1xLOrU87MLMbgIl/82g1VmC8zsZvvQWFWeyPFFg tmhrZhpjVNTAOf5CP+sjsYUobL0uCN9pDgXJfd6cD+clKPfxhmuh2ndtdZ3HNDqgF6zo gvHDmUziBwm+lOmjjH97LClURDLPCZypMPg0uoLkgg+N2Fmimr5dTYQDTuSu9BmKHDxQ R8cOY7oJ4H6ezrUpS71M89O1A5poSPJCXnP6B4EaGdfYSC79uLnY4h829hS6MI/J6BOk VFOwjEdmCPQCQjc+Rf5kHaqHEplHQRodWdAPOVmk5LTG/MUi8RaKTBhMVeNtf5Rr6jCC fY8Q== X-Gm-Message-State: APjAAAWfk2u1PkcVCOR3aHgVDY0/Kp6JUJJOCD2xizSjgJOd61zkJDys jsVShTFKbTV7ofZi4X1erbs= X-Google-Smtp-Source: APXvYqxkNpv/2lugfcD2O++kAK8SaXkWC3NMEGsW9jUAvhvdXQfXpw7/LLphOYyMVse3Hn1dbdMc6A== X-Received: by 2002:a5d:4d85:: with SMTP id b5mr16861503wru.248.1572294629683; Mon, 28 Oct 2019 13:30:29 -0700 (PDT) Received: from guixsd ([178.70.247.239]) by smtp.gmail.com with ESMTPSA id d4sm19337023wrc.54.2019.10.28.13.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 13:30:28 -0700 (PDT) From: Oleg Pykhalov To: 37869@debbugs.gnu.org Subject: Re: bug#37869: [PATCH] pull: Honor '/etc/guix/channels.scm'. References: <20191022160703.20897-1-ludo@gnu.org> <87tv7thlpe.fsf@gnu.org> Date: Mon, 28 Oct 2019 23:30:24 +0300 Message-ID: <8736fczk7z.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 37869 Cc: ludo@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, Ludovic Court=C3=A8s writes: [=E2=80=A6] >> From: Ludovic Court=C3=A8s >> >> * guix/scripts/pull.scm (channel-list)[global-file]: New variable. >> [channels]: Honor it. >> * doc/guix.texi (Invoking guix pull): Document it. > > Pushed as 49af34cfac89d384c46269bfd9388b2c73b1220a. I got an error during the guix pull: =2D-8<---------------cut here---------------start------------->8--- oleg@guixsd ~$ guix pull News for channel 'guix' Backtrace: In guix/ui.scm: 1730:12 19 (run-guix-command _ . _) In ice-9/boot-9.scm: 829:9 18 (catch _ _ # =E2=80=A6) 829:9 17 (catch _ _ # =E2=80=A6) 829:9 16 (catch _ _ # =E2=80=A6) In guix/store.scm: 623:10 15 (call-with-store _) In guix/status.scm: 768:4 14 (call-with-status-report _ _) In guix/scripts/pull.scm: 804:24 13 (_) In guix/store.scm: 1815:24 12 (run-with-store # =E2=80= =A6) In guix/scripts/pull.scm: 393:28 11 (_ #) 356:15 10 (display-channel-news-headlines _) In srfi/srfi-1.scm: 592:29 9 (map1 _) 592:17 8 (map1 ((#< name: guix url: "https://git.sa=E2=80=A6> = =E2=80=A6))) In guix/scripts/pull.scm: 283:11 7 (display-channel-specific-news _ _ #:port _ #:concise? _) In srfi/srfi-1.scm: 640:9 6 (for-each # =E2=80=A6) In guix/scripts/pull.scm: 241:12 5 (display-news-entry-title _ _ #) In guix/ui.scm: 1210:23 4 (texi->plain-text _) In texinfo.scm: 1131:22 3 (parse _) 979:31 2 (loop # (*fragment*) _ _ _) 910:31 1 (loop # #f # =E2=80=A6) 745:27 0 (_ # #f #f # =E2=80=A6) texinfo.scm:745:27: Throw to key `parser-error' with args `(# "EOF while reading a token " "reading char data")'. =2D-8<---------------cut here---------------end--------------->8--- Here is a backtrace from guix repl: =2D-8<---------------cut here---------------start------------->8--- oleg@guixsd ~$ guix repl scheme@(guix scripts pull)> (display-channel-news "/gnu/store/36kli1qk27gsh= y9zfszs1w08jgyigmp0-profile" "/gnu/store/89rwy7mnpwwd7gnnpz4lq8gxd66pnd1a-p= rofile") News for channel 'guix' texinfo.scm:745:27: Throw to key `parser-error' with args `(# "EOF while reading a token " "reading char data")'. scheme@(guix scripts pull) [1]> ,backtrace #:width 1000 In srfi/srfi-1.scm: 640:9 9 (for-each # _) In guix/scripts/pull.scm: 283:11 8 (display-channel-specific-news _ _ #:port _ #:concise? _) In srfi/srfi-1.scm: 640:9 7 (for-each # (#< commit: "49af34cfac= 89d384c46269bfd9388b2c73b1220a" tag: #f title: (("en" . "@command{guix pull= } now honors\n@file{/etc/guix/channels.scm") ("fr" . "@command{guix pull} l= it maintenant\n@file{/etc/guix/channels.scm}")) body: (("en" . "The @comman= d{guix pull} command will now read the\n@file{/etc/guix/channels.scm} file = if it exists and if the per-user\n@file{~/.config/guix/channels.scm} is not= present. This allows administrators\nof multi-user systems to define site= -wide defaults.") ("fr" . "La commande @command{guix pull} lira maintenant = le fichier\n@file{/etc/guix/channels.scm} s'il existe et si le fichier\n@fi= le{~/.config/guix/channels.scm} par utilisateur=C2=B7rice n'est pas pr=C3= =A9sent.\nCela permet aux personnes administrant des syst=C3=A8mes multi-ut= ilisateurs de\nd=C3=A9finir les canaux par d=C3=A9faut."))>)) In guix/scripts/pull.scm: 251:2 6 (display-news-entry #< commit: "49af34cfac= 89d384c46269bfd9388b2c73b1220a" tag: #f title: (("en" . "@command{guix pull= } now honors\n@file{/etc/guix/channels.scm") ("fr" . "@command{guix pull} l= it maintenant\n@file{/etc/guix/channels.scm}")) body: (("en" . "The @comman= d{guix pull} command will now read the\n@file{/etc/guix/channels.scm} file = if it exists and if the per-user\n@file{~/.config/guix/channels.scm} is not= present. This allows administrators\nof multi-user systems to define site= -wide defaults.") ("fr" . "La commande @command{guix pull} lira maintenant = le fichier\n@file{/etc/guix/channels.scm} s'il existe et si le fichier\n@fi= le{~/.config/guix/channels.scm} par utilisateur=C2=B7rice n'est pas pr=C3= =A9sent.\nCela permet aux personnes administrant des syst=C3=A8mes multi-ut= ilisateurs de\nd=C3=A9finir les canaux par d=C3=A9faut."))> "en" #) 241:12 5 (display-news-entry-title _ _ #) In guix/ui.scm: 1210:23 4 (texi->plain-text _) In texinfo.scm: 1131:22 3 (parse _) 979:31 2 (loop # (*fragment*) _ _ _) 910:31 1 (loop # #f # #f ()) 745:27 0 (_ # #f #f # _) =2D-8<---------------cut here---------------end--------------->8--- Regards, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAl23T+AACgkQFn+OpQAa +pxamhAAuEX53zLgQIpM3my4D53X0sfxgrdLeu80qHOduxEYsbOwtplaUbz20ee7 /tnM8Gx9CYOm00Z3OV0wWZkHu2q6NlTaZYAdFrs8gFYA+bZXMz1U2hCyFF878mli wtUaMhJKEfN46S3ZN3t1fcLisd50/QWTjz0VXFKuFBTaP7RHpG72lQVtqgvWhZsR 9sOtc8w9uW8HDq5MHrhSjpLHVzujrCGeNAcXzGZ+XXgJPH3twsirv0lRvjEZKFR6 CMlEmfNLRlHr+LUEtvl6NS0nVz0ZJpMuIPP7D8qHcaXBy1fvH6fuQ5xWcE3pVU9x 5JDeUen3OSCivf2OYmtKh19vhLEF5LCSlgSMwHy7SioUzlaqVmojhz2R8t3zVW8g z4QiuqWUPt7S9uDBZJvc3ADsE26dp8sqFo7HOO5CeGpr6/Hp4KW0/lXftxqYLiLG GYV/E4iv9rQKWlNyNA8LXxY7zV7mQPAHSlj5AYKe4Jou/E/MGh1qKrIOAMG9y+U5 Jfo6ZzztopDeVA80dPxcSathEGW4z+w/nLQ8exLUOxvyycJbSLdkjZct46kAw5+z PA2Fbp7vbfVkE19nZVZ43n9PYRS2EbamJF+HPwDMfvJvzmQPcVkqV1DkIWX14V+/ eYkwnIc/geaSwYsHm0+FFBzu//bq2Rx1sQjbq/qPRbw9KddOx+w= =7UyO -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 01 07:24:40 2019 Received: (at 37869) by debbugs.gnu.org; 1 Nov 2019 11:24:40 +0000 Received: from localhost ([127.0.0.1]:55094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQV2m-0003vb-AP for submit@debbugs.gnu.org; Fri, 01 Nov 2019 07:24:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45243) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQV2j-0003vK-Oy for 37869@debbugs.gnu.org; Fri, 01 Nov 2019 07:24:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iQV2e-0008TD-LC; Fri, 01 Nov 2019 07:24:32 -0400 Received: from [2a01:e0a:1d:7270:6a6c:dc17:fc02:cfda] (port=58530 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iQV2e-0006jU-1g; Fri, 01 Nov 2019 07:24:32 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Oleg Pykhalov Subject: Re: bug#37869: [PATCH] pull: Honor '/etc/guix/channels.scm'. References: <20191022160703.20897-1-ludo@gnu.org> <87tv7thlpe.fsf@gnu.org> <8736fczk7z.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 Brumaire an 228 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: Fri, 01 Nov 2019 12:24:30 +0100 In-Reply-To: <8736fczk7z.fsf@gmail.com> (Oleg Pykhalov's message of "Mon, 28 Oct 2019 23:30:24 +0300") Message-ID: <87pnibdekx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37869 Cc: 37869@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Oleg, Oleg Pykhalov skribis: > Ludovic Court=C3=A8s writes: > > [=E2=80=A6] > >>> From: Ludovic Court=C3=A8s >>> >>> * guix/scripts/pull.scm (channel-list)[global-file]: New variable. >>> [channels]: Honor it. >>> * doc/guix.texi (Invoking guix pull): Document it. >> >> Pushed as 49af34cfac89d384c46269bfd9388b2c73b1220a. > > I got an error during the guix pull: > > oleg@guixsd ~$ guix pull > News for channel 'guix' > Backtrace: > In guix/ui.scm: > 1730:12 19 (run-guix-command _ . _) > In ice-9/boot-9.scm: > 829:9 18 (catch _ _ # =E2=80=A6) > 829:9 17 (catch _ _ # =E2=80=A6) > 829:9 16 (catch _ _ # =E2=80=A6) > In guix/store.scm: > 623:10 15 (call-with-store _) > In guix/status.scm: > 768:4 14 (call-with-status-report _ _) > In guix/scripts/pull.scm: > 804:24 13 (_) > In guix/store.scm: > 1815:24 12 (run-with-store # =E2= =80=A6) > In guix/scripts/pull.scm: > 393:28 11 (_ #) > 356:15 10 (display-channel-news-headlines _) > In srfi/srfi-1.scm: > 592:29 9 (map1 _) > 592:17 8 (map1 ((#< name: guix url: "https://git.sa=E2=80=A6= > =E2=80=A6))) > In guix/scripts/pull.scm: > 283:11 7 (display-channel-specific-news _ _ #:port _ #:concise? _) > In srfi/srfi-1.scm: > 640:9 6 (for-each # =E2=80=A6) > In guix/scripts/pull.scm: > 241:12 5 (display-news-entry-title _ _ #) > In guix/ui.scm: > 1210:23 4 (texi->plain-text _) > In texinfo.scm: > 1131:22 3 (parse _) > 979:31 2 (loop # (*fragment*) _ _ _) > 910:31 1 (loop # #f # =E2=80=A6) > 745:27 0 (_ # #f #f # =E2=80=A6) > > texinfo.scm:745:27: Throw to key `parser-error' with args `(# "EOF while reading a token " "reading char data")'. My bad! Tobias fixed it in 6b00a5f4a79819db08cb4d8e9f24a01445b7962b, thanks Tobias! I think we need (1) a way to validate channel news, and (2) graceful handling of Texinfo errors. Commit 6330db4d55bf9be3702cc03145470c970fb7ae9b implements #2. Thanks, Ludo=E2=80=99. From unknown Fri Jun 20 20:12:51 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 29 Nov 2019 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator