summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-03-05 10:32:55 +0100
committerLudovic Courtès <ludo@gnu.org>2018-03-05 10:41:18 +0100
commit234d7ef567bd98ace98dd784472f19d2ee84f73d (patch)
tree6baca77dcaef687cc0d528a020039449d199e18b
parentca041ec1a3dc9319ca8ac72bbdd984f0bd36ba48 (diff)
downloadguix-234d7ef567bd98ace98dd784472f19d2ee84f73d.tar.gz
build: Always use https substitute URLs.
* config-daemon.ac: Remove GUILE_MODULE_AVAILABLE check for (gnutls).
-rw-r--r--config-daemon.ac12
1 files changed, 4 insertions, 8 deletions
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 <linux/fs.h> (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])