~ruther/guix-local

4d58122071bbd7bb56c9658a9bbe7621bf3e423d — Ludovic Courtès 11 years ago 1123759
store: Default to a non-empty list of substituters.

Fixes <http://bugs.gnu.org/20163>.
Reported by Mark H Weaver <mhw@netris.org>.

* guix/store.scm (%default-substitute-urls): New variable.
  (set-build-options): Change default value of #:substitute-urls to
  %DEFAULT-SUBSTITUTE-URLS.
1 files changed, 10 insertions(+), 1 deletions(-)

M guix/store.scm
M guix/store.scm => guix/store.scm +10 -1
@@ 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))
  ;; Must be called after `open-connection'.

  (define socket