diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-03-16 10:35:24 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-16 11:27:37 +0100 |
| commit | df061d079b50111280aa7209b3b3c4cf21fde218 (patch) | |
| tree | af9c1882dafae4c1f505dd3fdb87ea8fdc8a8ddb /guix | |
| parent | 409e4ac6e3d86491901a9c0bb422b0415c906964 (diff) | |
| download | gnu-guix-df061d079b50111280aa7209b3b3c4cf21fde218.tar gnu-guix-df061d079b50111280aa7209b3b3c4cf21fde218.tar.gz | |
build: Default to "https://mirror.hydra.gnu.org/" for substitutes.
* config-daemon.ac: Check for (gnutls) and define 'GUIX_SUBSTITUTE_URLS'.
* nix/nix-daemon/guix-daemon.cc (main): Use GUIX_SUBSTITUTE_URLS.
* guix/store.scm (%default-substitute-urls): Use 'https' when (gnutls)
is available.
* doc/guix.texi (Binary Installation): Mention mirrors
(Invoking guix-daemon): Mention mirror.hydra.gnu.org.
(Substitutes): Mention mirrors.
(Invoking guix archive): Show https URLs.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/store.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/store.scm b/guix/store.scm index 01248738dc..ae52628545 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -504,8 +504,12 @@ encoding conversion errors." (status k)))))))) (define %default-substitute-urls - ;; Default list of substituters. - '("http://hydra.gnu.org")) + ;; Default list of substituters. This is *not* the list used by + ;; 'guix-daemon', and few clients use it ('guix build --log-file' uses it.) + (map (if (false-if-exception (resolve-interface '(gnutls))) + (cut string-append "https://" <>) + (cut string-append "http://" <>)) + '("hydra.gnu.org"))) (define* (set-build-options server #:key keep-failed? keep-going? fallback? |