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