diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /gnu/installer/services.scm | |
parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
download | guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to 'gnu/installer/services.scm')
-rw-r--r-- | gnu/installer/services.scm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index ec5ea30594..b0007218ae 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -29,7 +29,6 @@ system-service-packages desktop-system-service? - networking-system-service? %system-services system-services->configuration)) @@ -38,7 +37,7 @@ system-service make-system-service system-service? (name system-service-name) ;string - (type system-service-type) ;'desktop | 'networking + (type system-service-type) ;'desktop|'networking|… (recommended? system-service-recommended? ;Boolean (default #f)) (snippet system-service-snippet ;list of sexps @@ -46,7 +45,6 @@ (packages system-service-packages ;list of sexps (default '()))) -;; This is the list of desktop environments supported as services. (define %system-services (let-syntax ((desktop-environment (syntax-rules () ((_ fields ...) @@ -56,6 +54,7 @@ (G_ (syntax-rules () ;for xgettext ((_ str) str)))) (list + ;; This is the list of desktop environments supported as services. (desktop-environment (name "GNOME") (snippet '((service gnome-desktop-service-type)))) @@ -124,10 +123,6 @@ "Return true if SERVICE is a desktop environment service." (eq? 'desktop (system-service-type service))) -(define (networking-system-service? service) - "Return true if SERVICE is a desktop environment service." - (eq? 'networking (system-service-type service))) - (define (system-services->configuration services) "Return the configuration field for SERVICES." (let* ((snippets (append-map system-service-snippet services)) |