Browse Source

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".
version-1.0.0
Ludovic Courtès 3 years ago
parent
commit
757e633d57
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 1
      Makefile.am
  2. 2
      config-daemon.ac
  3. 2
      doc/guix.texi
  4. 1
      etc/substitutes/ci.guix.gnu.org.pub
  5. 2
      guix/scripts/build.scm
  6. 2
      guix/scripts/substitute.scm
  7. 2
      guix/self.scm
  8. 2
      guix/store.scm

1
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.

2
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])

2
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

1
etc/substitutes/ci.guix.gnu.org.pub

@ -0,0 +1 @@
berlin.guixsd.org.pub

2
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).

2
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.

2
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")))))

2
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?

Loading…
Cancel
Save