[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/09: build: Default to https://ci.guix.info for substitutes.
From: |
guix-commits |
Subject: |
03/09: build: Default to https://ci.guix.info for substitutes. |
Date: |
Tue, 4 Dec 2018 05:19:52 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 0a5fa004f7f21dc3e01747b8e94fbb21e056e4ca
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 3 16:32:03 2018 +0100
build: Default to https://ci.guix.info for substitutes.
* config-daemon.ac (guix_substitute_urls): Always default to
"https://ci.guix.info".
* doc/guix.texi (SUBSTITUTE-SERVER): Switch to ci.guix.info.
* guix/scripts/build.scm (%default-log-urls): Likewise.
* guix/scripts/substitute.scm (%default-substitute-urls): Likewise.
* guix/store.scm (%default-substitute-urls): Likewise.
---
config-daemon.ac | 10 +---------
doc/guix.texi | 13 ++++---------
guix/scripts/build.scm | 2 +-
guix/scripts/substitute.scm | 2 +-
guix/store.scm | 2 +-
5 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/config-daemon.ac b/config-daemon.ac
index aac4681..e5b0ee0 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -120,15 +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'.)
- case "x$host_cpu" in
- xaarch64)
- # Currently only berlin.guixsd.org provides aarch64 binaries.
- guix_substitute_urls="https://berlin.guixsd.org"
- ;;
- *)
- guix_substitute_urls="https://mirror.hydra.gnu.org"
- ;;
- esac
+ guix_substitute_urls="https://ci.guix.info"
AC_MSG_CHECKING([for default substitute URLs])
AC_MSG_RESULT([$guix_substitute_urls])
diff --git a/doc/guix.texi b/doc/guix.texi
index 3d9b006..c138d43 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14,7 +14,7 @@
@set KEY-SERVER pool.sks-keyservers.net
@c The official substitute server used by default.
address@hidden SUBSTITUTE-SERVER ci.guix.info
address@hidden SUBSTITUTE-SERVER mirror.hydra.gnu.org
@copying
Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic
address@hidden
@@ -2374,14 +2374,9 @@ Then, you can run something like this:
@end example
@quotation Note
-Similarly, the @file{berlin.guixsd.org.pub} file contains the public key
-for the project's new build farm, reachable at
address@hidden://berlin.guixsd.org}.
-
-As of this writing @code{berlin.guixsd.org} is being upgraded so it can
-better scale up, but you might want to give it a try. It is backed by
-20 x86_64/i686 build nodes and may be able to provide substitutes more
-quickly than @code{mirror.hydra.gnu.org}.
+Similarly, the @file{hydra.gnu.org.pub} file contains the public key
+of an independent build farm also run by the project, reachable at
address@hidden://mirror.hydra.gnu.org}.
@end quotation
Once this is in place, the output of a command like @code{guix build}
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 5532c65..0b7da31 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://hydra.gnu.org/log"))
+ '("http://ci.guix.info/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 eb82224..d6dc9b6 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -1052,7 +1052,7 @@ found."
(#f
;; This can only happen when this script is not invoked by the
;; daemon.
- '("http://hydra.gnu.org"))))
+ '("http://ci.guix.info"))))
(define substitute-urls
;; List of substitute URLs.
diff --git a/guix/store.scm b/guix/store.scm
index 9dc651b..509fd4d 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -693,7 +693,7 @@ encoding conversion errors."
(map (if (false-if-exception (resolve-interface '(gnutls)))
(cut string-append "https://" <>)
(cut string-append "http://" <>))
- '("mirror.hydra.gnu.org")))
+ '("ci.guix.info")))
(define* (set-build-options server
#:key keep-failed? keep-going? fallback?
- branch master updated (1f51f0d -> f5a15a8), guix-commits, 2018/12/04
- 01/09: etc: Add "ci.guix.info.pub" public key file., guix-commits, 2018/12/04
- 05/09: grafts: Mark as non substitutable., guix-commits, 2018/12/04
- 08/09: gnu: enlightenment: Use absolute path to 'edje_cc'., guix-commits, 2018/12/04
- 09/09: gnu: emacs-irony-mode: Fetch source using git., guix-commits, 2018/12/04
- 06/09: gnu: petsc-openmpi: Configure with support for HYPRE preconditioner., guix-commits, 2018/12/04
- 07/09: gnu: fenics: Skip extra demo in 'check' phase., guix-commits, 2018/12/04
- 04/09: refresh: '--list-dependents' ignores deprecated packages., guix-commits, 2018/12/04
- 02/09: Remove most references to hydra.gnu.org., guix-commits, 2018/12/04
- 03/09: build: Default to https://ci.guix.info for substitutes.,
guix-commits <=