[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: services: Deprecate 'gnome-desktop-service'.
From: |
guix-commits |
Subject: |
05/08: services: Deprecate 'gnome-desktop-service'. |
Date: |
Wed, 27 Mar 2019 06:54:18 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit ee05cc7fe353c1c9b45062343746ac215a29fed5
Author: Ludovic Courtès <address@hidden>
Date: Wed Mar 27 10:14:11 2019 +0100
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.
---
doc/guix.texi | 28 ++++++++++++++++++++--------
gnu/installer/services.scm | 2 +-
gnu/services/desktop.scm | 5 ++++-
gnu/system/examples/desktop.tmpl | 2 +-
4 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7d80c00..d99b7fd 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14420,7 +14420,7 @@ The @var{%desktop-services} variable can be used as the
@code{services}
field of an @code{operating-system} declaration (@pxref{operating-system
Reference, @code{services}}).
-Additionally, the @code{gnome-desktop-service},
+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
and/or Enlightenment to a system. To ``add GNOME'' means that system-level
@@ -14428,7 +14428,7 @@ 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} adds the GNOME
+adding a service made by @code{gnome-desktop-service-type} adds the GNOME
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''
@@ -14452,11 +14452,23 @@ also try starting GNOME on Wayland manually from a
TTY with the
command ``XDG_SESSION_TYPE=wayland exec dbus-run-session
gnome-session``. Currently only GNOME has support for Wayland.
address@hidden {Scheme Procedure} gnome-desktop-service
-Return a service that adds the @code{gnome} package to the system
-profile, and extends polkit with the actions from
address@hidden
address@hidden deffn
address@hidden {Scheme Variable} gnome-desktop-service-type
+This is the type of the service that adds the @uref{https://www.gnome.org,
+GNOME} desktop environment. Its value is a @code{gnome-desktop-configuration}
+object (see below.)
+
+This service adds the @code{gnome} package to the system profile, and extends
+polkit with the actions from @code{gnome-settings-daemon}.
address@hidden defvr
+
address@hidden {Data Type} gnome-desktop-configuration
+Configuration record for the GNOME desktop environment.
+
address@hidden @asis
address@hidden @code{gnome} (default @code{gnome})
+The GNOME package to use.
address@hidden table
address@hidden deftp
@deffn {Scheme Procedure} xfce-desktop-service
Return a service that adds the @code{xfce} package to the system profile,
@@ -14508,7 +14520,7 @@ them by default. To add GNOME, XFCE or MATE, just
@code{cons} them onto
(operating-system
...
;; cons* adds items to the list given as its last argument.
- (services (cons* (gnome-desktop-service)
+ (services (cons* (service gnome-desktop-service-type)
(xfce-desktop-service)
%desktop-services))
...)
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index f263ecc..e719da0 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 b912c20..9c9472e 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 bc5cbd6..fe32bc5 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))
- branch master updated (37099f5 -> 9e5f206), guix-commits, 2019/03/27
- 01/08: installer: Emit 'bootloader' field before 'swap-devices'., guix-commits, 2019/03/27
- 04/08: installer: Use the (service …) form for MATE., guix-commits, 2019/03/27
- 08/08: scripts: Skip 'guix pull' suggestion when running code from a checkout., guix-commits, 2019/03/27
- 02/08: installer: Produce an 'initrd-modules' field if needed., guix-commits, 2019/03/27
- 03/08: installer: Ask for confirmation before formatting partitions., guix-commits, 2019/03/27
- 07/08: vm: Ask QEMU for more RAM in the VM that makes ISO9660 images., guix-commits, 2019/03/27
- 05/08: services: Deprecate 'gnome-desktop-service'.,
guix-commits <=
- 06/08: services: Deprecate 'xfce-desktop-service'., guix-commits, 2019/03/27