From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: 05/05: store: Default to a non-empty list of substituters. Date: Mon, 23 Mar 2015 14:18:24 -0400 Message-ID: <87egofr30v.fsf@netris.org> References: <20150322224357.10349.62362@vcs.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya6vX-0005bt-NI for guix-devel@gnu.org; Mon, 23 Mar 2015 14:18:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ya6vU-0002ZX-G8 for guix-devel@gnu.org; Mon, 23 Mar 2015 14:18:15 -0400 Received: from world.peace.net ([50.252.239.5]:53547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya6vU-0002Xg-C0 for guix-devel@gnu.org; Mon, 23 Mar 2015 14:18:12 -0400 In-Reply-To: (Ludovic Court's message of "Sun, 22 Mar 2015 22:43:59 +0000") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Ludovic Court=C3=A8s writes: > commit 4d58122071bbd7bb56c9658a9bbe7621bf3e423d > Author: Ludovic Court=C3=A8s > Date: Sun Mar 22 23:43:25 2015 +0100 > > store: Default to a non-empty list of substituters. >=20=20=20=20=20 > Fixes . > Reported by Mark H Weaver . >=20=20=20=20=20 > * 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)))))))) >=20=20 > +(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