summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-12-03 16:22:43 +0100
committerLudovic Courtès <ludo@gnu.org>2018-12-04 10:57:56 +0100
commit0bc02becca1b4b0b3eddb7972567a75f0d464b72 (patch)
treeaa74e412ade21b8cb6783296ddeaddb5e54a9132 /gnu
parent6a837b6062ab405f6ca6d9c0163836769098d89b (diff)
Remove most references to hydra.gnu.org.
* Makefile.am (assert-binaries-available): Don't mention hydra.gnu.org in comment. * build-aux/check-available-binaries.scm: Likewise. * build-aux/check-final-inputs-self-contained.scm: Likewise. * doc/guix.texi (SUBSTITUTE-SERVER): New variable. Use it throughout instead of "mirror.hydra.gnu.org". * doc/contributing.texi (Submitting Patches): Likewise. * gnu/services/base.scm (hydra-key-authorization) (guix-activation): Remove mentions of "hydra.gnu.org" in comments and messages. * gnu/system/install.scm (%installation-services): Likewise. * guix/scripts/size.scm (guix-size): Likewise.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/base.scm4
-rw-r--r--gnu/system/install.scm2
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 228d3c5926d..cee9898d79e 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1518,7 +1518,7 @@ public key, with GUIX."
1518 (let ((status (cdr (waitpid pid)))) 1518 (let ((status (cdr (waitpid pid))))
1519 (unless (zero? status) 1519 (unless (zero? status)
1520 (format (current-error-port) "warning: \ 1520 (format (current-error-port) "warning: \
1521failed to register hydra.gnu.org public key: ~a~%" status)))))))) 1521failed to register public key '~a': ~a~%" key status))))))))
1522 1522
1523(define %default-authorized-guix-keys 1523(define %default-authorized-guix-keys
1524 ;; List of authorized substitute keys. 1524 ;; List of authorized substitute keys.
@@ -1630,7 +1630,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
1630 ;; otherwise call 'chown' here, but the problem is that on a COW overlayfs, 1630 ;; otherwise call 'chown' here, but the problem is that on a COW overlayfs,
1631 ;; chown leads to an entire copy of the tree, which is a bad idea. 1631 ;; chown leads to an entire copy of the tree, which is a bad idea.
1632 1632
1633 ;; Optionally authorize hydra.gnu.org's key. 1633 ;; Optionally authorize substitute server keys.
1634 (if authorize-key? 1634 (if authorize-key?
1635 #~(begin 1635 #~(begin
1636 #$@(map (cut hydra-key-authorization <> guix) keys)) 1636 #$@(map (cut hydra-key-authorization <> guix) keys))
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 45b3a0c839f..c345ba0626f 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -250,7 +250,7 @@ You have been warned. Thanks for being so brave.\x1b[0m
250 ;; The usual services. 250 ;; The usual services.
251 (syslog-service) 251 (syslog-service)
252 252
253 ;; The build daemon. Register the hydra.gnu.org key as trusted. 253 ;; The build daemon. Register the official server keys as trusted.
254 ;; This allows the installation process to use substitutes by 254 ;; This allows the installation process to use substitutes by
255 ;; default. 255 ;; default.
256 (guix-service (guix-configuration (authorize-key? #t))) 256 (guix-service (guix-configuration (authorize-key? #t)))