From cf28f46930f1ea4087d84c162cfacfcdff842b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 21 Aug 2023 22:34:00 +0200 Subject: [PATCH] examples: Avoid 'modify-services' to remove GDM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This led to a 'tests/guix-system.sh' failure on aarch64-linux: …/plasma.tmpl:60:13: error: modify-services: service 'gdm' not found in service list This is because 'gdm-service-type' is not among %DESKTOP-SERVICES on that architecture. * gnu/system/examples/plasma.tmpl (services): Use 'remove' rather 'modify-services' + 'delete'. --- gnu/system/examples/plasma.tmpl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/system/examples/plasma.tmpl b/gnu/system/examples/plasma.tmpl index 3df819a54f..b29b6a0535 100644 --- a/gnu/system/examples/plasma.tmpl +++ b/gnu/system/examples/plasma.tmpl @@ -1,7 +1,7 @@ ;; This is an operating system configuration template ;; for a "desktop" setup with Plasma. -(use-modules (gnu) (gnu system nss)) +(use-modules (gnu) (gnu system nss) (srfi srfi-1)) (use-service-modules desktop sddm xorg ssh) (use-package-modules certs gnome ssh admin fonts) (use-package-modules qt xorg tmux linux) @@ -57,8 +57,12 @@ (service sddm-service-type (sddm-configuration (theme "breeze"))) - (modify-services %desktop-services - (delete gdm-service-type)))) + + ;; Remove GDM if it's among %DESKTOP-SERVICES (on some + ;; architectures it's not there). + (remove (lambda (service) + (eq? (service-kind service) gdm-service-type)) + %desktop-services))) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss))