[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/43: services: Add hurd-user-services-service-type.
From: |
guix-commits |
Subject: |
18/43: services: Add hurd-user-services-service-type. |
Date: |
Mon, 20 Apr 2020 07:34:05 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit ef57cf65a6b2be26ce2f4d85d5037861e91f6bb0
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Mon Apr 13 11:04:09 2020 +0200
services: Add hurd-user-services-service-type.
The `guix-daemon' service type depends on `user-services'. Provide a dummy
for that, so that we can use the guix-daemon service unmodified.
* gnu/services/hurd.scm (hurd-user-services-shepherd-service,
hurd-user-services-service-type): New function.
(hurd-service->shepherd-service): Add entry.
---
gnu/services/hurd.scm | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index 3394b79..0582dff 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -30,7 +30,8 @@
hurd-console-service-type
hurd-service->shepherd-service
hurd-ttys-configuration
- hurd-ttys-service-type))
+ hurd-ttys-service-type
+ hurd-user-processes-service-type))
;;; Commentary:
;;;
@@ -44,10 +45,38 @@
(match config
(($ <hurd-console-configuration>) (hurd-console-shepherd-service config))
(($ <hurd-ttys-configuration>) (hurd-ttys-shepherd-service config))
+ (('user-processes) (hurd-user-processes-shepherd-service #f))
(_ '()))))
;;;
+;;; Dummy hurd-user-processes service, required for guix-daemon.
+;;;
+
+(define (hurd-user-processes-shepherd-service _)
+ "Return the 'user-processes' Shepherd service."
+
+ (list (shepherd-service
+ (documentation "Dummy for bootstrapping (gnu services) on the Hurd.")
+ (provision '(user-processes))
+ (requirement '())
+ (start #~(const #t))
+ (stop #~(const #t))
+ (respawn? #f))))
+
+(define hurd-user-processes-service-type
+ (service-type
+ (name 'user-processes)
+ (extensions (list (service-extension shepherd-root-service-type
+ hurd-user-processes-shepherd-service)))
+ (compose concatenate)
+ (extend append)
+ (default-value '(user-processes)) ;canary for hurd-service->shepherd-service
+ (description "Dummy service to bootstrap (gnu services) on the
+Hurd.")))
+
+
+;;;
;;; Simple wrapper for <hurd>/bin/console.
;;;
- 12/43: gnu: Add libtirpc/hurd., (continued)
- 12/43: gnu: Add libtirpc/hurd., guix-commits, 2020/04/20
- 25/43: system: gnu: Populate "/etc" from "/boot/activation"., guix-commits, 2020/04/20
- 24/43: HACK use uncompiled .scm for shepherd, guix-commits, 2020/04/20
- 28/43: system: gnu: Add %bootstrap-{gcc, binutils, glibc} for devel profile., guix-commits, 2020/04/20
- 26/43: system: hurd: Add openssh service., guix-commits, 2020/04/20
- 32/43: system: hurd: Add guix., guix-commits, 2020/04/20
- 31/43: HACK gnu: python: Disable tests on the Hurd., guix-commits, 2020/04/20
- 30/43: gnu: tcl: Disable troublesome test on the Hurd., guix-commits, 2020/04/20
- 42/43: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd., guix-commits, 2020/04/20
- 37/43: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/20
- 18/43: services: Add hurd-user-services-service-type.,
guix-commits <=
- 33/43: gnu: guix: Use gnutls-3.6.13 when cross-compiling., guix-commits, 2020/04/20
- 27/43: system: hurd: Create system profile for guix development., guix-commits, 2020/04/20
- 29/43: guile: Disable web-server test on the Hurd., guix-commits, 2020/04/20
- 38/43: gnu: guix: Add dependency on `hurd' when building for the Hurd., guix-commits, 2020/04/20
- 39/43: gnu: guix: Avoid loading (gnu installer) when cross compiling., guix-commits, 2020/04/20
- 36/43: gnu: guix: Cross-build fix: override compressors., guix-commits, 2020/04/20
- 40/43: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/20
- 43/43: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/20
- 34/43: gnu: guix: Fix cross-compilation., guix-commits, 2020/04/20
- 35/43: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/20