summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-27 10:14:11 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-27 11:54:06 +0100
commitee05cc7fe353c1c9b45062343746ac215a29fed5 (patch)
treef2168c8840b640b95a6cab4192071916a4be5eb2 /gnu
parent1c155ec76ba36b3df9879cecc3b120e38cb745e3 (diff)
services: Deprecate 'gnome-desktop-service'.
* gnu/services/desktop.scm (gnome-desktop-service-type)[default-value]: New field. (gnome-desktop-service): Deprecate. * gnu/installer/services.scm (%desktop-environments): Use the (service …) form for GNOME. * gnu/system/examples/desktop.tmpl: Likewise. * doc/guix.texi (Desktop Services): Adjust accordingly.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/installer/services.scm2
-rw-r--r--gnu/services/desktop.scm5
-rw-r--r--gnu/system/examples/desktop.tmpl2
3 files changed, 6 insertions, 3 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index f263ecc84f..e719da083d 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -38,7 +38,7 @@
(list
(desktop-environment
(name "GNOME")
- (snippet '(gnome-desktop-service)))
+ (snippet '(service gnome-desktop-service-type)))
(desktop-environment
(name "Xfce")
(snippet '(xfce-desktop-service)))
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index b912c208cc..9c9472e1a2 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -884,9 +884,12 @@ rules."
(service-extension profile-service-type
(compose list
gnome-package))))
+ (default-value (gnome-desktop-configuration))
(description "Run the GNOME desktop environment.")))
-(define* (gnome-desktop-service #:key (config (gnome-desktop-configuration)))
+(define-deprecated (gnome-desktop-service #:key (config
+ (gnome-desktop-configuration)))
+ gnome-desktop-service-type
"Return a service that adds the @code{gnome} package to the system profile,
and extends polkit with the actions from @code{gnome-settings-daemon}."
(service gnome-desktop-service-type config))
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index bc5cbd6e6b..fe32bc58b5 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -57,7 +57,7 @@
;; screen with F1. Use the "desktop" services, which
;; include the X11 log-in service, networking with
;; NetworkManager, and more.
- (services (append (list (gnome-desktop-service)
+ (services (append (list (service gnome-desktop-service-type)
(xfce-desktop-service))
%desktop-services))