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.
This commit is contained in:
parent
1c155ec76b
commit
ee05cc7fe3
|
@ -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
|
field of an @code{operating-system} declaration (@pxref{operating-system
|
||||||
Reference, @code{services}}).
|
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{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
|
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}
|
utilities are added to the system, extending @code{polkit} and @code{dbus}
|
||||||
appropriately, allowing GNOME to operate with elevated privileges on a
|
appropriately, allowing GNOME to operate with elevated privileges on a
|
||||||
limited number of special-purpose system interfaces. Additionally,
|
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
|
metapackage to the system profile. Likewise, adding the XFCE service
|
||||||
not only adds the @code{xfce} metapackage to the system profile, but it
|
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''
|
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
|
command ``XDG_SESSION_TYPE=wayland exec dbus-run-session
|
||||||
gnome-session``. Currently only GNOME has support for Wayland.
|
gnome-session``. Currently only GNOME has support for Wayland.
|
||||||
|
|
||||||
@deffn {Scheme Procedure} gnome-desktop-service
|
@defvr {Scheme Variable} gnome-desktop-service-type
|
||||||
Return a service that adds the @code{gnome} package to the system
|
This is the type of the service that adds the @uref{https://www.gnome.org,
|
||||||
profile, and extends polkit with the actions from
|
GNOME} desktop environment. Its value is a @code{gnome-desktop-configuration}
|
||||||
@code{gnome-settings-daemon}.
|
object (see below.)
|
||||||
@end deffn
|
|
||||||
|
This service adds the @code{gnome} package to the system profile, and extends
|
||||||
|
polkit with the actions from @code{gnome-settings-daemon}.
|
||||||
|
@end defvr
|
||||||
|
|
||||||
|
@deftp {Data Type} gnome-desktop-configuration
|
||||||
|
Configuration record for the GNOME desktop environment.
|
||||||
|
|
||||||
|
@table @asis
|
||||||
|
@item @code{gnome} (default @code{gnome})
|
||||||
|
The GNOME package to use.
|
||||||
|
@end table
|
||||||
|
@end deftp
|
||||||
|
|
||||||
@deffn {Scheme Procedure} xfce-desktop-service
|
@deffn {Scheme Procedure} xfce-desktop-service
|
||||||
Return a service that adds the @code{xfce} package to the system profile,
|
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
|
(operating-system
|
||||||
...
|
...
|
||||||
;; cons* adds items to the list given as its last argument.
|
;; 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)
|
(xfce-desktop-service)
|
||||||
%desktop-services))
|
%desktop-services))
|
||||||
...)
|
...)
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
(list
|
(list
|
||||||
(desktop-environment
|
(desktop-environment
|
||||||
(name "GNOME")
|
(name "GNOME")
|
||||||
(snippet '(gnome-desktop-service)))
|
(snippet '(service gnome-desktop-service-type)))
|
||||||
(desktop-environment
|
(desktop-environment
|
||||||
(name "Xfce")
|
(name "Xfce")
|
||||||
(snippet '(xfce-desktop-service)))
|
(snippet '(xfce-desktop-service)))
|
||||||
|
|
|
@ -884,9 +884,12 @@ rules."
|
||||||
(service-extension profile-service-type
|
(service-extension profile-service-type
|
||||||
(compose list
|
(compose list
|
||||||
gnome-package))))
|
gnome-package))))
|
||||||
|
(default-value (gnome-desktop-configuration))
|
||||||
(description "Run the GNOME desktop environment.")))
|
(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,
|
"Return a service that adds the @code{gnome} package to the system profile,
|
||||||
and extends polkit with the actions from @code{gnome-settings-daemon}."
|
and extends polkit with the actions from @code{gnome-settings-daemon}."
|
||||||
(service gnome-desktop-service-type config))
|
(service gnome-desktop-service-type config))
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
;; screen with F1. Use the "desktop" services, which
|
;; screen with F1. Use the "desktop" services, which
|
||||||
;; include the X11 log-in service, networking with
|
;; include the X11 log-in service, networking with
|
||||||
;; NetworkManager, and more.
|
;; NetworkManager, and more.
|
||||||
(services (append (list (gnome-desktop-service)
|
(services (append (list (service gnome-desktop-service-type)
|
||||||
(xfce-desktop-service))
|
(xfce-desktop-service))
|
||||||
%desktop-services))
|
%desktop-services))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue