summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-27 10:41:14 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-27 11:54:06 +0100
commit391e0d65d7129d53c025963d2758724e75626eb4 (patch)
tree1198b3fdf1a35f5d5cd1e73e920d7c5b3bbc1a79 /gnu
parentee05cc7fe353c1c9b45062343746ac215a29fed5 (diff)
services: Deprecate 'xfce-desktop-service'.
* gnu/services/desktop.scm (xfce-desktop-service-type)[default-value] [description]: New fields. (xfce-desktop-service): Deprecate. * gnu/system/examples/desktop.tmpl: Use the (service …) form. * gnu/installer/services.scm (%desktop-environments): Add TODO comment. * doc/guix.texi (Desktop Services): Adjust accordingly, and fix spelling of "Xfce" throughout.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/installer/services.scm2
-rw-r--r--gnu/services/desktop.scm9
-rw-r--r--gnu/system/examples/desktop.tmpl2
3 files changed, 9 insertions, 4 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index e719da083d..2b6625f6af 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -41,6 +41,8 @@
(snippet '(service gnome-desktop-service-type)))
(desktop-environment
(name "Xfce")
+ ;; TODO: Use 'xfce-desktop-service-type' when the 'guix' package provides
+ ;; it with a default value.
(snippet '(xfce-desktop-service)))
(desktop-environment
(name "MATE")
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 9c9472e1a2..da6291036f 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -945,10 +945,13 @@ and extends polkit with the actions from @code{mate-settings-daemon}."
"thunar")
xfce-package))
(service-extension profile-service-type
- (compose list
- xfce-package))))))
+ (compose list xfce-package))))
+ (default-value (xfce-desktop-configuration))
+ (description "Run the Xfce desktop environment.")))
-(define* (xfce-desktop-service #:key (config (xfce-desktop-configuration)))
+(define-deprecated (xfce-desktop-service #:key (config
+ (xfce-desktop-configuration)))
+ xfce-desktop-service-type
"Return a service that adds the @code{xfce} package to the system profile,
and extends polkit with the ability for @code{thunar} to manipulate the file
system as root from within a user session, after the user has authenticated
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index fe32bc58b5..d0e3ff56e8 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -58,7 +58,7 @@
;; include the X11 log-in service, networking with
;; NetworkManager, and more.
(services (append (list (service gnome-desktop-service-type)
- (xfce-desktop-service))
+ (service xfce-desktop-service))
%desktop-services))
;; Allow resolution of '.local' host names with mDNS.