From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id CJu7BbW7z2U0WAEAe85BDQ:P1 (envelope-from ) for ; Fri, 16 Feb 2024 20:47:01 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CJu7BbW7z2U0WAEAe85BDQ (envelope-from ) for ; Fri, 16 Feb 2024 20:47:01 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=lqI2mg8O; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708112766; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=Yclrp8pQsD9qJ0JFLm7LvJ2fm7LnaXepHgIfSkHheHs=; b=n3Ipzzv9j0gsSC4JiCPkAW9x6lA3mRIIaUZsM1XCP4nRrjpoufNj8Yu6Ay1HIwW06693RP CHhhoz3hm4oJLElRD01j5Aa2bXaL2XfT6sXXME2SZCExE786vfdaa1WQZnyyp8L4Z9nZ2C gRp2nwtaFLWepdMMz6SdSCar1VMVnmVx2KLaBQrqDYJsjpGGKkn4R8qVwTHhe3Axjaj8QV Ft/f7Msq49evyxKXfqsFYccjGeXJsjyWuUBpGAIykF8Qf6w1FFjvoFaF58zDP0u3qfW+Z1 EOpPneZ54hZ309rpK1FD68GY8fSiQea5zmGB40BkaR9oDt02FN/qJ112SNG3Sw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=lqI2mg8O; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708112766; a=rsa-sha256; cv=none; b=VgMXwIdc6KTv/1RYmZBlvijDfd+JqOFSJdHIsQl9ytTaXgFBMYTyXaYyFC71KOPVAeJK2x 0pcak0lIQ9aOzAlapRASHAbIMfnQ/acBW57Fb4Pfe5tzVBUQ8bMUA758G1BAbTMpxj2xab 92CHsDTrew/byAoL/Ic8boMIN33MTGrBZuaH8ykPqRDvvfYqEvYkR40nMm+RKYuMwLGSWU J91fm4v6jhjgQ5lm1brIdydLHfVzEO5Ks4Ug7x/suYfTh4znBPietInOaBNPJE2ov6V3zj mtfZurn4VTKrCT8F5coKModPWZHqn/pOnVKYwOq6mKiydacAq9p+7kNKushsEQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5A9BF3062A for ; Fri, 16 Feb 2024 20:46:06 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rb49j-0007B6-O1; Fri, 16 Feb 2024 14:45: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 1rb49X-0007A2-MT for guix-patches@gnu.org; Fri, 16 Feb 2024 14:45:51 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rb49X-0007MA-Du for guix-patches@gnu.org; Fri, 16 Feb 2024 14:45:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rb49q-0005Re-Fs for guix-patches@gnu.org; Fri, 16 Feb 2024 14:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68716] [PATCH gnome-team v4 1/7] gnu: Split gnome into more meta-packages. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 19:46: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: Liliana Marie Prikler Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, 68716@debbugs.gnu.org Received: via spool by 68716-submit@debbugs.gnu.org id=B68716.170811275920919 (code B ref 68716); Fri, 16 Feb 2024 19:46:02 +0000 Received: (at 68716) by debbugs.gnu.org; 16 Feb 2024 19:45:59 +0000 Received: from localhost ([127.0.0.1]:60236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rb49m-0005RL-Jm for submit@debbugs.gnu.org; Fri, 16 Feb 2024 14:45:59 -0500 Received: from mail-qk1-f175.google.com ([209.85.222.175]:56533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rb49i-0005R6-Gj for 68716@debbugs.gnu.org; Fri, 16 Feb 2024 14:45:57 -0500 Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-785d57056b0so129728585a.0 for <68716@debbugs.gnu.org>; Fri, 16 Feb 2024 11:45:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708112669; x=1708717469; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Yclrp8pQsD9qJ0JFLm7LvJ2fm7LnaXepHgIfSkHheHs=; b=lqI2mg8OYIAh3QKK14iNivlS8YMgJkGIMGi5l9BzTB98pvb7VX6KUhe41mxpDAwx8f 6DMmdxQycJLuhMfmQyBrdhiimF1Jj1xx0BOBfZGQ9p0jhKJG3z56XnUI1xcw3eBnvvmH RXNu2io5hZeQ0Smd1BCWank1aYXmYxR2BVqVS2KQqBAbLuwbQ+rZpek8Hz0HN2JXeTK0 ObDHIrnxzHDDZUsv7IBy1tmaGVuqTl1720Df6isRPRjyNm7vbQyFrb/+KBTT+0GcOj47 He9taqnBPF6IkW2CaZtDNI47IC+SfMBTyMNj9iIqXQ6FN1Ri8zvrkzhd0RPg0w7SId3f /naA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708112669; x=1708717469; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Yclrp8pQsD9qJ0JFLm7LvJ2fm7LnaXepHgIfSkHheHs=; b=XJD0/0KavbVzA2oE5wrR5Q1oHrjtwHYgi0yrazTJmn8cvxHo60eaVzkG279fKlp0kc hi/3dkIG1nq1vUmmDGnRu6NpU86GQ+xJLuX5KATzwqyUct327ACd1rfyqQqURwyrNy3e 5uDvVFhVGWgzguDPsQPeU7cfM790wyeBSUC+ywQeKPduGisLxxcq8/K159lAnBMZX0OL i1Ru/9dofkKdPDjrYkHAM7VkTyozqsz66uH/NnkniXIEty2i/1U9KIga0oDdCxc2NxHe oOjREiROsqUt7RL6xQJjOX3MVumV3QBSaun5n6NqPvslpCbTV/qOGEeqbkyLePDI86kv abQg== X-Gm-Message-State: AOJu0Yw+dMK+QX8KdWpmunpR2JSAAJvacIqAvbUnFl6Qamw2bY7ZA7Nu vmvAMqJ5hKZj3MVntcn5m3b8I0zw3Swr9WBWvFCVWEl51+RNgmIk X-Google-Smtp-Source: AGHT+IF7XgrMk4wehyiSG94sOOA4AaHgDVvCSjI9vsVrgxLQcs7e5MkIiwjpn693+5O3tQA8OJcx8A== X-Received: by 2002:a05:620a:4915:b0:785:5fde:bf32 with SMTP id vy21-20020a05620a491500b007855fdebf32mr6394020qkn.68.1708112669471; Fri, 16 Feb 2024 11:44:29 -0800 (PST) Received: from hurd (dsl-148-13.b2b2c.ca. [66.158.148.13]) by smtp.gmail.com with ESMTPSA id bs31-20020a05620a471f00b0078726d8637asm227250qkb.122.2024.02.16.11.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 11:44:28 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> (Liliana Marie Prikler's message of "Fri, 16 Feb 2024 11:53:43 +0100") References: <5e0b95c296a3abfe2da6c1828dfbbc1a47886083.1708087345.git.liliana.prikler@gmail.com> Date: Fri, 16 Feb 2024 14:44:27 -0500 Message-ID: <87mss0ry78.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 4.02 X-Spam-Score: 4.02 X-Migadu-Queue-Id: 5A9BF3062A X-TUID: 719F6IyE0CHq Hi, Liliana Marie Prikler writes: > * 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 | 179 ++++++++++++++++++++++++----------------- > 1 file changed, 105 insertions(+), 74 deletions(-) > > 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) It'd be nice to allow any kind of extra fields to be appended to the package definition, as done e.g. for the make-openjdk syntax. > (package > - (name "gnome") > + (name %name) Nitpick: I'd use name*, as %name is often associated with globals in Guix. > (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 I think it's misleading to associate GNOME with GNU at this point in time. They aren't even a GNU project anymore. > +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)))) With the make-openjdk like change I suggested above, this could be expressed without using inherit as: --8<---------------cut here---------------start------------->8--- (define-public gnome (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 '()))) --8<---------------cut here---------------end--------------->8--- which I find more pleasing to read. Otherwise, Reviewed-by: Maxim Cournoyer -- Thanks, Maxim