From 934569bc7725609e13fe437e7a9ad441bafc1ade Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Feb 2025 21:02:21 -0500 Subject: [PATCH] gnu: Remove extraneous reference to defunct xfce-desktop-service. This is a followup to commit a1fa23014718a63dca400f5db7800b72024cee28. Perhaps it was caused by a conflict resolution error during a rebase or merge? * gnu/services/desktop.scm: Stop exporting the non-existent variable xfce-desktop-service. * doc/guix.texi (Desktop Services): Adjust accordingly. Change-Id: I7ca24331365fa395fcee47de7ad0239e08aafbe3 --- doc/guix.texi | 4 ++-- gnu/services/desktop.scm | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index bb5f29277fb697499de763983d8f23442abb3632..4fcddb98cb5a8acea03ba3d56239c3edd2e3916c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25100,7 +25100,7 @@ environments to a system. @item @code{enlightenment-desktop-service-type} adds Enlightenment, @item @code{lxqt-desktop-service-type} adds LXQt, @item @code{mate-desktop-service-type} adds MATE, and -@item @code{xfce-desktop-service} adds Xfce. +@item @code{xfce-desktop-service-type} adds Xfce. @end itemize These service types add ``metapackages'' such as @code{gnome} or @@ -25320,7 +25320,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) - (service xfce-desktop-service) + (service xfce-desktop-service-type) %desktop-services)) ...) @end lisp diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index e54465618220005f04e1d0236f080413a8ba9239..0c8e2cbd508fbff9b41a52543beb2485dd88ae8e 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -176,7 +176,6 @@ xfce-desktop-configuration xfce-desktop-configuration? - xfce-desktop-service xfce-desktop-service-type x11-socket-directory-service ;deprecated