summary refs log tree commit diff
path: root/gnu/services/base.scm
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/services/base.scm
parent6a837b6062ab405f6ca6d9c0163836769098d89b (diff)
downloadguix-0bc02becca1b4b0b3eddb7972567a75f0d464b72.tar.gz
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/services/base.scm')
-rw-r--r--gnu/services/base.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 228d3c5926..cee9898d79 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1518,7 +1518,7 @@ public key, with GUIX."
            (let ((status (cdr (waitpid pid))))
              (unless (zero? status)
                (format (current-error-port) "warning: \
-failed to register hydra.gnu.org public key: ~a~%" status))))))))
+failed to register public key '~a': ~a~%" key status))))))))
 
 (define %default-authorized-guix-keys
   ;; List of authorized substitute keys.
@@ -1630,7 +1630,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
      ;; otherwise call 'chown' here, but the problem is that on a COW overlayfs,
      ;; chown leads to an entire copy of the tree, which is a bad idea.
 
-     ;; Optionally authorize hydra.gnu.org's key.
+     ;; Optionally authorize substitute server keys.
      (if authorize-key?
          #~(begin
              #$@(map (cut hydra-key-authorization <> guix) keys))