summaryrefslogtreecommitdiff
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
parentee05cc7fe353c1c9b45062343746ac215a29fed5 (diff)
downloadpatches-391e0d65d7129d53c025963d2758724e75626eb4.tar
patches-391e0d65d7129d53c025963d2758724e75626eb4.tar.gz
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.
-rw-r--r--doc/guix.texi37
-rw-r--r--gnu/installer/services.scm2
-rw-r--r--gnu/services/desktop.scm9
-rw-r--r--gnu/system/examples/desktop.tmpl2
4 files changed, 34 insertions, 16 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index d99b7fd933..1bbed7a72d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14395,7 +14395,7 @@ The @code{(gnu services desktop)} module provides services that are
usually useful in the context of a ``desktop'' setup---that is, on a
machine running a graphical display server, possibly with graphical user
interfaces, etc. It also defines services that provide specific desktop
-environments like GNOME, XFCE or MATE.
+environments like GNOME, Xfce or MATE.
To simplify things, the module defines a variable containing the set of
services that users typically expect on a machine with a graphical
@@ -14422,14 +14422,14 @@ Reference, @code{services}}).
Additionally, the @code{gnome-desktop-service-type},
@code{xfce-desktop-service}, @code{mate-desktop-service-type} and
-@code{enlightenment-desktop-service-type} procedures can add GNOME, XFCE, MATE
+@code{enlightenment-desktop-service-type} procedures can add GNOME, Xfce, MATE
and/or Enlightenment to a system. To ``add GNOME'' means that system-level
services like the backlight adjustment helpers and the power management
utilities are added to the system, extending @code{polkit} and @code{dbus}
appropriately, allowing GNOME to operate with elevated privileges on a
limited number of special-purpose system interfaces. Additionally,
adding a service made by @code{gnome-desktop-service-type} adds the GNOME
-metapackage to the system profile. Likewise, adding the XFCE service
+metapackage to the system profile. Likewise, adding the Xfce service
not only adds the @code{xfce} metapackage to the system profile, but it
also gives the Thunar file manager the ability to open a ``root-mode''
file management window, if the user authenticates using the
@@ -14470,12 +14470,25 @@ The GNOME package to use.
@end table
@end deftp
-@deffn {Scheme Procedure} xfce-desktop-service
-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 with the administrator's password.
-@end deffn
+@defvr {Scheme Variable} xfce-desktop-service-type
+This is the type of a service to run the @uref{Xfce, https://xfce.org/}
+desktop environment. Its value is an @code{xfce-desktop-configuration} object
+(see below.)
+
+This 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
+with the administrator's password.
+@end defvr
+
+@deftp {Data Type} xfce-desktop-configuration
+Configuration record for the Xfce desktop environment.
+
+@table @asis
+@item @code{xfce} (default @code{xfce})
+The Xfce package to use.
+@end table
+@end deftp
@deffn {Scheme Variable} mate-desktop-service-type
This is the type of the service that runs the @uref{https://mate-desktop.org/,
@@ -14508,9 +14521,9 @@ The enlightenment package to use.
@end table
@end deftp
-Because the GNOME, XFCE and MATE desktop services pull in so many packages,
+Because the GNOME, Xfce and MATE desktop services pull in so many packages,
the default @code{%desktop-services} variable doesn't include any of
-them by default. To add GNOME, XFCE or MATE, just @code{cons} them onto
+them by default. To add GNOME, Xfce or MATE, just @code{cons} them onto
@code{%desktop-services} in the @code{services} field of your
@code{operating-system}:
@@ -14521,7 +14534,7 @@ them by default. To add GNOME, XFCE or MATE, just @code{cons} them onto
...
;; cons* adds items to the list given as its last argument.
(services (cons* (service gnome-desktop-service-type)
- (xfce-desktop-service)
+ (service xfce-desktop-service)
%desktop-services))
...)
@end example
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.