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