diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-05-01 11:05:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-05-01 11:05:47 +0200 |
| commit | 757e633d57a7b994759d69e41dd759a39f1a34ae (patch) | |
| tree | ee8c662fe9d39c1f18b936c40be3df529606444b /guix | |
| parent | 20ee8883bcb1d75e8e783de5254e11e7142c1e61 (diff) | |
build: Change default substitute server to "ci.guix.gnu.org".
* config-daemon.ac: Replace "ci.guix.info" with "ci.guix.gnu.org".
* doc/guix.texi (SUBSTITUTE-SERVER): Likewise.
* etc/substitutes/ci.guix.gnu.org.pub: New file.
* Makefile.am (dist_pkgdata_DATA): Add it.
* guix/scripts/build.scm (%default-log-urls): Update.
* guix/scripts/substitute.scm (%default-substitute-urls): Likewise.
* guix/store.scm (%default-substitute-urls): Likewise.
* guix/self.scm (miscellaneous-files): Add "ci.guix.gnu.org".
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/build.scm | 2 | ||||
| -rwxr-xr-x | guix/scripts/substitute.scm | 2 | ||||
| -rw-r--r-- | guix/self.scm | 2 | ||||
| -rw-r--r-- | guix/store.scm | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index ba143ad16b..8d5411ed43 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -65,7 +65,7 @@ (define %default-log-urls ;; Default base URLs for build logs. - '("http://ci.guix.info/log")) + '("http://ci.guix.gnu.org/log")) ;; XXX: The following procedure cannot be in (guix store) because of the ;; dependency on (guix derivations). diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 797a76db3f..135398ba48 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -1061,7 +1061,7 @@ found." (#f ;; This can only happen when this script is not invoked by the ;; daemon. - '("http://ci.guix.info")))) + '("http://ci.guix.gnu.org")))) (define substitute-urls ;; List of substitute URLs. diff --git a/guix/self.scm b/guix/self.scm index 68b87051e9..7098e4ea29 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -588,6 +588,8 @@ load path." ("share/guix/berlin.guixsd.org.pub" ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")) + ("share/guix/ci.guix.gnu.org.pub" ;alias + ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")) ("share/guix/ci.guix.info.pub" ;alias ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub"))))) diff --git a/guix/store.scm b/guix/store.scm index 1b485ab5fa..5c6e4e0ca6 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -746,7 +746,7 @@ encoding conversion errors." (map (if (false-if-exception (resolve-interface '(gnutls))) (cut string-append "https://" <>) (cut string-append "http://" <>)) - '("ci.guix.info"))) + '("ci.guix.gnu.org"))) (define* (set-build-options server #:key keep-failed? keep-going? fallback? |