diff options
| author | Leo Famulari <leo@famulari.name> | 2016-08-17 23:21:00 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-08-17 23:35:22 -0400 |
| commit | 015ee84aac888b3900fa0ee54a1b7e55c083e7d3 (patch) | |
| tree | 2ef7a51321dff53e479bc6d11f3785e1c65c07f0 /gnu/services | |
| parent | a3d6e1f432ad5f9cde8bee670b28646e05c4cb19 (diff) | |
| parent | 79f9d5d5dc97e492e0583e039a2699aa17f4eb11 (diff) | |
| download | patches-015ee84aac888b3900fa0ee54a1b7e55c083e7d3.tar patches-015ee84aac888b3900fa0ee54a1b7e55c083e7d3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 4474ce7996..218f3b3cf3 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> -;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 David Craven <david@craven.ch> @@ -1099,8 +1099,9 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) ;; chown leads to an entire copy of the tree, which is a bad idea. ;; Optionally authorize hydra.gnu.org's key. - (and authorize-key? - (hydra-key-authorization guix))))) + (if authorize-key? + (hydra-key-authorization guix) + #~#f)))) (define guix-service-type (service-type |