diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
commit | 6e1f8d552b73e508bba47dedb5676ce5ccdcc398 (patch) | |
tree | 952a8fa2652ad26946100707311824b8c7a88768 /gnu/services/base.scm | |
parent | c24b896365ebf0c783140e53e000305e682d18c5 (diff) | |
parent | 8e92d5465fc154fed5d06f7e4a64d7dcccded74d (diff) | |
download | patches-6e1f8d552b73e508bba47dedb5676ce5ccdcc398.tar patches-6e1f8d552b73e508bba47dedb5676ce5ccdcc398.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/base.scm')
-rw-r--r-- | gnu/services/base.scm | 7 |
1 files changed, 3 insertions, 4 deletions
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> 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")) |