bug#37869: closed ([PATCH] pull: Honor '/etc/guix/channels.scm'.)

[GNU bug Tracking System]

Your message dated Sun, 27 Oct 2019 23:23:25 +0100
with message-id <address@hidden>
and subject line Re: [bug#37869] [PATCH] pull: Honor '/etc/guix/channels.scm'.
has caused the debbugs.gnu.org bug report #37869,
regarding [PATCH] pull: Honor '/etc/guix/channels.scm'.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
37869: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37869
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] pull: Honor '/etc/guix/channels.scm'.
>
>
>
>
> Date: 
>
> Tue, 22 Oct 2019 18:07:03 +0200
>
>
>
>
> From: Ludovic Courtès <address@hidden>
>
> * 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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#37869] [PATCH] pull: Honor '/etc/guix/channels.scm'.
>
>
>
>
> Date: 
>
> Sun, 27 Oct 2019 23:23:25 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
>
>
>
>
> Hi,
>
> Ludovic Courtès <address@hidden> skribis:
>
> > From: Ludovic Courtès <address@hidden>
> >
> > * 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 <address@hidden> skribis:
>
> > French:
>
> Thank you, Julien; added with minor tweaks.
>
> Ludo’.
>
>
> --- End Message ---