diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | config-daemon.ac | 2 | ||||
| -rw-r--r-- | doc/guix.texi | 2 | ||||
| l--------- | etc/substitutes/ci.guix.gnu.org.pub | 1 | ||||
| -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 |
8 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index deec100c3c..0494452386 100644 --- a/Makefile.am +++ b/Makefile.am @@ -487,6 +487,7 @@ check-system: $(GOBJECTS) dist_pkgdata_DATA = \ etc/substitutes/hydra.gnu.org.pub \ etc/substitutes/berlin.guixsd.org.pub \ + etc/substitutes/ci.guix.gnu.org.pub \ etc/substitutes/ci.guix.info.pub # Bash completion file. diff --git a/config-daemon.ac b/config-daemon.ac index e5b0ee082c..f1ad10acff 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -120,7 +120,7 @@ if test "x$guix_build_daemon" = "xyes"; then dnl Determine the appropriate default list of substitute URLs (GnuTLS dnl is required so we can default to 'https'.) - guix_substitute_urls="https://ci.guix.info" + guix_substitute_urls="https://ci.guix.gnu.org" AC_MSG_CHECKING([for default substitute URLs]) AC_MSG_RESULT([$guix_substitute_urls]) diff --git a/doc/guix.texi b/doc/guix.texi index fcee57d9cd..7cda06de5c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17,7 +17,7 @@ @set BASE-URL https://ftp.gnu.org/gnu/guix @c The official substitute server used by default. -@set SUBSTITUTE-SERVER ci.guix.info +@set SUBSTITUTE-SERVER ci.guix.gnu.org @set SUBSTITUTE-URL https://@value{SUBSTITUTE-SERVER} @copying diff --git a/etc/substitutes/ci.guix.gnu.org.pub b/etc/substitutes/ci.guix.gnu.org.pub new file mode 120000 index 0000000000..b1d1e4d763 --- /dev/null +++ b/etc/substitutes/ci.guix.gnu.org.pub @@ -0,0 +1 @@ +berlin.guixsd.org.pub \ No newline at end of file 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? |