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: 60448 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 0923427BBE9; Sat, 17 Feb 2024 08:26:46 +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 E630A27BBE2 for ; Sat, 17 Feb 2024 08:26:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG12-0006I6-Aq; Sat, 17 Feb 2024 03:25:44 -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 1rbG10-0006Gh-Fy for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:42 -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 1rbG10-00074A-7Y for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1J-0005RL-Mj for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 1/8] gnu: Split gnome into more meta-packages. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26:01 +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 Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834120834 (code B ref 68716); Sat, 17 Feb 2024 08:26:01 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:41 +0000 Received: from localhost ([127.0.0.1]:60392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0w-0005PS-VX for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:41 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:52391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0s-0005Ox-5C for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:37 -0500 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-564372fb762so41282a12.0 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158248; x=1708763048; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=YdH/ZpPhcYqPGuf+NO2NAFDS/xUplRQaYHkpXxdwgKc=; b=UzSJjwtD/HnQZn5LRzYm/NC4hjyV9B5t2oepMvx2bCHRKVKLMLOZx0lioI0hhuxGdA G+H6qVsfWTjA3U8BGb+4q1E7zgMqMxM7urCk4V+huIrN9XJHjy3iTXF/+oPlHLQgELF9 D97R2yEO3ShkXMRe0vD8F0vPw6TeeEZvHCyVCD36LH8y3WgUhekxXIeDliBF8QPCtZH3 WYioXybbLCwWOq4n9cY5bkjkDIBk5iF997V9peqeRaWgGdOftQmoPURq+B0XAB3Cwtjy 0ftSdjYaJsE1dzzn3SM8hjxgKIOhb8ql6Il6ZPFkIdMPNX/1D46OXF9UtvGBzN6RsfT2 ryyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158248; x=1708763048; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=YdH/ZpPhcYqPGuf+NO2NAFDS/xUplRQaYHkpXxdwgKc=; b=kSLij2IGnBE4utB19g1S2zuX6tJS5lFJbEaGOe4MaBOoyPbDthJwiag83KltCxoimp rzZPfHTFp0Diob/Mj8RR+8nMmowT3EJxG7YP9va0quBOSn7Ps9bbuKYqMRuAHOH0IC9I FrFTQn2Bb1PoaMMmAJ9pgh44L9u9vO3PoXyE/JY1QXooVD59YNk5NfcrVuwalpR/hgeX cJHGhF0Zeq4Mme29ijX25HelD0RM/juWNak4m6FEeJqczsGUrD8fJu4csYeiSFbkrqK+ ruLreZ9CCySdmG6DaEwig4kPhDP7vhtFJu50hiMGDLLWPAd3XhTUNENd7NOVtOMr6wZn 0J/A== X-Gm-Message-State: AOJu0Yxw2apbwR9JGEPD9AUuNd0kgv8b3XezXXaYLA59ltFv9JmLqgzv J6Dg0vTBs+ZXHGapxPW5ifR8iaDjad2jN+AbExhegC2LIB6Gz0AwSB1zl2D7JGE= X-Google-Smtp-Source: AGHT+IEy28PmyTRStSNuylACfPHDtwWxQaIeqYinDHI5rX8Q1KYpsDbDvr9GhcsAv78SMz2/n+Crow== X-Received: by 2002:a05:6402:1804:b0:562:f25:b124 with SMTP id g4-20020a056402180400b005620f25b124mr4757155edy.15.1708158248054; Sat, 17 Feb 2024 00:24:08 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:07 -0800 (PST) Message-ID: 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. --- gnu/packages/gnome.scm | 235 +++++++++++++++++++++++------------------ 1 file changed, 135 insertions(+), 100 deletions(-) base-commit: 622df12ef389c9e91f68ae10c54c043f34828c83 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7397148c2b..9a27343353 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10154,108 +10154,143 @@ (define-public gnome-weather (home-page "https://wiki.gnome.org/Apps/Weather") (license license:gpl2+))) -(define-public gnome - (package - (name "gnome") - (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 - cheese - 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 - ;; 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 +(define-syntax gnome-meta-package + (lambda (x) + (syntax-case x () + ((_ field ...) + (with-syntax ((base (datum->syntax x 'base))) + #'(let ((base + (package + (name #f) ; we're hidden by default, so don't worry + (version (package-version gnome-shell)) + (source #f) + (build-system trivial-build-system) + (arguments + (list #:builder + #~(begin (format (current-warning-port) + "Building ~a is useless. \ +Refer to its propagated inputs instead.\n" + #$(package-name this-package)) + (mkdir #$output)))) + (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+))) + (license license:gpl2+) + (properties `((hidden? . #t)))))) + (package (inherit base) + field ...))))))) + +(define-public gnome-meta-core-services + (gnome-meta-package + (name "gnome-meta-core-services") + (propagated-inputs (list accountsservice + network-manager + packagekit + upower)))) + +(define-public gnome-meta-core-shell + (gnome-meta-package + (name "gnome-meta-core-shell") + (propagated-inputs (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 + (name "gnome-meta-core-utilities") + (propagated-inputs (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 + 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-public gnome-essential-extras + (gnome-meta-package + (name "gnome-essential-extras") + (propagated-inputs (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 + (gnome-meta-package + (name "gnome") + (propagated-inputs + (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: 60447 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 5F64927BBEA; Sat, 17 Feb 2024 08:26:39 +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 EEF3F27BBE2 for ; Sat, 17 Feb 2024 08:26:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG12-0006J3-In; Sat, 17 Feb 2024 03:25:44 -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 1rbG10-0006Gq-PX for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:42 -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 1rbG10-00074J-Gy for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1K-0005RU-6I for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 2/8] gnu: gnome: Add core packages for GNOME 44. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26: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 Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834320843 (code B ref 68716); Sat, 17 Feb 2024 08:26:02 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:43 +0000 Received: from localhost ([127.0.0.1]:60394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG11-0005Q7-AD for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:43 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:51265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0s-0005Oy-D4 for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:38 -0500 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-563d56ee65cso1809686a12.2 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158249; x=1708763049; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=ck+iM5/EHR7DeDqUjPElj0yk0FmpJZJOQ216xdvqwGE=; b=EInUs6IaIx8ShMNHSYZyqZfLxtbVeejxg1D5E+liyqJ8Uw41tK2YYT2mWmzTY4+RQd WuApRGZgc0M6u7mz2pYI3Jm1p6LwPZshvffvsjDCxdDHyPX1c9DsyWsDM+Gud2u6iKnL m8zKeIFJumsee8+H+QzyfpK+Kj59gLqnYfCyJtBrZy8SZwkPqHwCa2aqbQBV73rqfkEm sIpgQ9E54AQKcXw6Sq3JdLUehWC14ugd0So/TBSLuiFh696PKBTOBGRXjDQ51x0DEvDE p0aGg7Qrf5QAlX7I9c+Nuwrn4uWMpKNSoAAqA/BWSNB5cy5kVTM1V4Xiw/nBA3FMjlwd wcag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158249; x=1708763049; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ck+iM5/EHR7DeDqUjPElj0yk0FmpJZJOQ216xdvqwGE=; b=lohjlAFqjrqag9aAeRL3EWbw89AZDVSj+Y+Z/8P//0oIPasDGEPK6A9ZFSV2coOLtF m0l72Ra27ib/9Y+AEmmI4hyB+HK4YshkxEsXKi0RhwNYytT7ijAN/B22V6Hcz6ZgP8Nk X+HFnZ/xXZhWdJL43XjCfGsjbpWLjRz28HrPCIiDrYjqSodfUiEi6DlB0kaICueHFCJ+ 0wfBYMb4xl8Dl0ZMuqlY7xoIQrtCIZmMGVB+KMfJFoGOZhuYSPPwimuIV/gH67t8FHbC w7vh87JQyREPvxa2tq6/0uFIwHiStPNV/huB3pPCo2RAZ8NPqIxlwliIIuVbHW+JhJtl pYQw== X-Gm-Message-State: AOJu0YyTjF5l81gMJPGtmC1xEA2xHTztvFQhlYe+woniXx/QC/BI3CDd kkvwsXxqusyWQTVJwQj8UJwwD5WeFnKqDO31VaehfJY4CxGt/Ese7+72JM7UT9s= X-Google-Smtp-Source: AGHT+IFUfNqJRImBIY0jPP9DXhb3JWttwplMiNT90fn2RX7jon6+2MNoLiFc+zCuAugPXAE4xlrpwQ== X-Received: by 2002:aa7:d403:0:b0:564:1004:42ac with SMTP id z3-20020aa7d403000000b00564100442acmr1270689edq.4.1708158248801; Sat, 17 Feb 2024 00:24:08 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:08 -0800 (PST) Message-ID: <948a04ec358b02194ab3ae448b73801ba340f065.1708158195.git.liliana.prikler@gmail.com> In-Reply-To: References: 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 9a27343353..119f957def 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10205,6 +10205,7 @@ (define-public gnome-meta-core-shell gnome-initial-setup gnome-keyring gnome-menus + gnome-remote-desktop gnome-session gnome-settings-daemon gnome-shell @@ -10237,6 +10238,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: 60449 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 7635527BBE9; Sat, 17 Feb 2024 08:26:48 +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 2F36127BBE2 for ; Sat, 17 Feb 2024 08:26:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG12-0006J7-Q0; Sat, 17 Feb 2024 03:25:44 -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 1rbG11-0006H6-2v for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25: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 1rbG10-00074R-R7 for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1K-0005Rb-I3 for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 3/8] services: Modularise gnome-desktop-configuration. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26: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 Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834420853 (code B ref 68716); Sat, 17 Feb 2024 08:26:02 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:44 +0000 Received: from localhost ([127.0.0.1]:60396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG11-0005QD-Ob for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:44 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:50371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0t-0005P0-Hm for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:38 -0500 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-55ee686b5d5so1809763a12.0 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158249; x=1708763049; darn=debbugs.gnu.org; h=cc: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=jrxr1DGATeETjLTFZhcg7yuOVHEmNYpBjKMgFrW6ouYJ2MUSqI/KTKf8maqqbrpP6B 5ZIvOfSGkx4A6/MOmmZWS/JI86l6XFytp7qnfiDKvCQ3WAI73zYipvxm9twMSPAbbSEQ OC5t4xzzndh6XsYBQSQA15GRFFz2od9WVSht7OUBL2sQ1QEAOCWIcXbBP6dhSZbutLfh JVtWwVFDdW0YRPdZaGIeo6wEKV+qK8fwB3GiayshqLJTzvu8O4Y2KH9lZutNoTGOl8/n 42ljuakl+XqdVzHSDjPoX5E5JGORB5SJzaNOhSoZSxil1UJszYdrJO8p8CAEfn6IdRmC TPfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158250; x=1708763050; h=cc: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=vFa5GKRxCoYTfLomQfJahdse5Ijd64KsDe6Q8yccVLviCo2ObFw07dQR6slDdKCVtM cspMHSeMNbxgzUDcXw53z/vGmfmorz771pv37D70VvoyZvEvA2wHbLaTX7QkpiA33BJ8 uu5w5GTzGyYscKFPBGvTtxh16ZCH9w3f6JhLwQQmb9dgpn6iKQ5FOpRx0qBR992MD2ip 2MDjVgKskMOCDB6nZjlC4dJxEaOSh4cyxGBtZD+aJKkzboa017rfJuG4WBjTu40JlGFD bd6iNk8pIHEVfNNNhTMjcb6aUjDqP5rg07INisoU28Wn9K6WPAKCOkJprQwjG+TKMfxl oaUw== X-Gm-Message-State: AOJu0YwCo8VoBIPLwLS31xR42y22W3SHMbqWYaDselzf2zoYWTrxKT1b FsJOucMGV7fex8i0lMXWopEbFx1mnGWMNjFeQanSVNoOFFU/b+Dy4l6KqT9AnMw= X-Google-Smtp-Source: AGHT+IFLH9rkoIghhs6vceS1L3C3PCOGjV5Z5U4BJay1srVdpRtnFOrIQnURUFhN9rnjAzc0r+Mi0w== X-Received: by 2002:a05:6402:1851:b0:564:1ecd:35d9 with SMTP id v17-20020a056402185100b005641ecd35d9mr592667edy.8.1708158249575; Sat, 17 Feb 2024 00:24:09 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:09 -0800 (PST) Message-ID: <2869f41835d62e93d4f501f5bbb50a1c7a67c91c.1708158195.git.liliana.prikler@gmail.com> In-Reply-To: References: 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: 60446 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 75F7527BBEA; Sat, 17 Feb 2024 08:26:31 +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 974CC27BBE2 for ; Sat, 17 Feb 2024 08:26:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG14-0006Mf-Cf; Sat, 17 Feb 2024 03:25:46 -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 1rbG13-0006Jl-DP for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25: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 1rbG13-00075I-53 for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1M-0005SC-Ry for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 4/8] services: Extend udev capabilities of gnome-desktop-service. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26: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: rg@raghavgururajan.name, Vivien Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834720889 (code B ref 68716); Sat, 17 Feb 2024 08:26:04 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:47 +0000 Received: from localhost ([127.0.0.1]:60406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG14-0005Qn-JX for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:47 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:52708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0t-0005P1-Uy for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:40 -0500 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-563a6656c46so4313097a12.1 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158250; x=1708763050; darn=debbugs.gnu.org; h=cc: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=YcgMxdR0zqwRgFImS5X6rMibT9JFnhNhqY8ImguIAm19eagSL14/BlFBZo1yOhbbnx dtD8rVaSE3/KpuKZUTBD8FYms10zq5I/GfBgsAaPrvTCmpIO9je/JFkCX9IAX642uW7u 8foi6GFku/yxNWvbifA1ZXOjJT2ZpO7TwRDUUE4et+EgbGEi4S58botpT4qL5jsXQrZn p8hcGcl2C5zHehKXwG3HANUbA8Ooe5+PmUqEEiKkZ2Q1/5uCJGQ2RrSKVLDBPhvHMcKs hsf8Dkgy8xjb7cGGNuy4DyZZ1bX0HJSyBBxeCWLRRbxTigplxsLksYW6zFGWUf/DuuT1 XE1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158250; x=1708763050; h=cc: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=tcwnIkvOlHc8qnwcuLYTHTw1A2Z9RC6RW2FCA47H3F5amIxd7AbIUs5f0KTc1Lb66a GdegGKJ3oR07se+xSSL+mzaN2cNp6Bju6E0rINhkOQocjNvUvzxV7nvQUN/sSetYwvQ8 tGi+pjuK6Vqd2AMg8i3j5sDmCvZtmbgkal6xgywRxzQhD7VZs0UxYNdj7kzfaEFFi9YX 9cvcSMAUSiS2k9/guy0O53BmSt2sBGtRUD80QLAEKypaFfyV9tWc3w99686NRlQJtGE/ K470nFUY33/IIZ7WhQkGhokndNKHfxkWyV9kYL51X4w7dXmI8+GsLTKoR9WaEuB0BwXr aA9A== X-Gm-Message-State: AOJu0Yw7D8JxNSAwjZpQLMVjgD4Eg1lKp8vaQY4nVgVIlO6qQKuf6u3x gXSRp4raRsJgYYNjcjQC/A4Cr6BhmEWvyl/eJk2A6k47gCCv1EttDoiAfTSzb6g= X-Google-Smtp-Source: AGHT+IHWLUoj7hL53ZVp4i2znfwJrVwMzyLzFFeYYBI3Bq7mP8ox9s+5R6CGgKmeL7EnTq2fa7bf4w== X-Received: by 2002:a05:6402:31ee:b0:564:2a5b:93ab with SMTP id dy14-20020a05640231ee00b005642a5b93abmr411255edb.10.1708158250300; Sat, 17 Feb 2024 00:24:10 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:10 -0800 (PST) From: Vivien Kraus X-Google-Original-From: Vivien Kraus Message-ID: <18430b0ce6613e52113e07ae6305e529270e3265.1708158195.git.liliana.prikler@gmail.com> In-Reply-To: References: 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: 60443 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 7B8C027BBE9; Sat, 17 Feb 2024 08:26: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=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 3DE2227BBE2 for ; Sat, 17 Feb 2024 08:26:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG15-0006NL-VH; Sat, 17 Feb 2024 03:25: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 1rbG12-0006J8-UQ for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25: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 1rbG12-000758-M4 for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1M-0005S5-CV for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 5/8] services: Extend polkit capabilities of gnome-desktop-service. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26: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: rg@raghavgururajan.name, Vivien Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834620883 (code B ref 68716); Sat, 17 Feb 2024 08:26:04 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:46 +0000 Received: from localhost ([127.0.0.1]:60404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG14-0005Qe-1I for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:46 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:48241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0u-0005P3-Dn for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:40 -0500 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-563e330351dso1648280a12.0 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158251; x=1708763051; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=77MF/Wc5xfDslCA8yVnEhnhiPyC9kkF8FZAf9ZvIMEQ=; b=dvvfmPWd4iIMBeepoSEvkt0lr1WrSBDksf87ANRzIDvB5KQ/sa8uCEdhSrWa1CYwfl lJmnK5qq1bmq+IZsVqdlqV8meHhkLDL9WYpLMLuTWHSOJbrJNnxwAVD4Wyp3jhyEQbAt cHsfRN1mpvDXCMB+mkA3L/f+LEvNGVD17eTzh2Pp8ikf/1ItxriY5P22mF2toOrqrmBU DyDC2WYa/w10kdmKLfx7Z/9Qi9Q5Oug33B9z1s0OTUYNW/Jv9QK9FpH3k8pIg8s4wrbt YB7ATfNQNpcUWPa2JwcW+TgKAlKupQNOI7xyxjXlOn2QjsxoN87asu8TR2oJAbhMZ+Qx euIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158251; x=1708763051; h=mime-version:cc: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=uIH+D/0SSdE9Cuf3KE2lP895/axNnRYuKA4wM5YxhekZzHa+n3fzX/sDiyvSUYvD9y mtV+xxxfngf0mt6K8QBCbQfccZWjSBquh4E3RvS5RGMGL5mTUtrB7VSknvj38e5z8NVg BLIeec+jICGABco7DMi1qGfsOWtlpGe0MQYOcR+p+kZVG84XI00lOtbfIzbGxlonNrwa bG0TkbNSNjxOdL70vzWJG1qKLvFIsMKhRQmG7MvAPUDtRS1u8ny3F1QrxxOVjnjbVmlr bC0trd605Wpc1sAM4pz6U37xWtDJXGUXczHaEk0vEzO5CrpKo7p5NXqTfO192P0qZqcw 7l/g== X-Gm-Message-State: AOJu0YxOYfZ3sqh9a5KVlBaY8C92/CmzPpO+YVT6q51lt1Fp92c+x47F fol55U0QJOCVOhhGNeMDREJ9u8qhJqgNAOeXOpB0CL+ewXdvfOs2bAgF8h2duwg= X-Google-Smtp-Source: AGHT+IH4v+mjpbOMW7DA0k9gLrl/FX3y4dbubGjZwyGcwTE+E/XL9o+QDN90yC6I94/j8YTfVB4EWA== X-Received: by 2002:aa7:da48:0:b0:564:329e:5832 with SMTP id w8-20020aa7da48000000b00564329e5832mr216005eds.18.1708158251031; Sat, 17 Feb 2024 00:24:11 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:10 -0800 (PST) Message-ID: <546e128bfc3a77723987a842d5979c08a4153c6c.1708158195.git.liliana.prikler@gmail.com> In-Reply-To: References: 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: 60442 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 5A01C27BBEC; Sat, 17 Feb 2024 08:26:10 +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 65AC727BBEB for ; Sat, 17 Feb 2024 08:26:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG13-0006Ka-MJ; Sat, 17 Feb 2024 03:25:45 -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 1rbG12-0006Ii-CD for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25: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 1rbG12-00074w-4I for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1L-0005Rx-RZ for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 6/8] services: desktop: Remove unused imports. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26: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 Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834620875 (code B ref 68716); Sat, 17 Feb 2024 08:26:03 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:46 +0000 Received: from localhost ([127.0.0.1]:60402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG13-0005QX-KS for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:45 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:50372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0v-0005P5-3B for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:40 -0500 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-55ee686b5d5so1809785a12.0 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158252; x=1708763052; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=bmmZFzdnENYRVQPggATJhB80gWUHH9omf7WRONhe7No=; b=McrqrzPrgR1voYQ/Fpu5ZsZQWRtuPYwy+dndCeYeDjlepMwBEeKk9v7HOpLN4b1TF2 9YnhX/sfnhV8N6Z+Gl2QehOGEtrP4uccUW4s/3sjMPuvjOg+A3xzKi9opR5w21eLB3zB WYSOuiEfQUY6EkMDAgvAorX4irNpFcnHNdIHgxm7ha73229e43kSpDyH1+lhk9faLe1o ayDW3MwrFrS9bEgi3RdgVbLCftkhq99xEBCGNSNaA8grDP6oVlUS+bj1zwRe59EavbbP BR1m+Zs/s8hpZLNJVN00lZJqF1XTsjOC+7WRWcfQs9K4Jgu4pDyrRPSijN4Rt9v9evyZ lVUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158252; x=1708763052; h=mime-version:cc: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=oX5338R43jnV2zh83uKXPIJP0vRk9HYFJ3q/ulowlhzmM9yHo+9ADEHccRuqCfRXeT BNJSNZPiHplZ/W5sysXVbuzivvPl/O0Mph+LVTTkBUEqB2zYbkmS7rUkGX59Qzr7VnD5 I6cbvwzou7eF1s1RbkhpsMh5ZXexFstnONbkKgMstU5++ds0hMkRtyROkKeYxuRRdKoo LKtGEQelAyM4XGviSAGK/YsacyK2zKB9XG5E5ZbT+iOh4wq32pug0nu4/RQrzhmL9mg2 rzlu73CuWF+dPXqg6b1qdnDpI7QpRImSl4b+N64PQ27b9wrCgqVHENis+VpiMsf4VF74 U7UQ== X-Gm-Message-State: AOJu0Yx8HPysdWRTdfwHEpRAmhCQ8nU8Hk/hxG4rSoszS4+TLVAsJ6J1 GBV+JOJqNII3UvR8P9PTE8K5xhIsyqda62/x2TflZ7h9Kn6FSiGLer+GjzJgjx4= X-Google-Smtp-Source: AGHT+IGGKf4JnXHQF4gm2a2J/+wKGk/i7eO04pG/7pguwVSu3m2xRf0TY8GuNBtm2Lfjq+HQ1Llobw== X-Received: by 2002:a05:6402:202e:b0:564:17dd:d7db with SMTP id ay14-20020a056402202e00b0056417ddd7dbmr882596edb.11.1708158251767; Sat, 17 Feb 2024 00:24:11 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:11 -0800 (PST) Message-ID: In-Reply-To: References: 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: 60444 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 3A9CA27BBE9; Sat, 17 Feb 2024 08:26:16 +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 9B37D27BBE2 for ; Sat, 17 Feb 2024 08:26:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG13-0006J9-0j; Sat, 17 Feb 2024 03:25:45 -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 1rbG11-0006HH-IT for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25: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 1rbG11-00074c-9v for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1L-0005Ri-0Y for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 7/8] gnu: Deprecate gnome meta-package. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26: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 Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834420860 (code B ref 68716); Sat, 17 Feb 2024 08:26:02 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:44 +0000 Received: from localhost ([127.0.0.1]:60398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG12-0005QI-Cx for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:44 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:56572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0v-0005P7-RG for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:39 -0500 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-55a179f5fa1so3857911a12.0 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158252; x=1708763052; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=Wx+RmiVJPE21FF0XXkPbBuEOyoJEbYOfI/jhAv2KhSM=; b=EW/oNc19GDGKO6aAyJV0N6oUzsBISE4i4fwV6ELs4T1EzhsWZhHX7Ayd+ZV8E6EN16 bgUsnA2WL7Xv1SxVUiA3LD5bqIiFC9/VUZRpMbCtLl6DC4zBSXndQfMsSV8tbGu7OqC2 p+yTQlICBt3LjXbGpLB3+pEgRzpEqChIO+M/UyYtHA64/haJ2iDjEcJBDskwM6o5x6R/ IEHbO53F+JjDgdl96wyKQFjGWnYZEsU5xzvvsnHsKUAkc/t5HxZUH6y1IwPr6athz6Zo Jmdfdmy+fRF6rq8A0FmhVZFXZiCRtdBK/o1fbrgds9RjkFN7ReCDaW3uRmpRdTtubskx Df+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158252; x=1708763052; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Wx+RmiVJPE21FF0XXkPbBuEOyoJEbYOfI/jhAv2KhSM=; b=mJgxWvVKZBpzy8Az60cHUXoUQ6Wkg+2V61zmcQ14GoqJ7ulzdqhU/tJh1UWD7OYLzB Xp7I4hukahJXE8JwO5c8WKv7lOL0liT6leVtbKAVSG2ETuVmdWVlvXkDDHUMGxzEELyf SMECoCPMfto+2fT7A+br1CLaF52jDh2HfrP3PAmTUhDdJBGCPUE9hG0wKghyCqolEw/Y Wbt/HHKJl1IfXyTgV6Xbf549KkZFS5t6RJi4ux/xnybSYd8Udqa2xOtNgC8N5jBBCKMO IeVNAUto88C8zjTBEJE8NvveAWLQ3ReWQRkxv558Sf/oxBYsVnQaDTdQQ8xQi29Gr5AB 4tgg== X-Gm-Message-State: AOJu0Yw0vaOBS10eEevN7KWR9kqHBvhU+SopQTc9A5TJzW+yzw7rZ6HJ l3xcJMsdQYWkTdFPXHCXotO4yYo9kH130JMC/Aq+9B3kst3WAd5WF+WmJ62iogE= X-Google-Smtp-Source: AGHT+IEeVyOqtiX+R2Qgxe7AwiLdLvabz80iaM1kemzFy98cmDNwh1r8rKfeH93uZq5/3jZS5SpkuA== X-Received: by 2002:a05:6402:214a:b0:563:bd95:4ef8 with SMTP id bq10-20020a056402214a00b00563bd954ef8mr4726421edb.23.1708158252494; Sat, 17 Feb 2024 00:24:12 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:12 -0800 (PST) Message-ID: <1e2625c51c274850da6622775cef74d0d76ad554.1708158195.git.liliana.prikler@gmail.com> In-Reply-To: References: 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 119f957def..3736b9c351 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:) @@ -10283,7 +10284,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 (gnome-meta-package (name "gnome") (propagated-inputs From patchwork Sat Feb 17 08:19:28 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: 60445 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 0EC2F27BBEA; Sat, 17 Feb 2024 08:26: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,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,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 78D4D27BBE2 for ; Sat, 17 Feb 2024 08:26:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbG13-0006Jk-Eh; Sat, 17 Feb 2024 03:25:45 -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 1rbG12-0006HQ-0k for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25: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 1rbG11-00074n-Oj for guix-patches@gnu.org; Sat, 17 Feb 2024 03:25:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbG1L-0005Rq-F0 for guix-patches@gnu.org; Sat, 17 Feb 2024 03:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH v5 8/8] gnu: gnome: Update synopsis and description. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Feb 2024 08:26: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 Kraus , Maxim Cournoyer Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170815834520868 (code B ref 68716); Sat, 17 Feb 2024 08:26:03 +0000 Received: (at 68716) by debbugs.gnu.org; 17 Feb 2024 08:25:45 +0000 Received: from localhost ([127.0.0.1]:60400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG12-0005QP-OQ for submit@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:45 -0500 Received: from mail-ed1-f52.google.com ([209.85.208.52]:42452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbG0w-0005P9-O7 for 68716@debbugs.gnu.org; Sat, 17 Feb 2024 03:25:40 -0500 Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-561587ce966so5494143a12.1 for <68716@debbugs.gnu.org>; Sat, 17 Feb 2024 00:25:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708158253; x=1708763053; darn=debbugs.gnu.org; h=cc: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=SVK2xzibWybNSxaMEbgnejodo9o+smlznPF2YL0myPM=; b=ECGMVbTCSCe7749LFeycpxnVULAJtdsror9GEa6JoCE8BSBDgY6Xoz6kQLkVAvu9/r clH4X6WBEBV4cKzhI+Pd9+Cnsj+VQF7ig7Z823uoX8YNZdEFzgRof3bW+/oqrsPtvYNc abH7vNWUcZ2ucajsJdm0Lfi3La0Yy/a92mOYp5UWE+6LIuwfjEYdqfs9X+LmVVqRsi+i x7T/Si/Cqyov4GjUYwM6P+9n9mWE55dgIB3xl83N7myN1UGcN9MBpZIKVlOMhNUFbmV/ sDS255MpVmhW0sBTnclVUVFAVhPyX8kREkAjIp0KFO9SN3EhMRqg2UkEBCdv9QtUExJX MZhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708158253; x=1708763053; h=cc: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=SVK2xzibWybNSxaMEbgnejodo9o+smlznPF2YL0myPM=; b=UZ0VCimnqatcE/Sf76W64NjZfE/NfFUxYySnQfGL3/VeXznrbIgwel2hbZEcV3P79K aCneLP7ovgDuNMSIS1FY06h/U/id1+O2xv6CLMCH7MBaVJ/4bXv9hXzB+djdY4vH8tSR +s8YaZ883A1g+akzPDDKjUFvFwcy/PsGliDlbELqJlpE/kFWIgorAxWN5TtBmq3IFoDz 1NJ2sP+rP93nkhhGrGihEU65KYb91JTjpPDpDuD8qLHHSaPqodCJCa7+K/bwWCN6TQHd 4JN91Am6JiN08VylroLjqkrsFRLo79o/kwPKJ8JFAblVxdST5/kuYeDkIg4dlmtkyKF2 dwQQ== X-Gm-Message-State: AOJu0YxsDStZe3MsmYWA0LoIoMm8pkwRmOjZUmScXPud3L0rsCLC/WPa mxadPZiaWXKMOWsQK1uloOiNRnoaCVl4Y0mfumib1pN8VuCmRYldF02cxeWB X-Google-Smtp-Source: AGHT+IGGHoppqupfmhNH6uD3n8ZsZ5Zvp5IeDGP+8B5SZpvnKws0pZysdNFONhlYmkvMm0rBL1axww== X-Received: by 2002:a05:6402:708:b0:564:1de7:23b1 with SMTP id w8-20020a056402070800b005641de723b1mr873667edx.9.1708158253270; Sat, 17 Feb 2024 00:24:13 -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 cs1-20020a0564020c4100b005617cebd051sm707218edb.78.2024.02.17.00.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 00:24:12 -0800 (PST) Message-ID: <148822e650a43b1084633018a626d618cc30da95.1708158195.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 17 Feb 2024 09:19:28 +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 no longer considers itself “The GNU desktop environment”™, so let's reflect that. * gnu/packages/gnome.scm (gnome-meta-package)[synopsis]: Shorten to “Graphical desktop environment”. [description]: Adjust accordingly. --- gnu/packages/gnome.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3736b9c351..43126388e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10174,11 +10174,11 @@ (define-syntax gnome-meta-package #$(package-name this-package)) (mkdir #$output)))) (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.") + (synopsis "Graphical desktop environment") + (description "GNOME is a graphical desktop environment. +It includes a wide variety of applications with a common interface for +browsing the web, editing text and images, creating documents and diagrams, +playing media, scanning, and much more.") (license license:gpl2+) (properties `((hidden? . #t)))))) (package (inherit base)