janneke pushed a commit to branch wip-hurd-vm in repository guix. commit 6a687dccb83424a281096f900dc599f0518d91fa Author: Jan (janneke) Nieuwenhuizen <jann...@gnu.org> AuthorDate: Sat Apr 25 20:07:05 2020 +0200
squash! services: hurd: Use cons as extend method. * gnu/services/hurd.scm (first-of-two): New function. --- gnu/services/hurd.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm index d40d85a..5812c81 100644 --- a/gnu/services/hurd.scm +++ b/gnu/services/hurd.scm @@ -60,6 +60,10 @@ (('user-processes) ((@@ (gnu services shepherd) user-processes-shepherd-service) '())) (_ '())))) +(define (first-of-two first second) + first) + + ;;; ;;; The ETC service for the Hurd. @@ -107,7 +111,7 @@ fi\n"))) (extensions (list (service-extension shepherd-root-service-type hurd-file-systems-shepherd-service))) (compose concatenate) - (extend cons) + (extend first-of-two) (default-value '(file-systems)) ;canary for hurd-service->shepherd-service (description "Dummy service to bootstrap (gnu services) on the Hurd."))) @@ -174,7 +178,7 @@ Hurd."))) (list (service-extension shepherd-root-service-type hurd-console-shepherd-service))) (compose concatenate) - (extend cons) + (extend first-of-two) (default-value (hurd-console-configuration)))) @@ -199,7 +203,7 @@ Hurd."))) (extensions (list (service-extension shepherd-root-service-type hurd-loopback-shepherd-service))) (compose concatenate) - (extend cons) + (extend first-of-two) (default-value '(loopback)) ;canary for hurd-service->shepherd-service (description "Dummy service to bootstrap (gnu services) on the Hurd."))) @@ -238,7 +242,7 @@ Hurd."))) (list (service-extension shepherd-root-service-type hurd-ttys-shepherd-service))) (compose concatenate) - (extend cons) + (extend first-of-two) (default-value (hurd-ttys-configuration))))