From 3a8bfebed94ba295432da8304b7ffb4a611ef761 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 28 Jun 2019 16:33:01 +0200 Subject: etc: Remove hydra.gnu.org.pub key. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/substitutes/hydra.gnu.org.pub: Delete file. * guix/self.scm (miscellaneous-files): Don't install it. * Makefile.am (dist_pkgdata_DATA): Remove it. * gnu/services/base.scm (%default-authorized-guix-keys): Likewise. (hydra-key-authorization): Rename to… (substitute-key-authorization): …this. Adjust only call site. --- gnu/services/base.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/services/base.scm') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 3c1827fb70..537d30add5 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1533,7 +1533,7 @@ GID." (('gnu rest ...) #t) (rest #f))) -(define (hydra-key-authorization keys guix) +(define (substitute-key-authorization keys guix) "Return a gexp with code to register KEYS, a list of files containing 'guix archive' public keys, with GUIX." (define default-acl @@ -1570,8 +1570,7 @@ archive' public keys, with GUIX." (define %default-authorized-guix-keys ;; List of authorized substitute keys. - (list (file-append guix "/share/guix/hydra.gnu.org.pub") - (file-append guix "/share/guix/berlin.guixsd.org.pub"))) + (list (file-append guix "/share/guix/berlin.guixsd.org.pub"))) (define-record-type* guix-configuration make-guix-configuration @@ -1688,7 +1687,7 @@ archive' public keys, with GUIX." ;; Optionally authorize substitute server keys. (if authorize-key? - (hydra-key-authorization keys guix) + (substitute-key-authorization keys guix) #~#f)))) (define* (references-file item #:optional (name "references")) -- cgit 1.4.1