diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-22 23:43:25 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-22 23:43:25 +0100 |
| commit | 4d58122071bbd7bb56c9658a9bbe7621bf3e423d (patch) | |
| tree | 2c1d2603e5758a50da32960cadd1c1cff13442c0 | |
| parent | 1123759b4549bedc1a44b5d59a30c886e58ff6bc (diff) | |
| download | patches-4d58122071bbd7bb56c9658a9bbe7621bf3e423d.tar patches-4d58122071bbd7bb56c9658a9bbe7621bf3e423d.tar.gz | |
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.
| -rw-r--r-- | guix/store.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/guix/store.scm b/guix/store.scm index 45c555b12c..3d6b06989c 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)) ;; Must be called after `open-connection'. (define socket |