From patchwork Thu Jan 25 15:35:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59808 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D4A327BBEB; Mon, 5 Feb 2024 20:03:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66ECD27BBEA for ; Mon, 5 Feb 2024 20:03:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rX5B4-0006gP-UW; Mon, 05 Feb 2024 15:02:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rX5B3-0006fo-M5 for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rX5B3-0001bc-Cb for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rX5BG-0004H6-2D for guix-patches@gnu.org; Mon, 05 Feb 2024 15:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v2 1/5] services: Modularise gnome-desktop-configuration. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Feb 2024 20:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68716 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68716@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170716334816351 (code B ref 68716); Mon, 05 Feb 2024 20:03:02 +0000 Received: (at 68716) by debbugs.gnu.org; 5 Feb 2024 20:02:28 +0000 Received: from localhost ([127.0.0.1]:52354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Ah-0004Fd-Eg for submit@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:28 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Ad-0004Eo-8q for 68716@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:24 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5bce9231; Mon, 5 Feb 2024 20:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:mime-version :content-type:content-transfer-encoding:to:cc; s=albinoniB; bh=U x2jSJNdiZX67B9KVp1sI3aPBm8=; b=luQCnr1q11jGnze+s00v+1ZFPH9uo9+DT /k2Lo+cpMJ3v1Bo+d9xtEckfeq0bRQLZ4XLLE7F2FD1ck1/hksPaPGNPR96wm3vX nRPioo+pLytZQE0V2IMmpiaawW4KY1sTvsVbnmV9Z0G/9Tm6d8tIjuaWNqw99bBO hR6e81GwUDwpcdVfDxGoJcxdNkssvX/9f/Cy+2FYsWJQ/rtlML/4274y9P9B/26P jL2QVcgLVN8Pg5GUJJACJPwwAmn4pULnx10WUqHLSf19CmEKfNAKg6aT63mF/Rnk G42L8cl7aHh3VdacNz9+q8pAbcMcsuNgY5EIopUABrRm0KG1Jzw5A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 05cddff9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 5 Feb 2024 20:02:03 +0000 (UTC) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 16:35:17 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/gnome.scm (%gnome-core-services, %gnome-core-shell) (%gnome-core-utilities, %gnome-essential-extras): New variables. (gnome-desktop-configuration): Add ‘core-services’, ‘shell’, ‘utilities’, and ‘extra-packages’. Deprecate ‘gnome’. (gnome-desktop-configuration-core-services, gnome-desktop-configuration-shell) (gnome-desktop-configuration-utilities) (gnome-desktop-configuration-extra-packages): Export publicly. (gnome-udev-rules, gnome-polkit-settings): Adjust accordingly. (gnome-profile): New variable. (gnome-desktop-service-type): Adjust accordingly. --- gnu/services/desktop.scm | 172 +++++++++++++++++++++++++++++++++++---- 1 file changed, 158 insertions(+), 14 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 5b79fbcda1..86be99252d 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -37,6 +37,7 @@ (define-module (gnu services desktop) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu services base) + #:use-module (gnu services configuration) #:use-module (gnu services dbus) #:use-module (gnu services avahi) #:use-module (gnu services xorg) @@ -56,10 +57,16 @@ (define-module (gnu services desktop) #:use-module (gnu packages admin) #:use-module (gnu packages cups) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fonts) + #:use-module (gnu packages geo) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages xfce) #:use-module (gnu packages avahi) #:use-module (gnu packages xdisorg) @@ -73,6 +80,7 @@ (define-module (gnu services desktop) #:use-module (gnu packages nfs) #:use-module (gnu packages enlightenment) #:use-module (guix deprecation) + #:use-module (guix diagnostics) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix store) @@ -81,6 +89,7 @@ (define-module (gnu services desktop) #:use-module (guix gexp) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-35) #:use-module (ice-9 format) #:use-module (ice-9 match) #:export ( @@ -137,8 +146,16 @@ (define-module (gnu services desktop) cups-pk-helper-service-type sane-service-type + %gnome-core-services + %gnome-core-shell + %gnome-core-utilities + %gnome-essential-extras gnome-desktop-configuration gnome-desktop-configuration? + gnome-desktop-configuration-core-services + gnome-desktop-configuration-shell + gnome-desktop-configuration-utilities + gnome-desktop-configuration-extra-packages gnome-desktop-service gnome-desktop-service-type @@ -1382,11 +1399,100 @@ (define sane-service-type ;;; GNOME desktop service. ;;; -(define-record-type* gnome-desktop-configuration - make-gnome-desktop-configuration - gnome-desktop-configuration? - (gnome gnome-desktop-configuration-gnome - (default gnome))) +(define %gnome-core-services + (list accountsservice network-manager packagekit upower)) + +(define %gnome-core-shell + (list gdm + gnome-backgrounds + gnome-bluetooth + gnome-color-manager + gnome-desktop + gnome-initial-setup + gnome-keyring + gnome-menus + gnome-session + gnome-settings-daemon + gnome-shell-extensions + gnome-shell + gnome-user-docs + gnome-user-share + gvfs + mutter + orca + rygel + sushi + adwaita-icon-theme + glib-networking + gsettings-desktop-schemas)) + +(define %gnome-core-utilities + (list baobab + cheese + eog + epiphany + evince + file-roller + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-console + gnome-contacts + gnome-disk-utility + gnome-font-viewer + gnome-maps + gnome-music + gnome-photos + gnome-screenshot + gnome-system-monitor + gnome-text-editor + gnome-weather + nautilus + simple-scan + totem + tracker-miners + xdg-desktop-portal-gnome + yelp)) + +(define %gnome-essential-extras + (list at-spi2-core + dbus + dconf + desktop-file-utils + font-abattis-cantarell + font-dejavu + gnome-default-applications ; XXX: Allow customization by records + gst-plugins-base + gst-plugins-good + gucharmap + pinentry-gnome3 + pulseaudio ; XXX: Replace with pipewire + shared-mime-info + system-config-printer + xdg-user-dirs + zenity)) + +(define-maybe/no-serialization package) + +(define-configuration/no-serialization gnome-desktop-configuration + (core-services + (list-of-packages %gnome-core-services) + "A list of packages that the GNOME Shell and applications may rely on.") + (shell + (list-of-packages %gnome-core-shell) + "A list of packages that constitute the GNOME Shell, without applications.") + (utilities + (list-of-packages %gnome-core-utilities) + "A list of packages that serve as applications to use on top of the \ +GNOME Shell.") + (gnome (maybe-package) "Deprecated. Do not use.") + (extra-packages + (list-of-packages %gnome-essential-extras) + "A list of GNOME-adjacent packages to also include. This field is intended +for users to add their own packages to their GNOME experience. Note, that it +already includes some packages that are considered essential by some (most?) +GNOME users.")) (define (gnome-package gnome name) "Return the package NAME among the GNOME package inputs. NAME can be a @@ -1400,18 +1506,56 @@ (define (gnome-packages gnome names) (define (gnome-udev-rules config) "Return the list of GNOME dependencies that provide udev rules." - (let ((gnome (gnome-desktop-configuration-gnome config))) - (gnome-packages gnome '("gnome-settings-daemon")))) + (let* ((gnome (gnome-desktop-configuration-gnome config)) + (shell (gnome-desktop-configuration-shell config))) + (or (any (match-lambda + ((and pkg (= package-name "gnome-settings-daemon")) + (list pkg)) + (_ #f)) + shell) + (and (maybe-value-set? gnome) + (gnome-packages gnome '("gnome-settings-daemon"))) + (raise + (condition + (&error-location + (location (gnome-desktop-configuration-source-location config))) + (&message (message (G_ "Missing gnome-settings-daemon")))))))) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and rules." - (let ((gnome (gnome-desktop-configuration-gnome config))) - (gnome-packages gnome - '("gnome-settings-daemon" - "gnome-control-center" - "gnome-system-monitor" - "gvfs")))) + (let ((gnome (gnome-desktop-configuration-gnome config)) + (shell (gnome-desktop-configuration-shell config))) + (or (any (match-lambda ((and pkg (= package-name "gvfs")) (list pkg)) + (_ #f)) + shell) + (and (maybe-value-set? gnome) + (gnome-packages gnome + '("gnome-settings-daemon" + "gnome-control-center" + "gnome-system-monitor" + "gvfs"))) + (raise + (condition + (&error-location + (location (gnome-desktop-configuration-source-location config))) + (&message (message (G_ "Missing gvfs")))))))) + +(define (gnome-profile config) + "Return a list of packages propagated through CONFIG." + (append + (gnome-desktop-configuration-core-services config) + (gnome-desktop-configuration-shell config) + (gnome-desktop-configuration-utilities config) + (let ((gnome-meta (gnome-desktop-configuration-gnome config))) + (if (maybe-value-set? gnome-meta) + (begin + (warning + (gnome-desktop-configuration-source-location config) + (G_ "Using a meta-package for gnome-desktop is discouraged.~%")) + (list gnome-meta)) + (list))) + (gnome-desktop-configuration-extra-packages config))) (define gnome-desktop-service-type (service-type @@ -1422,7 +1566,7 @@ (define gnome-desktop-service-type (service-extension polkit-service-type gnome-polkit-settings) (service-extension profile-service-type - (compose list gnome-desktop-configuration-gnome)))) + gnome-profile))) (default-value (gnome-desktop-configuration)) (description "Run the GNOME desktop environment."))) From patchwork Thu Jan 25 16:06:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59806 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 366DA27BBEC; Mon, 5 Feb 2024 20:03:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A756527BBEA for ; Mon, 5 Feb 2024 20:02:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rX5B7-0006hl-3z; Mon, 05 Feb 2024 15:02:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rX5B4-0006g2-4r for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rX5B3-0001cA-RF for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rX5BG-0004HE-HC for guix-patches@gnu.org; Mon, 05 Feb 2024 15:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v2 2/5] services: gnome-desktop: Add core packages for GNOME 44. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Feb 2024 20:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68716 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68716@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170716334816358 (code B ref 68716); Mon, 05 Feb 2024 20:03:02 +0000 Received: (at 68716) by debbugs.gnu.org; 5 Feb 2024 20:02:28 +0000 Received: from localhost ([127.0.0.1]:52356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Ai-0004Fg-3z for submit@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:28 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Ae-0004Eo-HK for 68716@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:25 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e251ea62; Mon, 5 Feb 2024 20:02:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=baijmumi2VMGM5BicG73Ls5w+vQ=; b=A jr2iF9HywkE+PWSTQwvPj3Ts6w4KUnaQar3dJkgtcQd4Ne840E/oGidJotOlAtfr 7xZX5e/PyPp/qaqAL/fjX+HF04bIP2rsd7lMVmbz5dmXrWAJKF9IUi3ag5ujQigq NJwOvmn2HtKDO1hiXVT6S478RB60kJs9DxzFwtTDXjIGtOej8rHIFi4MNuyD2niC xJ73DrmzykoxIMyt86zZPapTdmps0QzKW5MroD1Q2Dti+kWEbG18aP4Q1+7OwCSE nP5ZSPm5MxQyZT2bwQbP6Jr7Pm/Lu0U5K5fbpo3wgjwBacLzD2Os6uM21up2jpKa MGXk1E7WMrWm9ecd5Ypow== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e2a4998a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 5 Feb 2024 20:02:06 +0000 (UTC) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 17:06:34 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/desktop.scm (%gnome-core-shell): Add gnome-remote-desktop. (%gnome-core-utilities): Add gnome-connections. --- gnu/services/desktop.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 86be99252d..f929a6cf31 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1411,6 +1411,7 @@ (define %gnome-core-shell gnome-initial-setup gnome-keyring gnome-menus + gnome-remote-desktop gnome-session gnome-settings-daemon gnome-shell-extensions @@ -1437,6 +1438,7 @@ (define %gnome-core-utilities gnome-calendar gnome-characters gnome-clocks + gnome-connections gnome-console gnome-contacts gnome-disk-utility From patchwork Thu Jan 25 15:55:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59810 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8704927BBEC; Mon, 5 Feb 2024 20:03:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE8C527BBEA for ; Mon, 5 Feb 2024 20:03:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rX5B7-0006iF-Tb; Mon, 05 Feb 2024 15:02:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rX5B4-0006gD-HJ for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rX5B4-0001ck-7W for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rX5BG-0004HL-TP for guix-patches@gnu.org; Mon, 05 Feb 2024 15:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v2 3/5] gnu: Deprecate gnome meta-package. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Feb 2024 20:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68716 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68716@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170716334816365 (code B ref 68716); Mon, 05 Feb 2024 20:03:02 +0000 Received: (at 68716) by debbugs.gnu.org; 5 Feb 2024 20:02:28 +0000 Received: from localhost ([127.0.0.1]:52358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Ai-0004Fn-Dx for submit@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:28 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]:52512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Ae-0004Et-HL for 68716@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:25 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d1f8cf2c; Mon, 5 Feb 2024 20:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=NIns70qKa3VVUqG22gLtsEhauP0=; b=2 ZaVrlpgcAmzhWW5crAUsOEt2ht06W9kPiD3HpQ/AVFlgjvwTHbOC/cCgv8xmGN1K dOqd4V+tzOIg79VKFbKIJxunS0oFObaqRnamAM2lZ1RPSbDXZLcm7FFeZqOAaqNp 7xY/DzIb2Anzs4xxoqFPSJK7QGjKN9/H7oLGpRi7xwgt+wPP+8eThm4+W9UY6oU2 sd+wyQXjDmbH7PAYa30eAKLbYnJNvcED/MEKT4uFjrrWolf5ZhuB8by2+NkPOgqm MkTjF9gyb2Jf8EvtGyj7uIdcEcZ3JOnDkQXK50b/IKjYIhYh+BM/O+xPq7wejBD6 UAAwVUPhxTuQI/AUvU/qQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id bb17ad2e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 5 Feb 2024 20:02:09 +0000 (UTC) Message-ID: <04093d75b073b6d6fad760ea521d0512b9b66d00.1707163201.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 16:55:44 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches GNOME is not a "one size fits all" environment, but with the introduction of World, Circle, and to some extent Developer Extras and recent explorations of mobile form factors much more customizable towards the needs of users. As such, it is silly to insist on a single meta-package to make everyone happy. * gnu/packages/gnome.scm (gnome): Deprecate. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e98f4ac15f..e066da4d77 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -236,6 +236,7 @@ (define-module (gnu packages gnome) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -10143,7 +10144,7 @@ (define-public gnome-weather (home-page "https://wiki.gnome.org/Apps/Weather") (license license:gpl2+))) -(define-public gnome +(define-deprecated/public gnome #f (package (name "gnome") (version (package-version gnome-shell)) From patchwork Mon Feb 5 17:05:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59807 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DF83F27BBEB; Mon, 5 Feb 2024 20:03:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DE1CF27BBEA for ; Mon, 5 Feb 2024 20:03:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rX5B6-0006he-Ef; Mon, 05 Feb 2024 15:02:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rX5B4-0006gS-UN for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rX5B4-0001dC-KG for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rX5BH-0004HS-AR for guix-patches@gnu.org; Mon, 05 Feb 2024 15:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v2 4/5] services: Rename gnome-udev-rules. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Feb 2024 20:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68716 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68716@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170716334916372 (code B ref 68716); Mon, 05 Feb 2024 20:03:03 +0000 Received: (at 68716) by debbugs.gnu.org; 5 Feb 2024 20:02:29 +0000 Received: from localhost ([127.0.0.1]:52360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Ai-0004Fu-Qx for submit@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:29 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Af-0004Eo-Et for 68716@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:25 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id cc74fb30; Mon, 5 Feb 2024 20:02:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=S7Nl2Z5I86Y6gPjIIqjUxuvzN18=; b=R +8qrj3lh8hsMFA/8jUlJOvH7leeeBeQhBn3ex1ThODnsbB3NKgUb+WTIxxw5YsSO Ujta1qu3xXmE+mrgZQQJ+TjJODaStgJ7mzKQdddLPcwMtB7eQWGciwxUj9ejtdHp vWalCqsWEZysgk1LZ3jCX2mghFmbF0tgaDrAeMqE4r4Y3dLapnV/FOJcVDt6yp3/ 4XLc/oXzkTz5vLLhqm7Zk4uPVrj95YEF9iKR82QmdVyY/aip8zvEo33q7j6A7bRR BQRqSEUI5aroCjcm2BZp5UpuGInncRBRVXWDc+12JMlYaCuG5lLBMreW13+/2hyD GMmPgLjEs2oyfPO+JrQ+A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 9c4881f7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 5 Feb 2024 20:02:11 +0000 (UTC) Message-ID: <7d56e8c01341114bf15d347dd59f30278ac2130b.1707163201.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Mon, 5 Feb 2024 18:05:41 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This function manages both rules and hardware files. * gnu/services/desktop.scm (gnome-udev-resources): Rename to gnome-udev-configuration-files. (gnome-desktop-service-type): Use the new function name gnome-udev-configuration-files. Change-Id: I195ea6ba032e1e9b5ee45519de109bbd969b6503 --- gnu/services/desktop.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index f929a6cf31..263ae61698 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1506,8 +1506,9 @@ (define (gnome-packages gnome names) "Return the package NAMES among the GNOME package inputs." (map (cut gnome-package gnome <>) names)) -(define (gnome-udev-rules config) - "Return the list of GNOME dependencies that provide udev rules." +(define (gnome-udev-configuration-files config) + "Return the list of GNOME dependencies that provide udev rules and hardware +files." (let* ((gnome (gnome-desktop-configuration-gnome config)) (shell (gnome-desktop-configuration-shell config))) (or (any (match-lambda @@ -1564,7 +1565,7 @@ (define gnome-desktop-service-type (name 'gnome-desktop) (extensions (list (service-extension udev-service-type - gnome-udev-rules) + gnome-udev-configuration-files) (service-extension polkit-service-type gnome-polkit-settings) (service-extension profile-service-type From patchwork Mon Feb 5 18:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59809 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5C57D27BBEB; Mon, 5 Feb 2024 20:03:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4D6F927BBEA for ; Mon, 5 Feb 2024 20:03:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rX5B6-0006hi-NJ; Mon, 05 Feb 2024 15:02:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rX5B5-0006h0-9f for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:51 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rX5B5-0001dl-0z for guix-patches@gnu.org; Mon, 05 Feb 2024 15:02:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rX5BH-0004Hb-MU for guix-patches@gnu.org; Mon, 05 Feb 2024 15:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v2 5/5] services: gnome: Use a blocklist for udev configurations. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Feb 2024 20:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68716 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68716@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170716336516404 (code B ref 68716); Mon, 05 Feb 2024 20:03:03 +0000 Received: (at 68716) by debbugs.gnu.org; 5 Feb 2024 20:02:45 +0000 Received: from localhost ([127.0.0.1]:52364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Az-0004GV-8F for submit@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:45 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX5Aj-0004Eo-9b for 68716@debbugs.gnu.org; Mon, 05 Feb 2024 15:02:29 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5e4f27b1; Mon, 5 Feb 2024 20:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=iFmy3EYCOqyEiskktEKwe8ue73s=; b=d 2zS4HFG75iq593//jIO4xwAy+nN5ZmKVWXNZxHhcB8Y1tlghS2xdtp4RMkD8QMK1 EVRG5Dp6BPt5SN44Fnq//GQnQ/4EYLUCJ1j1juUarU3dg0jwTydrgovndlvaAPAs UhAcXrlZ+GNRRUiNUu1DCdZEwqFUlIOpX24SBAdsFYihBBUyl7k4JR3ILxrzK5yN rPIaBzfcdhwEy32fCQrFOZWTeBmLXPZW6YnyksFkkVi14PcWx5LVduFWKeOLwUvv tMGlOPDL4QcY5bW0s5YGPMT6uKFC0eYHKmVSvuD9MIQKdgLV3XK6449drMMX+g4a iASvFnXmT372WCtRBf8Kw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 4ca062d0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 5 Feb 2024 20:02:14 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Mon, 5 Feb 2024 19:30:25 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The gnome-udev-configuration-files now lists every udev rule and hardware file, and remove files based on a user-supplied list of regular expressions. * gnu/services/desktop.scm (gnome-desktop-configuration): Add the udev-blocklist field. (gnome-udev-configuration-files): Change behavior. Change-Id: I6df4b896652581c42a35ea3ba1e4849ad72d12ef --- gnu/services/desktop.scm | 63 ++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 263ae61698..8045406c10 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -87,6 +87,7 @@ (define-module (gnu services desktop) #:use-module (guix ui) #:use-module (guix utils) #:use-module (guix gexp) + #:use-module (guix modules) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-35) @@ -156,6 +157,7 @@ (define-module (gnu services desktop) gnome-desktop-configuration-shell gnome-desktop-configuration-utilities gnome-desktop-configuration-extra-packages + gnome-desktop-configuration-udev-blocklist gnome-desktop-service gnome-desktop-service-type @@ -1494,7 +1496,12 @@ (define-configuration/no-serialization gnome-desktop-configuration "A list of GNOME-adjacent packages to also include. This field is intended for users to add their own packages to their GNOME experience. Note, that it already includes some packages that are considered essential by some (most?) -GNOME users.")) +GNOME users.") + (udev-blocklist + (list-of-strings '()) + "A list of regular expressions denoting udev rules or hardware file names +provided by any package, that should not be installed. By default, every udev +rule and hardware file specified by all packages are installed.")) (define (gnome-package gnome name) "Return the package NAME among the GNOME package inputs. NAME can be a @@ -1509,20 +1516,46 @@ (define (gnome-packages gnome names) (define (gnome-udev-configuration-files config) "Return the list of GNOME dependencies that provide udev rules and hardware files." - (let* ((gnome (gnome-desktop-configuration-gnome config)) - (shell (gnome-desktop-configuration-shell config))) - (or (any (match-lambda - ((and pkg (= package-name "gnome-settings-daemon")) - (list pkg)) - (_ #f)) - shell) - (and (maybe-value-set? gnome) - (gnome-packages gnome '("gnome-settings-daemon"))) - (raise - (condition - (&error-location - (location (gnome-desktop-configuration-source-location config))) - (&message (message (G_ "Missing gnome-settings-daemon")))))))) + (let* ((all-packages + (append + (gnome-desktop-configuration-core-services config) + (gnome-desktop-configuration-shell config) + (gnome-desktop-configuration-utilities config) + (let ((gnome-meta (gnome-desktop-configuration-gnome config))) + (if (maybe-value-set? gnome-meta) + (begin + (warning + (gnome-desktop-configuration-source-location config) + (G_ "Using a meta-package for gnome-desktop is discouraged.~%")) + (list gnome-meta)) + (list))) + (gnome-desktop-configuration-extra-packages config)))) + (list + (computed-file + "gnome-udev-configurations" + (with-imported-modules + (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils)) + (for-each + (lambda (package) + (with-directory-excursion + package + (for-each + (lambda (filename) + (mkdir-p (dirname (string-append #$output "/" filename))) + (copy-file filename (string-append #$output "/" filename))) + (find-files "." + (lambda (name st) + (or (string-prefix? "./lib/udev/" name) + (string-prefix? "./libexec/udev/" name))))))) + (list #$@all-packages)) + (for-each + (lambda (pattern) + (for-each + delete-file-recursively + (find-files #$output pattern))) + (list #$@(gnome-desktop-configuration-udev-blocklist config))))))))) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and