From patchwork Fri Feb 16 10:53:43 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: 60430 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 A3A3127BBE2; Fri, 16 Feb 2024 12:46:06 +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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,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 5A65027BBE9 for ; Fri, 16 Feb 2024 12:46:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raxaK-00009l-Dc; Fri, 16 Feb 2024 07:44:56 -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 1raxa9-000072-VW for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:46 -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 1raxa9-0004RO-Mz for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raxaR-0008Di-J8; Fri, 16 Feb 2024 07:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 1/7] gnu: Split gnome into more meta-packages. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 12:45: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: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170808747331497 (code B ref 68716); Fri, 16 Feb 2024 12:45:03 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 12:44:33 +0000 Received: from localhost ([127.0.0.1]:57994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZx-0008Br-03 for submit@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:33 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:43232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZo-0008Ae-Mt for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:28 -0500 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a3ddc13bbb3so102903766b.0 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 04:44:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708087379; x=1708692179; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=IqPY4xmBBTUfXOO/T+jLg7ADN2/2PTMOHKZ48Sus8Bg=; b=dC9sgc6Qkjpb/OnDKVgvPJhoF5FUYUskxJJT6CTboGboEGCIf5JpAbEp3zAwTTyULk xEpDyUAqEKz+E9SHzvCuykhRbjCkdLZY6vTyklct/5jM9py/aIqm0PumRJ/lnL9m/mSs aMmlNzzBGiXpLzPy0AypzbJt9i+TtbAmwBm5ZYNfGF98pQ0+cR3clR+RZ07NWC+d724c R4LL7Okw3MjY/Pq9j9yV06Me5lrKwF4gBePATyfdRSbrzia3LbCTO7SLRBbqHXwDWuRv ukJLzh5sdaFEDYsAW4AcqFzje9GQdzhqHCR9TIk54lRmQNjOqvU4rjiRgp+DdWLNt4hS aGQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708087379; x=1708692179; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=IqPY4xmBBTUfXOO/T+jLg7ADN2/2PTMOHKZ48Sus8Bg=; b=lH77vYAl0brxDnR09yNdH+gmhcwmSeQSy7mxVbVPLjHFGEsvgnU78IZqX4M0Are49v /sjR0jtqJ2FpkgTAGR0L6CcYblYEFG36GPflyW/iTxeey9yOSy1WqUD9pN7v3BcaNC6x Yi2rUfBZ7h9j6s3aHGVm+kaWf1gur+s24lo1/VjZST3X79LqrYNgAssjKl4wxw/Dcm9u GuC65ee9UMUjKajfsDg6mI65yuOjh4LWOftGM0iRialhK9dsy25F8FhgviFqy5/DVcc0 KysTHDxBpbi0ZxFoDH+oV/ijoY9FB4Ig0sf99fvRCTJorO61yH7Jwj6sxi505ngBMbEC 6hWA== X-Gm-Message-State: AOJu0YxhWvQ0rnVRy+oSoseu1egt1Sw59bjl4xapPwEFS8NzK4WYNDnq MB2H86Qyqoc3xX10Zj5aXVFmywGbbBvuxCq9PwHrgHfFgr1aXj+kU+Mwjp+9LWM= X-Google-Smtp-Source: AGHT+IHwdx09esnLTY8dByaCCmo0tklwl5HH2c7u4CM2CAV0fiGge9HWtngyaVuRJq0zX1AYnSeu4Q== X-Received: by 2002:a17:906:5614:b0:a3d:75f9:f22c with SMTP id f20-20020a170906561400b00a3d75f9f22cmr4133467ejq.0.1708087379316; Fri, 16 Feb 2024 04:42:59 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hw12-20020a170907a0cc00b00a3d5d8ff745sm1544090ejc.144.2024.02.16.04.42.58 for <68716@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 04:42:58 -0800 (PST) Message-ID: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 11:53:43 +0100 MIME-Version: 1.0 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/packages/gnome.scm (gnome-meta-package): New syntax rule. (gnome-meta-core-services, gnome-meta-core-shell, gnome-meta-core-utilities) (gnome-essential-extras): New variables. (gnome): Implement in terms of the former. Reviewed-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 179 ++++++++++++++++++++++++----------------- 1 file changed, 105 insertions(+), 74 deletions(-) base-commit: 622df12ef389c9e91f68ae10c54c043f34828c83 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7397148c2b..4fde75f612 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10154,52 +10154,76 @@ (define-public gnome-weather (home-page "https://wiki.gnome.org/Apps/Weather") (license license:gpl2+))) -(define-public gnome +(define-syntax-rule (gnome-meta-package %name propagate) (package - (name "gnome") + (name %name) (version (package-version gnome-shell)) (source #f) (build-system trivial-build-system) - (arguments '(#:builder (begin (mkdir %output) #t))) - (propagated-inputs - `(,@(if (string-prefix? "x86_64" (%current-system)) - ;; XXX: EoG requires librsvg-next, which depends on Rust, which currently - ;; only works on x86_64, so exclude it on other architectures. - (list eog) - '()) - ,@(list - ;; GNOME-Core-OS-Services. - accountsservice - network-manager - packagekit - upower - ;; GNOME-Core-Shell. - adwaita-icon-theme - gdm - glib-networking - gnome-backgrounds - gnome-bluetooth - gnome-color-manager - gnome-control-center - gnome-desktop - gnome-initial-setup - gnome-keyring - gnome-menus - gnome-session - gnome-settings-daemon - gnome-shell - gnome-shell-extensions - gnome-themes-extra - gnome-user-docs - gnome-user-share - gsettings-desktop-schemas - gvfs - mutter - orca - rygel - sushi - ;; GNOME-Core-Utilities. - baobab + (arguments + (list #:builder + #~(begin + (format (current-warning-port) + "Building ~a is useless. \ +Refer to its propagated inputs instead.\n" + #$name) + (mkdir #$output)))) + (propagated-inputs propagate) + (home-page "https://www.gnome.org") + (synopsis "The GNU desktop environment") + (description + "GNOME is the graphical desktop for GNU. It includes a wide variety of +applications for browsing the web, editing text and images, creating +documents and diagrams, playing media, scanning, and much more.") + (license license:gpl2+) + (properties `((hidden? . #t))))) + +(define-public gnome-meta-core-services + (gnome-meta-package + "gnome-meta-core-services" + (list accountsservice + network-manager + packagekit + upower))) + +(define-public gnome-meta-core-shell + (gnome-meta-package + "gnome-meta-core-shell" + (list adwaita-icon-theme + gdm + glib-networking + gnome-backgrounds + gnome-bluetooth + gnome-color-manager + gnome-control-center + gnome-desktop + gnome-initial-setup + gnome-keyring + gnome-menus + gnome-session + gnome-settings-daemon + gnome-shell + gnome-shell-extensions + gnome-themes-extra + gnome-user-docs + gnome-user-share + gsettings-desktop-schemas + gvfs + mutter + orca + rygel + sushi))) + +(define-public gnome-meta-core-utilities + (gnome-meta-package + "gnome-meta-core-utilities" + (append + ;; XXX: EoG requires librsvg-next, which depends on Rust, which currently + ;; only works on x86_64, so exclude it on other architectures. + (if (string-prefix? "x86_64" (%current-system)) + (list eog) + '()) + (list baobab cheese epiphany evince @@ -10224,38 +10248,45 @@ (define-public gnome totem tracker-miners xdg-desktop-portal-gnome - yelp - ;; Others. - gnome-online-accounts - hicolor-icon-theme - - ;; Packages not part of GNOME proper but that are needed for a good - ;; experience. See . - ;; XXX: Find out exactly which ones are needed and why. - at-spi2-core - dbus - dconf - desktop-file-utils - font-abattis-cantarell - font-dejavu - gnome-default-applications - gst-plugins-base - gst-plugins-good - gucharmap - pinentry-gnome3 - pulseaudio - shared-mime-info - system-config-printer - xdg-user-dirs - yelp - zenity))) - (synopsis "The GNU desktop environment") - (home-page "https://www.gnome.org/") - (description - "GNOME is the graphical desktop for GNU. It includes a wide variety of -applications for browsing the web, editing text and images, creating -documents and diagrams, playing media, scanning, and much more.") - (license license:gpl2+))) + yelp)))) + +(define-public gnome-essential-extras + (package + (inherit + (gnome-meta-package + "gnome-essential-extras" + (list at-spi2-core + dbus + dconf + desktop-file-utils + font-abattis-cantarell + font-dejavu + gnome-default-applications + gnome-online-accounts + gst-plugins-base + gst-plugins-good + gucharmap + hicolor-icon-theme + pinentry-gnome3 + pulseaudio + shared-mime-info + system-config-printer + xdg-user-dirs + yelp + zenity))) + (description "This package provides a list of packages required for +a good GNOME experience, mixed from core dependencies and other implicitly +relied-on packages."))) + +(define-public gnome + (package + (inherit (gnome-meta-package "gnome" + (append-map package-propagated-inputs + (list gnome-meta-core-services + gnome-meta-core-shell + gnome-meta-core-utilities + gnome-essential-extras)))) + (properties (list)))) (define-public byzanz ;; The last stable release of Byzanz was in 2011, but there have been many From patchwork Fri Feb 16 11:02:42 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: 60426 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 6414827BBEB; Fri, 16 Feb 2024 12:45:15 +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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 2FA2527BBE2 for ; Fri, 16 Feb 2024 12:45:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raxaB-00007i-HP; Fri, 16 Feb 2024 07:44:47 -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 1raxa7-00006I-Os for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:43 -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 1raxa7-0004Qi-GV for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raxaQ-0008DE-AC; Fri, 16 Feb 2024 07:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 2/7] gnu: gnome: Add core packages for GNOME 44. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 12:45: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: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170808746831456 (code B ref 68716); Fri, 16 Feb 2024 12:45:02 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 12:44:28 +0000 Received: from localhost ([127.0.0.1]:57986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZr-0008B1-Tj for submit@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:28 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:47162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZo-0008Ag-Tc for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:27 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a26ed1e05c7so273544466b.2 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 04:44:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708087380; x=1708692180; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=GTmIRHHbFGlON8YxtcEoth3sSl0QoZIEqyq0sSAJjJA=; b=ZQDegBCN27BuDwM6Gf+qXXeglpoVpnwznnlOgF8AsY12ZzakcC+TwSjIKWBzCEXpSX jy3s8T0RdtZs6UscWu3+SGdj3Gw6Z8jWLg6RS5X/MHKn6ZHBNUUtDvd88aR0d5gaA3yZ PWvODPYelahzmYj9IANUqF98M28ej/k+qA+h/RWELHP+z1s5CeJHQFaWOIhIW5qawwnW jtNvGIEoMQ21oaotyu0eKuXmgbeIo6GQthQIThgabH6oWCFSBPAO5Nv6BStJRsEef7WV zblHWO89qpHEImybvWR7K/6y8hfc58yyHhFPnIPLTuZaesFXf38n4d+isuzw7Rmm6wco yjGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708087380; x=1708692180; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GTmIRHHbFGlON8YxtcEoth3sSl0QoZIEqyq0sSAJjJA=; b=fBWZ3O5H7dnnDRa5YPg8KReePl93MaeQrxeruZlI7oP6ifHPW6zoMKrnnpiZCTOlSI 3qUjAYQWaxACpPRbJPxFHF4sM//qJcQUHC+sc1LnU33JHm1QEjZnB0X8tTDPuph1uAUO fQ1LdN/QzGFbeMj/VdgpQa06bEmvQxnM+JOplWrA9QrzW2cKxrXfrJvDljLO8gaved+j dREioWdm4SJRisxZhtY4MXtId1EaL0pbyO1oWJ6DQt+2oh5iNHiAvYt2rrrrpTrEBSDt qoaQeqHR8d4UQQmXJdTFZtJpTiC+p3gvlxymarVEnZ1YmJQ5rBRkaf+EcC6AVGSkMSQ7 n/0Q== X-Gm-Message-State: AOJu0Yz577sKH7hZQSJHxkZEREUFDjwyinynoMWc5r/iVnJrhM9zzBM1 tGprARBBKj7NVe2uxix0iSw4Impy9f4urBpyMGE6bpnQQ1c/o782LxCu7h8SM30= X-Google-Smtp-Source: AGHT+IHI7MR5ADRx82bf1sWEbR4iwhcx3MPcuaCHlmAyAUBKmn+XBJeeXVlHuTPpYSGSQq1LOdt3fA== X-Received: by 2002:a17:906:c417:b0:a3d:e2e9:a7f7 with SMTP id u23-20020a170906c41700b00a3de2e9a7f7mr1105024ejz.27.1708087379957; Fri, 16 Feb 2024 04:42:59 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hw12-20020a170907a0cc00b00a3d5d8ff745sm1544090ejc.144.2024.02.16.04.42.59 for <68716@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 04:42:59 -0800 (PST) Message-ID: In-Reply-To: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> References: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 12:02:42 +0100 MIME-Version: 1.0 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/packages/gnome.scm (gnome-meta-core-shell): Add gnome-remote-desktop. (gnome-meta-core-utilities): Add gnome-connections. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4fde75f612..f3d1548fe9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10200,6 +10200,7 @@ (define-public gnome-meta-core-shell gnome-initial-setup gnome-keyring gnome-menus + gnome-remote-desktop gnome-session gnome-settings-daemon gnome-shell @@ -10232,6 +10233,7 @@ (define-public gnome-meta-core-utilities gnome-calendar gnome-characters gnome-clocks + gnome-connections gnome-console gnome-contacts gnome-disk-utility 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: 60427 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 4916127BBE2; Fri, 16 Feb 2024 12:45:21 +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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 CE2DB27BBE9 for ; Fri, 16 Feb 2024 12:45:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raxaH-00008K-9D; Fri, 16 Feb 2024 07:44: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 1raxa9-00006r-Ny for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:46 -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 1raxa9-0004RJ-Fh for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raxaR-0008Da-75; Fri, 16 Feb 2024 07:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 3/7] services: Modularise gnome-desktop-configuration. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 12:45: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: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170808747331490 (code B ref 68716); Fri, 16 Feb 2024 12:45:03 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 12:44:33 +0000 Received: from localhost ([127.0.0.1]:57992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZw-0008Bj-AZ for submit@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:32 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:56737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZp-0008Ah-Op for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:28 -0500 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a29c4bbb2f4so263689066b.1 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 04:44:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708087381; x=1708692181; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=y5fhioA4z5D+5iKHDnf4iX5nY5uAvB+83CXIUhdsb5o=; b=QwXJ/bIfy8g+GDIYBIztXiR44YuKV13xvushTqgOgB224SS5oKlXTOpIwgGDtEbQ+a yM+w0sJvGmZ4UtMO5R4v7UUIOK+HM58qDHeb7SFrVTqXjdfUX+r6ueS7mIY6BlvT0mUM 4JQh7EgqjVzy8Y9SWC6mmnsWY2PCOD9IUgZUE7n3hRaf+yVYkkTtonveCjmmuUAa+3XL rOLlGKgejDstdx+kTihIASn8Y04saRG1gWSXhOpiDz64MnUJlBP/WiKMdDr3x+B23Oqi r/Qen7iJk8HOh4GYQTHhmDGsmi5nQso07rjsEer2/MoIHf1ySKpANuvh4Rd4227tpKdC UHiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708087381; x=1708692181; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y5fhioA4z5D+5iKHDnf4iX5nY5uAvB+83CXIUhdsb5o=; b=jkGbkhD4JO9VfXBN4SuLU3rU8XmEY+WkWzk1CFHg0+eXt6sZRZa0SSEho5GjlfPeeL uP5oBLbqIgzT26NTcm0rrRGLneLUkhl7VOc286IjzMWqqY6wsOd/+EV8fpRut7lfk+OY Zye0TqMOQn5G1aRYdYLNPyrTW2SexCmOKyVrNtdcRFM5vLPqWQsWf3UzzNDUITZYzzm2 0yHdDxdeUILKtIjjsNN7cA/kNw5PlCm/UsIlpM4TC3AViS/kNUVI9FJOf8fszC5cI0Xt TL5hTuqkAuMK9cU7PG64/2shjwz4pVnvUuECOmI751wg59i4GbxTaT9ikNuQC8hcZwjk L6fQ== X-Gm-Message-State: AOJu0YyJ+HZvmulj30PIzcO+X3MP9gyjL/uSX2Sv8tSjN+TK1iM4G1sC 4Q3yvmp7cP3SGTFOvYynpOBk8J6DL9atYbCt+yGRppM8kxEuncMSvZSYIDU8tCY= X-Google-Smtp-Source: AGHT+IFoPmjNIUYWe0VFQsz6Ywyh2q+et863tnA603ORbapiP+FvZZSMDNq0WgqDbsL+H6h1nMX4lg== X-Received: by 2002:a17:906:7196:b0:a3c:7fcc:3967 with SMTP id h22-20020a170906719600b00a3c7fcc3967mr3678204ejk.40.1708087380632; Fri, 16 Feb 2024 04:43:00 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hw12-20020a170907a0cc00b00a3d5d8ff745sm1544090ejc.144.2024.02.16.04.43.00 for <68716@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 04:43:00 -0800 (PST) Message-ID: <5a3f4ee73a4798d3e5ebc3c5bdc2980cf8fb16c8.1708087345.git.liliana.prikler@gmail.com> In-Reply-To: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> References: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 16:35:17 +0100 MIME-Version: 1.0 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 (extract-propagated-inputs): New variable. (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 | 97 ++++++++++++++++++++++++++++++++++------ 1 file changed, 83 insertions(+), 14 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 5b79fbcda1..0667acfaba 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) @@ -60,6 +61,7 @@ (define-module (gnu services desktop) #: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 +75,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 +84,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 ( @@ -139,6 +143,10 @@ (define-module (gnu services desktop) 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 +1390,34 @@ (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-maybe/no-serialization package) + +(define (extract-propagated-inputs package) + ;; Drop input labels. Attempt to support outputs. + (map + (match-lambda + ((_ (? package? pkg)) pkg) + ((_ (? package? pkg) output) (list pkg output))) + (package-propagated-inputs package))) + +(define-configuration/no-serialization gnome-desktop-configuration + (core-services + (list-of-packages (extract-propagated-inputs gnome-meta-core-services)) + "A list of packages that the GNOME Shell and applications may rely on.") + (shell + (list-of-packages (extract-propagated-inputs gnome-meta-core-shell)) + "A list of packages that constitute the GNOME Shell, without applications.") + (utilities + (list-of-packages (extract-propagated-inputs gnome-meta-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 (extract-propagated-inputs 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 +1431,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 +1491,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 Mon Feb 5 17:05:41 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: 60424 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 0730C27BBE9; Fri, 16 Feb 2024 12:45: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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 72C3527BBE2 for ; Fri, 16 Feb 2024 12:44:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raxaB-00007P-Av; Fri, 16 Feb 2024 07:44:47 -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 1raxa7-00006J-QD for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:44 -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 1raxa7-0004Qj-I0 for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raxaQ-0008DM-MD; Fri, 16 Feb 2024 07:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 4/7] services: Extend udev capabilities of gnome-desktop-service. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 12:45: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: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170808747231482 (code B ref 68716); Fri, 16 Feb 2024 12:45:02 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 12:44:32 +0000 Received: from localhost ([127.0.0.1]:57990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZv-0008Bh-QK for submit@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:32 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:44231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZq-0008Aj-M9 for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:28 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a26fa294e56so301197666b.0 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 04:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708087382; x=1708692182; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:references :in-reply-to:message-id:from:from:to:cc:subject:date:message-id :reply-to; bh=FaNHHr3tQ1pZmSq7BDJeYMJLzSa6LK16q5JFFSL7bVY=; b=XWaIUZ36t973lYYI9WQgKlVMnlkmOwdbg5wqtjeLYSF4xW9YmUepYMG06RYy7kKyPj 3izuPyaq4wIUD4QrgzpC2ene5+PHbEM46tEcUk5YjIjRSI8zMvVrRH//Op+RNync+Cjr fg4K6SPW3fh1YRZSuwo9sl3XY1YWp8XtabZWPetTcJWYtzHDg1ddoq8vDZWS9LTocl8+ 56Yh4Tc3sI34vABU07IBFBWEOs6UHi8YM8HZ1I5OYiMBWNKiBxijlcVin1AryR8w9h53 kaLx7AHHzcuSh+ztmDlQOtGF1swcJ2o8G8MKDn9kGbNq2FnqN5SZpf5hkibRDjTq6ETI OqJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708087382; x=1708692182; h=to:content-transfer-encoding:mime-version:subject:date:references :in-reply-to:message-id:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=FaNHHr3tQ1pZmSq7BDJeYMJLzSa6LK16q5JFFSL7bVY=; b=iLIx2yuj1hDF/lWA3YPhozGvQnwK7OvuKwyH6qnD6DjvTo/HexfjadDZ/WFlgNCywG +oggG6/7Q2VvOFNfdr7MVZuXcm1LXFs1NliKlAy6bK1g7bq42bt7Rfstwy38GD5T3F8R lQL5L6ocET3G3a3dIjt3eOlXokvVsspESLSBPRVF6WwmOHQGrHwaWZAH293mdqOfokuV +K9RRDk76aCmtRXf0064FQbkVCCdKIRExJKCFX960aYoA/dZ00hWgvn0zhRmgH8qYnza Y++MZk714ejxpnEbojza61tLUvgFRIPNLm1aYhyvrcHqKZIqDGJFhbEkHoD46dwddEH1 wSWQ== X-Gm-Message-State: AOJu0YwvHzopr4Grt8llg6TIAPwvSpeo+BzU/UJuPYzZWMg+LHq2mwLD qotR6fzENtnU+apFNdPuLTnG4mpMv9dU5THjaCDXIwRViGBMPO5XnslIyTWaOXs= X-Google-Smtp-Source: AGHT+IEmh/SYqShYuf/CRjmLbsLOjVVEnPN3tuYP6H9q0Y7mz9ReVcnzzSa0E+Mf5CULEF7e7K50zQ== X-Received: by 2002:a17:907:b9c6:b0:a3d:2e34:30a5 with SMTP id xa6-20020a170907b9c600b00a3d2e3430a5mr3238926ejc.29.1708087381722; Fri, 16 Feb 2024 04:43:01 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hw12-20020a170907a0cc00b00a3d5d8ff745sm1544090ejc.144.2024.02.16.04.43.00 for <68716@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 04:43:01 -0800 (PST) From: Vivien Kraus X-Google-Original-From: Vivien Kraus Message-ID: In-Reply-To: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> References: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> Date: Mon, 5 Feb 2024 18:05:41 +0100 MIME-Version: 1.0 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 Our udev service is capable of handling both rules and hardware databases. This patch makes it so that gnome can install any such needed rules or databases, while also allowing users to supply a list of names to ignore (via regular expressions). * gnu/services/desktop.scm (gnome-desktop-configuration): Add udev-ignorelist. (gnome-udev-resources): Rename to… (gnome-udev-configuration-files): … this. Account for udev-ignorelist. (gnome-desktop-service-type): Adjust accordingly. Change-Id: I6df4b896652581c42a35ea3ba1e4849ad72d12ef --- gnu/services/desktop.scm | 54 ++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 0667acfaba..0631571c49 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -82,6 +82,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) @@ -147,6 +148,7 @@ (define-module (gnu services desktop) gnome-desktop-configuration-shell gnome-desktop-configuration-utilities gnome-desktop-configuration-extra-packages + gnome-desktop-configuration-udev-ignorelist gnome-desktop-service gnome-desktop-service-type @@ -1417,7 +1419,13 @@ (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-ignorelist + (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 any package referenced in the other fields +are installed.")) (define (gnome-package gnome name) "Return the package NAME among the GNOME package inputs. NAME can be a @@ -1429,22 +1437,32 @@ (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." - (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-udev-configuration-files config) + "Return the GNOME udev rules and hardware files as computed from its +dependencies by filtering out the ignorelist." + (list + (computed-file + "gnome-udev-configurations" + (with-imported-modules + (source-module-closure '((guix build utils) + (guix build union))) + #~(begin + (use-modules (guix build utils) + (guix build union)) + ;; If rules.d or hwdb.d is not a proper directory but a symlink, + ;; then it will not be possible to delete individual files in this + ;; directory. + (union-build #$output + (search-path-as-list + (list "lib/udev" "libexec/udev") + (list #$@(gnome-profile config))) + #:create-all-directories? #t) + (for-each + (lambda (pattern) + (for-each + delete-file-recursively + (find-files #$output pattern))) + (list #$@(gnome-desktop-configuration-udev-ignorelist config)))))))) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and @@ -1487,7 +1505,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 Fri Feb 16 12:08:11 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: 60428 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 E7D4B27BBE2; Fri, 16 Feb 2024 12:45:35 +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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 7859C27BBE9 for ; Fri, 16 Feb 2024 12:45:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raxaB-00007k-MN; Fri, 16 Feb 2024 07:44:47 -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 1raxa9-00006c-ED for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:45 -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 1raxa9-0004RA-5j for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raxaS-0008E1-CS; Fri, 16 Feb 2024 07:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 5/7] services: Extend polkit capabilities of gnome-desktop-service. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 12:45:04 +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: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170808747431512 (code B ref 68716); Fri, 16 Feb 2024 12:45:04 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 12:44:34 +0000 Received: from localhost ([127.0.0.1]:57998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZx-0008C6-V3 for submit@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:34 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:48192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZr-0008Al-Bq for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:29 -0500 Received: by mail-ej1-f65.google.com with SMTP id a640c23a62f3a-a3d82926ed2so89414166b.0 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 04:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708087382; x=1708692182; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=77MF/Wc5xfDslCA8yVnEhnhiPyC9kkF8FZAf9ZvIMEQ=; b=fGPihckD28EED6hmzNM1UGJySU72SznA42B2CCrgGAt5PIct68140DCknFzInxgfW3 0QhikoCoEey6p037co2ffPWb/TeXY6D0RW6vPwT2nr3iH6xUh58EipQ2dl0W/fzS6Nyl Gv4qb+9aaxA8tR47Ns2+xLPMpac7utGki8cMfT5+qiO68n4mtttDlmIVEQPnb+6rYloP ooBhRw0Ezw0w5PQ3GjAg4Jnl6YQpGIYN4QRLV8lTZi5FMnSH6rmWSUrP8Z22JG4u/ll9 ydjtiQ7slgCHGLwP5cRYTQSsl4AMs6X4sPdLksnETXx2B1yOdnoXZBEKmcTvLCqGUUdA ZTvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708087382; x=1708692182; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=77MF/Wc5xfDslCA8yVnEhnhiPyC9kkF8FZAf9ZvIMEQ=; b=eYCcHl+ZqsiXA2Sm5avT0emv/yT2q/gfGGiR1RCxYwnU4jB6DxWANMKRHypV4+bLQb mrP2r93kWRjicoTdGRPVKjgfLPTgiYAvTrLPxyrf2mh4pAClQqC/unPRmtMUSt6LMNKu x/29BPn92CokBk6lJhUw+mAXERZ+2xBTqNdB+cHbXNDz/uMpTwrz0yGukfRqpBzwAz5C vbXweuRjYoERWZGJzwipmPVszviX25mpXv9AVKxlW+h4jyex4knvQGkDGwf/AbcySpCN lDIbbTK+Gxqoqe1yWkyipciLnAjRbaQizUxFsbmZw2bK0a8RbSvt3ElKEk0mIZjWaFYX Qgsg== X-Gm-Message-State: AOJu0Yzh0rSpytUJnwvzr1ZP6q+wYNl9h2DSudQF//+5h4ZX7iyokbCj uNPLGfXW3fuY/vp6IfknOdpteAyC6YEL+7fJAYZKC7RgkSEZLZfSBFHxkobfL9U= X-Google-Smtp-Source: AGHT+IHhZS7CkKt/asfzc5dZK3kXfcLErc5AsCgoVVlq/b0Eqnxo/ef7mAB6RT5N9zg2klSJzN0o6Q== X-Received: by 2002:a17:906:a2c6:b0:a3c:ed94:5612 with SMTP id by6-20020a170906a2c600b00a3ced945612mr3635428ejb.27.1708087382398; Fri, 16 Feb 2024 04:43:02 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hw12-20020a170907a0cc00b00a3d5d8ff745sm1544090ejc.144.2024.02.16.04.43.01 for <68716@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 04:43:02 -0800 (PST) Message-ID: <00013ffb07bdd7231f561e8c6c5d220d33b3e32f.1708087345.git.liliana.prikler@gmail.com> In-Reply-To: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> References: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 13:08:11 +0100 MIME-Version: 1.0 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 As with our udev extension, this makes it so that all inputs are considered modulo a new ignorelist. * gnu/services/desktop.scm (gnome-desktop-configuration): Add polkit-ignorelist. (gnome-polkit-settings): Adjust accordingly. --- gnu/services/desktop.scm | 44 ++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 0631571c49..b3c0f4fc41 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1425,7 +1425,12 @@ (define-configuration/no-serialization gnome-desktop-configuration "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 any package referenced in the other fields -are installed.")) +are installed.") + (polkit-ignorelist + (list-of-strings '()) + "A list of regular expressions denoting polkit rules provided by any package +that should not be installed. By default, every polkit rule added by any package +referenced in the other fields are installed.")) (define (gnome-package gnome name) "Return the package NAME among the GNOME package inputs. NAME can be a @@ -1467,22 +1472,27 @@ (define (gnome-udev-configuration-files config) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and rules." - (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")))))))) + (list + (computed-file + "gnome-polkit-settings" + (with-imported-modules + (source-module-closure '((guix build utils) + (guix build union))) + #~(let ((output (string-append #$output "/share/polkit-1"))) + (use-modules (guix build utils) + (guix build union)) + (mkdir-p (dirname output)) + (union-build output + (search-path-as-list + (list "share/polkit-1") + (list #$@(gnome-profile config))) + #:create-all-directories? #t) + (for-each + (lambda (pattern) + (for-each + delete-file-recursively + (find-files output pattern))) + (list #$@(gnome-desktop-configuration-polkit-ignorelist config)))))))) (define (gnome-profile config) "Return a list of packages propagated through CONFIG." From patchwork Fri Feb 16 12:35:56 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: 60425 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 D58CD27BBE9; Fri, 16 Feb 2024 12:45:14 +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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 41DA127BBE2 for ; Fri, 16 Feb 2024 12:45:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raxaA-00007N-Fy; Fri, 16 Feb 2024 07:44:47 -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 1raxa9-00006R-21 for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:45 -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 1raxa8-0004R5-QI for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raxaR-0008Dq-W1; Fri, 16 Feb 2024 07:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 6/7] services: desktop: Remove unused imports. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 12:45: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: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170808747431505 (code B ref 68716); Fri, 16 Feb 2024 12:45:03 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 12:44:34 +0000 Received: from localhost ([127.0.0.1]:57996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZx-0008By-Km for submit@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:33 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:49469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZr-0008Am-R9 for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:29 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a26f73732c5so109802866b.3 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 04:44:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708087383; x=1708692183; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=bmmZFzdnENYRVQPggATJhB80gWUHH9omf7WRONhe7No=; b=ef+vf1GTqyMfqlD3V05X2Zu/CuhSUB2YFwVnPJu2BtHpbb8q9KDidYSM7rrl9oRK1b k1TViYySaHNDA26PB+LvMXB9pStoEDczd4tuDc82fWb8pVNgQgFBgSJi0IatRuw9y6N/ znyX4Kl5qJB/ZJfjhBYMOEO8/AMaL6XmKeHk7ZoQImH/Hz95e1Ep8DbM2vk4ZVqhmpIR z4XE6tPPbAXUwUZhIb59GJqEVhk6G7gfFMn7VOPiGMdXHMWv3fCGA6pw3DVF9FIl9/Ws F3eYbHXnA3PT2Y409Bb17Krrw6KaFoQC1N2qmPBIogcu34U1ANkKf+PGhA9rHeHIUe74 Ec5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708087383; x=1708692183; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bmmZFzdnENYRVQPggATJhB80gWUHH9omf7WRONhe7No=; b=Mvx6gw67ulBJCjlAfVQbHptNMa8MFmlywrkH3PyeMv+8TuoZ7/Fz1SCg4xp2krhfBa BUgTzECU3Xrvio0EDhPyPbGPLVRb2+jy77R54HQ4wQLCulu27S3ANX7BUGLnVP2oeja0 s/S0CFWAoyOc0oCLy1lUJiKNQ/O0unTzZjHUvP1CWmAxk2V/CCwApSBFRqgetv0UbHWz fOOysEOD5s8s/o8dFcsCMQW7knT6qmwfU6ukN6nUYdg+HeVixV3gIFjK53OQ6rzpGo4G 3ZNXOrKAWMM5gIwseKWKerFESi26jVs3bNC92QFnWs0XJ0q0OUxH1auYOEozSt6znrBM EEpQ== X-Gm-Message-State: AOJu0YzRfbHE+9v9tMjMnfTurXZ7lXQJKIJeZqbkON9JDPEgilUG5SLl DEPFhmotKIbQm/uo3rZUxaZ1785lA2HndoTR6SQ3Yc4Gwr1IcLLJvzMPdPZm99A= X-Google-Smtp-Source: AGHT+IGV/mWjfHODS5KCMANvR77Lu6EFKmNitAluF9hqfsvklqTURYstFzwFqEZlq7zodCbxIaNmgg== X-Received: by 2002:a17:906:7c16:b0:a3d:1458:5e58 with SMTP id t22-20020a1709067c1600b00a3d14585e58mr3741400ejo.46.1708087383019; Fri, 16 Feb 2024 04:43:03 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hw12-20020a170907a0cc00b00a3d5d8ff745sm1544090ejc.144.2024.02.16.04.43.02 for <68716@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 04:43:02 -0800 (PST) Message-ID: In-Reply-To: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> References: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 13:35:56 +0100 MIME-Version: 1.0 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 These imports were needed for a short time to consider two variants of finding udev/polkit configuration files. They are no longer needed, since the respective procedures use all packages now. * gnu/services/desktop.scm: Strip use of (guix diagnostics) and (srfi srfi-35). --- gnu/services/desktop.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index b3c0f4fc41..02a7802d58 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -75,7 +75,6 @@ (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) @@ -85,7 +84,6 @@ (define-module (gnu services desktop) #:use-module (guix modules) #: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 ( 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: 60429 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 B411827BBEA; Fri, 16 Feb 2024 12:45:55 +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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 A68FF27BBE2 for ; Fri, 16 Feb 2024 12:45:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raxaJ-00009P-0Y; Fri, 16 Feb 2024 07:44:55 -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 1raxaB-00007Q-8Z for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:47 -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 1raxa9-0004RQ-O8 for guix-patches@gnu.org; Fri, 16 Feb 2024 07:44:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raxaS-0008ED-RO; Fri, 16 Feb 2024 07:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 7/7] gnu: Deprecate gnome meta-package. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 12:45:04 +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: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170808747431518 (code B ref 68716); Fri, 16 Feb 2024 12:45:04 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 12:44:34 +0000 Received: from localhost ([127.0.0.1]:58000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZy-0008CD-Db for submit@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:34 -0500 Received: from mail-lf1-f44.google.com ([209.85.167.44]:50372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raxZt-0008Ao-6I for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 07:44:29 -0500 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5128812662eso977159e87.0 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 04:44:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708087384; x=1708692184; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=MPtOpE7auy8lW18YnUeBFfW56rMgLYMKUdKDcVXCWnc=; b=HBbV+05UFx5dgQsd1/4+BKt1LSSSkLkZh6WPBUQ7/mIn4d4ZlzxDwt4Ox5SJNV7yEE uddXEyHhLf6W467qpMwElcjO/0aspwvI8E+aRWvmJ2IiJG+VGxTZF8DaAMnVkDfzZk9D 4AhAUS8SoJPHlcoaxi+N7vS1jMJ0N/aC64+Seao+4J0IBxYtmiMtpYDQn1C2fVdAshrE 6NnWlG78xE1134gxTyOv9Mx8RQW/9R7B7Y5mG0U++SMhAVgz4SJRXrPoCGn5cSsyMWHE hDUdJkwEutucyTPDypFsZW0trqmzfru4OGRvQz+RT5X4wv/sHx7LntnQYVVoVIZfup6i w49g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708087384; x=1708692184; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MPtOpE7auy8lW18YnUeBFfW56rMgLYMKUdKDcVXCWnc=; b=sa3NcZ5MnDM5G5rtscT13vc8EahVjO1Y5TKnY8gCxE8LGZF2xpycmSqcEVwC17QuGC cvSZW2p3E3ePQ40C1z0dN3SxFDkk59E30tCzCOZVTceqZnIR8/RrjXOUrStnwrtSBPVj lGAviGi538HSO65VL/7uS981x9iluayehA/C1Nil9Ho2vYBRdhXh6ByR/5NsfS+Uqziv eA7ohNmxnmN1boTlMYJ0VAa8ZiSYpqQOhjO0vASt4jbNz/LDXh0+x4MYRCvwdQK41oSL zaGjT8wYtPghWZZvGme61n0/2V1LD5gFlkPUlFBDspy0zL8f4bZC4mtCCZohNEnMwZn4 V49g== X-Gm-Message-State: AOJu0YxOn8MS7cS3hc53dwX1bkFLMfueNHQFYOlfosA6Pg1JkW80w46T SEgF6frX1FHAarm8Ci29sTwf7bxFTAQBJeutDBmDco40/NCtW2PJ4pHhXPcd X-Google-Smtp-Source: AGHT+IFF1N5pA/OJV8lY8qBweFK2L+ChpjWNj4t8a6ArpoJC1pXlIyhxpX3XA87CjOdQQn5Z8WWPPA== X-Received: by 2002:ac2:5f83:0:b0:511:3ed0:f0e with SMTP id r3-20020ac25f83000000b005113ed00f0emr3964650lfe.13.1708087383704; Fri, 16 Feb 2024 04:43:03 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hw12-20020a170907a0cc00b00a3d5d8ff745sm1544090ejc.144.2024.02.16.04.43.03 for <68716@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 04:43:03 -0800 (PST) Message-ID: <0ef52d621063bf7cd5487b287b4d4421ec3b786c.1708087345.git.liliana.prikler@gmail.com> In-Reply-To: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> References: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 16:55:44 +0100 MIME-Version: 1.0 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 f3d1548fe9..e47a4576f5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -237,6 +237,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:) @@ -10280,7 +10281,7 @@ (define-public gnome-essential-extras a good GNOME experience, mixed from core dependencies and other implicitly relied-on packages."))) -(define-public gnome +(define-deprecated/public gnome #f (package (inherit (gnome-meta-package "gnome" (append-map package-propagated-inputs