Re: 05/05: store: Default to a non-empty list of substituters.

[Mark H Weaver]

Ludovic Courtès <address@hidden> writes:

> commit 4d58122071bbd7bb56c9658a9bbe7621bf3e423d
> Author: Ludovic Courtès <address@hidden>
> Date:   Sun Mar 22 23:43:25 2015 +0100
>
>     store: Default to a non-empty list of substituters.
>     
>     Fixes <http://bugs.gnu.org/20163>.
>     Reported by Mark H Weaver <address@hidden>.
>     
>     * guix/store.scm (%default-substitute-urls): New variable.
>       (set-build-options): Change default value of #:substitute-urls to
>       %DEFAULT-SUBSTITUTE-URLS.
> ---
>  guix/store.scm |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/guix/store.scm b/guix/store.scm
> index 45c555b..3d6b069 100644
> --- a/guix/store.scm
> +++ b/guix/store.scm
> @@ -447,6 +447,10 @@ encoding conversion errors."
>                                (message "invalid error code")
>                                (status   k))))))))
>  
> +(define %default-substitute-urls
> +  ;; Default list of substituters.
> +  '("http://hydra.gnu.org";))
> +
>  (define* (set-build-options server
>                              #:key keep-failed? keep-going? fallback?
>                              (verbosity 0)
> @@ -459,7 +463,12 @@ encoding conversion errors."
>                              (print-build-trace #t)
>                              (build-cores (current-processor-count))
>                              (use-substitutes? #t)
> -                            (substitute-urls '())) ; client "untrusted" 
> cache URLs
> +
> +                            ;; Client-provided substitute URLs.  For
> +                            ;; unprivileged clients, these are considered
> +                            ;; "untrusted"; for root, they override the
> +                            ;; daemon's settings.
> +                            (substitute-urls %default-substitute-urls))

Does this mean that even if I've configured my daemon to use a different
set of substitute-urls, when I run 'guix' as root those settings will be
overridden?  That seems suboptimal.

We have a similar problem with the values of --cores and --max-jobs
passed to guix-daemon being ignored because they are always overridden
by our client.

How can we fix these so that the daemon's settings are used unless the
user specifically asks to override them in the client?

       Mark