From 234d7ef567bd98ace98dd784472f19d2ee84f73d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Mar 2018 10:32:55 +0100 Subject: build: Always use https substitute URLs. * config-daemon.ac: Remove GUILE_MODULE_AVAILABLE check for (gnutls). --- config-daemon.ac | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'config-daemon.ac') diff --git a/config-daemon.ac b/config-daemon.ac index d409ce0117..825b5971df 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -118,14 +118,10 @@ if test "x$guix_build_daemon" = "xyes"; then dnl Check for (for immutable file support). AC_CHECK_HEADERS([linux/fs.h]) - dnl Determine the appropriate default list of substitute URLs. - GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)]) - if test "x$have_gnutls" = "xyes"; then - guix_substitute_urls="https://mirror.hydra.gnu.org" - else - AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear]) - guix_substitute_urls="http://mirror.hydra.gnu.org" - fi + dnl Determine the appropriate default list of substitute URLs (GnuTLS + dnl is required so we can default to 'https'.) + guix_substitute_urls="https://mirror.hydra.gnu.org" + AC_MSG_CHECKING([for default substitute URLs]) AC_MSG_RESULT([$guix_substitute_urls]) -- cgit 1.4.1 From bdbece905538caf68817066126cb9b6b68ba9fd4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Mar 2018 10:37:17 +0100 Subject: build: Default to berlin.guixsd.org substitutes on aarch64. Suggested by Efraim Flashner . * config-daemon.ac: Set 'guix_substitute_urls' to berlin.guixsd.org on aarch64. --- config-daemon.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'config-daemon.ac') diff --git a/config-daemon.ac b/config-daemon.ac index 825b5971df..6cf65bef1d 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -120,7 +120,15 @@ 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://mirror.hydra.gnu.org" + 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 AC_MSG_CHECKING([for default substitute URLs]) AC_MSG_RESULT([$guix_substitute_urls]) -- cgit 1.4.1