From patchwork Fri Jan 24 11:48:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37662 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 5DAC427BBE2; Fri, 24 Jan 2025 11:50:52 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 8F2BC27BBEA for ; Fri, 24 Jan 2025 11:50:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbICX-0002zg-5b; Fri, 24 Jan 2025 06:50:17 -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 1tbICK-0002ru-1E for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:06 -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 1tbICJ-0004uD-8E for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=G0pFrGRU+l3OUv6jzmc+1X2Bf3ebfPhW1Lvzjm9xOFs=; b=oWZdJexkwsuEa7fSS8lpR90ZVJ0BGyGmDqVtN1Bm4jJ6lsQdDMY4zmvFQmd54XKX1TnxLmx9V6fMtws0uHLVKoVzUPUyZVqx9EpO8d/eBSWkV4HI4z1NODo2N43tcaKbLDyZT3qxWkXK1aLYTlBD0i4i5IOhJbgVwQUgc9Um4Qsgrw6Odt3o0xxk0A1fnFXxMfxTJsJMdA0TSKTnEr7i1We1cDNjGpCo+BslEiAoDhkeXL6QODHvKEOav8So3iTd/H2z6nEdzgDAxADAJSsk9n+uWoxV13WlO0tuL6vmKQc9lc0yRFv0whI5HMNap7fh/Bq8uy4cpO5v/SJWtXHL/A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbICI-0000gT-UZ for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377193872532 (code B ref 68150); Fri, 24 Jan 2025 11:50:02 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:49:47 +0000 Received: from localhost ([127.0.0.1]:43908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbIC2-0000ea-JN for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:47 -0500 Received: from 8.mo582.mail-out.ovh.net ([178.33.42.204]:54927) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIBz-0000e8-LT for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:44 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.9.29]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhP2248z1JrJ for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:41 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-k7h56 (unknown [10.110.113.120]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BE2481FD33; Fri, 24 Jan 2025 11:49:40 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-k7h56 with ESMTPSA id y6L1IFR+k2dSbgAAlJxeSg (envelope-from ); Fri, 24 Jan 2025 11:49:40 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002e60afb90-94ec-4eaa-b501-5dab90be2950, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:21 +0100 Message-ID: <20250124114934.24600-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9103182225026966033 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeduhedtseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=G0pFrGRU+l3OUv6jzmc+1X2Bf3ebfPhW1Lvzjm9xOFs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719381; v=1; b=3DZlKcbFZtZS0LgxOAcDMCAraYgDyABP2vAuHkds7SUpsjmrn251TLhZUV02URCYuCjWGZs9 SHSXPDd/3shZYThMRfBrQqVdrIsyydLGo9ZGEElb+FGsVaPBgoNrwoVo6S5ra9NCmIK/o/Thp6Q oXMb8yhwCUzL9IXSbNSV6MEIULOY1CFTH4OxsHW2bmjWGgPgOtASEPVVQh3NrygAuk79lutEWtF lEm9DkVxGrbV9xmpmeaUGdA939VtgLOOcC0doGi/V9rGqSdln9zjmGXFtPNkwW5v1UhscrLUUV6 YfQsXRC4W8WhD1aXqVJ6tYOyHJMBFpTXRRjOuXUP1jvGg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> The list of modules used by default was not public, so users of this build system had to pick between copy&pasting the list, or using %glib-or-gtk-build-system-modules. The former is sub-optimal, since it is hard to keep it in sync. The latter is just wrong and leads to basically fall-backing to gnu-build-system. The solution is to export the default list giving the users option to use it directly. * guix/build-system/glib-or-gtk.scm (%glib-or-gtk-build-system-default-modules): Renamed from %default-modules. (define-module): Export it. (glib-or-gtk-build), (glib-or-gtk-cross-build): Use it. Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d --- guix/build-system/glib-or-gtk.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 5d026ec5ab..6c69a950e8 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -30,7 +30,8 @@ (define-module (guix build-system glib-or-gtk) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:export (%glib-or-gtk-build-system-modules + #:export (%glib-or-gtk-build-system-default-modules + %glib-or-gtk-build-system-modules glib-or-gtk-build glib-or-gtk-cross-build glib-or-gtk-build-system) @@ -64,7 +65,7 @@ (define-module (guix build-system glib-or-gtk) ;; ;; Code: -(define %default-modules +(define %glib-or-gtk-build-system-default-modules ;; Build-side modules made available in the build environment. '((guix build glib-or-gtk-build-system) (guix build utils))) @@ -144,7 +145,7 @@ (define* (glib-or-gtk-build name inputs (glib-or-gtk-wrap-excluded-outputs ''()) (system (%current-system)) (imported-modules %glib-or-gtk-build-system-modules) - (modules %default-modules) + (modules %glib-or-gtk-build-system-default-modules) allowed-references disallowed-references) "Build SOURCE with INPUTS. See GNU-BUILD for more details." @@ -219,7 +220,7 @@ (define* (glib-or-gtk-cross-build name (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %glib-or-gtk-build-system-modules) - (modules %default-modules) + (modules %glib-or-gtk-build-system-default-modules) allowed-references disallowed-references) "Cross-build SOURCE with INPUTS. See GNU-BUILD for more details." From patchwork Fri Jan 24 11:48:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37659 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 9683127BBEA; Fri, 24 Jan 2025 11:50:29 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 CE9E227BBE2 for ; Fri, 24 Jan 2025 11:50:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbICS-0002yi-5D; Fri, 24 Jan 2025 06:50:12 -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 1tbICK-0002rt-0T for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:04 -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 1tbICJ-0004uG-HC for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=S5VE2w5BrrcfFG2xzNDZ+PH6Y/EdgG+rCFApD2MpiAA=; b=WdAmL0nC+yz2ORuu1oRuEJHmqSzq638MUcMgxig+CflAUtQJh9hnXcgJctU5OyTIdgOgTs3uOdyOCjgAsuG/Wdyr7JS5/osgElZMMJ5Qgwh0T7olh7Fg392ZF4UtkAgat3L1nC1YX+Xnm409JbYmQKeKg2ig3qFY2Bd7nIzQZLYoLX/m0I7/84YUyzsoXAVk4fh9zy5WawzsQFYajHtJYUplWHT6n88/twcLxyNoaFB5cY9r/gsKEyY62Q1fkw9d1zpW6zQCcAfOtyobHnwZ6sedWiT1/KLNLb8afW/uT6g5hTU+HiEoy8Y4MmucewC1PxISkayheOCvCloRX8vFuA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbICJ-0000ge-CU for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377193992582 (code B ref 68150); Fri, 24 Jan 2025 11:50:03 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:49:59 +0000 Received: from localhost ([127.0.0.1]:43920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbICE-0000fZ-7X for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:59 -0500 Received: from 19.mo583.mail-out.ovh.net ([46.105.35.78]:46639) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIC0-0000eB-JL for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:45 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.9.101]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhQ6QLVz1XVt for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:42 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-w4zd4 (unknown [10.110.178.109]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 10E451FD6A; Fri, 24 Jan 2025 11:49:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-5b5ff79f4f-w4zd4 with ESMTPSA id WFGIMVV+k2ft5hMAlKzBYQ (envelope-from ); Fri, 24 Jan 2025 11:49:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R006460fda66-9e6e-4d8f-930d-eef12ad76909, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:22 +0100 Message-ID: <20250124114934.24600-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9103463699717087761 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeeggecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekudehtdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=S5VE2w5BrrcfFG2xzNDZ+PH6Y/EdgG+rCFApD2MpiAA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719383; v=1; b=ymsdzfT+hUBgzS8637VghsKzAAgO1kC2rPx+6OR3UwdLWiBnSgpir+P/5une7PVHQ4Iiu82J VC7Z/QjAXFUpYT6yB0+aOMI/IW0dgo/tLeSRWAphY4tWbNxKaaDTm9L7vvhot6FHaVMz+Qmo+XP jz2Clz2rYbsLeaPpwvdnXsuvxeVZF/+C1ZecKRBpY4YDB3Pxx/dFvyH4X9lDqmVGy6R9b9ICLAT GxTSrmvQUpFDhg+jct5uMnR2QYv98VcLKmFuo3eVDwVjDmBOvLbU5tFaFH41Jt6lJspv/0OLXtn 7Ldd+9JXq9okxUNWE3fAw4bIx6pDJZ2tD0JNfAzOPO4qw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> The #:modules argument was based on %glib-or-gtk-build-system-modules, which, despite the name, should go into #:imported-modules. When put into #:modules, it leads to following warning: WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system) Due to the definition of %glib-or-gtk-build-system-modules `((guix build glib-or-gtk-build-system) ,@%gnu-build-system-modules) It results in %standard-phases from gnu-build-system being used, effectively turning glib-or-gtk-build-system with #:modules set to %glib-or-gtk-build-system-modules into gnu-build-system. The solution is to use the (now) exported default value of #:modules (%glib-or-gtk-build-system-default-modules) as a base of the #:modules. * gnu/packages/web.scm (netsurf)[arguments]<#:modules>: Use %glib-or-gtk-build-system-default-modules instead of %glib-or-gtk-build-system-modules. Change-Id: Iacc4df7e213dbdae5a783e3aedde7e6e20402025 --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b781c13b62..58384a193f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6344,7 +6344,7 @@ (define-public netsurf (ice-9 match) (srfi srfi-1) (sxml simple) - ,@%glib-or-gtk-build-system-modules) + ,@%glib-or-gtk-build-system-default-modules) #:phases (modify-phases %standard-phases (delete 'configure) From patchwork Fri Jan 24 11:48:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37661 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 B7E3227BBEA; Fri, 24 Jan 2025 11:50: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 4AB7127BBE2 for ; Fri, 24 Jan 2025 11:50:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbICa-000300-LV; Fri, 24 Jan 2025 06:50:21 -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 1tbICK-0002sX-DA for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:09 -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 1tbICK-0004uY-2W for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=sKtjzjRzU0/8AA13LlR56ol0yWGXA2P5IsB1dYwS9vM=; b=ealxIXRjzp+do/bM7JIzh722B4Stp4dbY74P/1eUYU9T5tRcVvFlDVSzhWbXEW10PBmJ18bcYcyCLsuB5fjEY2ZQY2UTbJX19zdAwHZR2VfYJU5EsM2UDkjurnAtsdUpWsljQhN2JyKoDMsLScKSBz5IIuZMWpsi7VlXyi1+tAM3fejuNlgf9l+Vm/cVoGpDS0vY+1E14csoOJwehjYq+q6RvRpUh6OLiiDG3ZwG3XqIUgcq1CqPvtgrZSbvb72DsIFgCfgYRqEq+UZkErFi88z3S9lU1LGuE51b/S0Rt/mj/OcvIY0Vf+zwCjHt+dR3j8vn3IbBRHHZ4Z1z3oAY2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbICJ-0000gl-TQ for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377193992590 (code B ref 68150); Fri, 24 Jan 2025 11:50:03 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:49:59 +0000 Received: from localhost ([127.0.0.1]:43922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbICF-0000fg-BB for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:59 -0500 Received: from 17.mo583.mail-out.ovh.net ([46.105.56.132]:59029) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIC1-0000eD-FP for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:46 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.148.146]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhS0MH5z1Xyd for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:44 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-ccj92 (unknown [10.108.42.75]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id AF4A81FE62; Fri, 24 Jan 2025 11:49:43 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-5b5ff79f4f-ccj92 with ESMTPSA id kN6pFFd+k2d5hQAAHCxTvw (envelope-from ); Fri, 24 Jan 2025 11:49:43 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G0064b7b6814-c630-4334-b685-c8c21dc0d3aa, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:23 +0100 Message-ID: <20250124114934.24600-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9104026648566948369 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeeggecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekudehtdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=sKtjzjRzU0/8AA13LlR56ol0yWGXA2P5IsB1dYwS9vM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719384; v=1; b=Hid1kVDOGN+F7xukvp+XNjv71W0OBJHgjm4Accs2F5JpldttGmaIY7mXw0MJG/I5ytDYtB3Q rueMhvti64h2dauppohVujF1tAncQb64w+/PVyUmurzssAMbGB3v8YtMs3WF7mnj18KqBrYnCya CkBr2j6AriGM17X3kFOTc0echAua1rkd0l+pdsAq/yn8R+Cnz+nZT1zDNnLyVOxNQJm2Kq2d8BG kwAAiss4MQPaXjN+G6Jnj1dZl70Le8BO6GqwmQDYDWo72melGR3NJ9iK2aLmlb49vB5BpWhaim2 x9N0D0XpSkN2mUiEav1zmrcmkCFXlSsJZfU+Wyi/Ei9vg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> The #:modules argument was based on %glib-or-gtk-build-system-modules, which, despite the name, should go into #:imported-modules. When put into #:modules, it leads to following warning: WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system) Due to the definition of %glib-or-gtk-build-system-modules `((guix build glib-or-gtk-build-system) ,@%gnu-build-system-modules) It results in %standard-phases from gnu-build-system being used, effectively turning glib-or-gtk-build-system with #:modules set to %glib-or-gtk-build-system-modules into gnu-build-system. The solution is to use the (now) exported default value of #:modules (%glib-or-gtk-build-system-default-modules) as a base of the #:modules. * gnu/packages/libreoffice.scm (libreoffice)[arguments]<#:modules>: Use %glib-or-gtk-build-system-default-modules instead of %glib-or-gtk-build-system-modules. Change-Id: I5304d9993af7d5f1187c6276e72a269aa60f5666 --- gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 22112ccee7..e61ed11143 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -916,7 +916,7 @@ (define-public libreoffice (ice-9 textual-ports) (srfi srfi-1) (srfi srfi-26) - ,@%glib-or-gtk-build-system-modules) + ,@%glib-or-gtk-build-system-default-modules) #:tests? #f ; Building the tests already fails. #:phases #~(modify-phases %standard-phases From patchwork Fri Jan 24 11:48:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37660 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 DA26427BBEA; Fri, 24 Jan 2025 11:50: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 60FAA27BBE2 for ; Fri, 24 Jan 2025 11:50:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbICS-0002z2-AD; Fri, 24 Jan 2025 06:50:12 -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 1tbICL-0002u9-Iq for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:09 -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 1tbICL-0004un-06 for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xyJrJbpiOoIvpnaFxNB/x4rQpMKIx6rPYNlDE1FpvBw=; b=DImfEPrl64T64iJdD7POm0ONWUNzE2zyD/B3oLJeF6w6OnvDcYhu8xf5N1261Nf7PCt7teiNpkwdfRb0zWMK+++r+69878XdNvVM/LN05ZyOxA2RPBSwuhnzmtgSZ4vsc4ry51nPOip5YIq9wr2YTk3Au7Nt7ZYMQqeHrXi5kkPEuWNgALGeCVLJeZq3AsHstzmWjfQGf2385Ntc/BmMdQQLZsYd8cbkw9P/UPF3FGJpMeBXAaw8iXC+BeR6E2/t7hqqKFrF6FH8Tr/oiUNweKbn+L2k1BRRb0+p5qTU5qU7VXcvj5DkrbAz3a79DFNznF9DIA7HhQfyLE/90HdJ9Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbICK-0000hC-QC for guix-patches@gnu.org; Fri, 24 Jan 2025 06:50:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 4/8] gnu: sugar: Dehardcode #:modules. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377194002597 (code B ref 68150); Fri, 24 Jan 2025 11:50:04 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:50:00 +0000 Received: from localhost ([127.0.0.1]:43924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbICF-0000fj-Mx for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:59 -0500 Received: from 4.mo582.mail-out.ovh.net ([87.98.184.159]:41045) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIC3-0000eR-10 for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:47 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.9.153]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhT08Jyz1JFl for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:45 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-g2jbb (unknown [10.110.188.109]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B1FC01FEBD; Fri, 24 Jan 2025 11:49:44 +0000 (UTC) Received: from ngraves.fr ([37.59.142.113]) by ghost-submission-5b5ff79f4f-g2jbb with ESMTPSA id S3k8I1h+k2cmZwAA6/TkjQ (envelope-from ); Fri, 24 Jan 2025 11:49:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-113S00733755dfd-c07b-4cda-ba66-30228bc49959, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:24 +0100 Message-ID: <20250124114934.24600-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9104026650187391505 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddufeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekudehtdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=xyJrJbpiOoIvpnaFxNB/x4rQpMKIx6rPYNlDE1FpvBw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719385; v=1; b=zqS+I7F6Iab+e0DyZvy/IzhQ6taoLTuxmrblLajipOScRDirshpZDre8Y7yAz2v1FAosmJrl D6I8ClEM3YvirEfrPvs8InQ98xY7GSocA1LovT2h5DgLttRo2DVKYInGjCbhh2RFbpzOBRIp1yW VLsGwOyDFDSN97xR0JRvtcuKb4GGF7PiBTXUBT2F4m5DF5obhmTv/Ot8zXgRPKrDzJJs9o/gz4K JUw8MFIOoSDv/6TOxGbDiIgWByr8KwoIoGWUiycmcbvl+FQIti8nKlixxZ0nKVmR1ElRPnrdKko /Lih5f+1Pp+r7MZxvvZGNXzL8KmHJu/eLaszMjrxqckaw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> * gnu/packages/sugar.scm (sugar)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5a98d356c3e1a32b71e7949e3425da74081c1e82 --- gnu/packages/sugar.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 9a82b5fb20..e53d8404e6 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -74,9 +74,8 @@ (define-public sugar `(,@%glib-or-gtk-build-system-modules (guix build python-build-system)) #:modules - '((guix build glib-or-gtk-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) + `(((guix build python-build-system) #:prefix python:) + ,@%glib-or-gtk-build-system-default-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-build-system From patchwork Fri Jan 24 11:48:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37666 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 D5EBF27BBEA; Fri, 24 Jan 2025 11:51:30 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 9F88D27BBE2 for ; Fri, 24 Jan 2025 11:51:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbIDK-0003Kh-BM; Fri, 24 Jan 2025 06:51:06 -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 1tbIDI-0003KN-4V for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:04 -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 1tbIDH-0005EC-S0 for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=5+OUk7SVCTvagA4qfGy8jHGnoSzFYnOGfnLt8VhU1fM=; b=Pm4AfMwjSKO9PQyLzkPSaesxH/AJXEUE1A54kvj1/WrbE3WYv40RwlPk/VJzmqtl1d3Vu5KkWzkpc25LkUhLPm+3sdKNTXyjVP5ceUnHGt7nMH3464HkdiNqTTKeHRIFWh5zSxX0R64w/ScEuwSh5QBp1s/lN8iJ+3jc27D7UMgdBy6plJ3/c/80KOvXMiAOBAyvnWM3FTPvnZlROYfjx7OskhGIUHzfVTezbcG7xa0A34pn99T5LdJtl1X6pSpcrBVkhK6wV8qUgo8/EchqqNPLIvb1wi+DW5XI/329y8f31l8zzmMTfUoJc1FYJ1Wa6Fx+X93P3XOgfXC+pH/rbg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbIDH-0000ox-Md for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 5/8] gnu: sugar-datastore: Dehardcode #:modules. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377194173059 (code B ref 68150); Fri, 24 Jan 2025 11:51:03 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:50:17 +0000 Received: from localhost ([127.0.0.1]:43940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbICW-0000nB-Jp for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:50:16 -0500 Received: from 7.mo575.mail-out.ovh.net ([46.105.63.230]:60287) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIC4-0000ep-Fv for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:49 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.148.110]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhV5X1jz1fBJ for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:46 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-hd2bf (unknown [10.110.164.243]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C11441FEF3; Fri, 24 Jan 2025 11:49:45 +0000 (UTC) Received: from ngraves.fr ([37.59.142.114]) by ghost-submission-5b5ff79f4f-hd2bf with ESMTPSA id JwXRIFl+k2cmiwEAA5fH8Q (envelope-from ); Fri, 24 Jan 2025 11:49:45 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S008cf27bc6c-8fcb-485e-a2a2-99541404d18d, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:25 +0100 Message-ID: <20250124114934.24600-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9104589600233021969 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddugeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekudehtdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=5+OUk7SVCTvagA4qfGy8jHGnoSzFYnOGfnLt8VhU1fM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719386; v=1; b=NLDbvcdq3Yi+vXykW4GJrD/k4kfYKnhIrUbDj8hM6StKSitu3a4/g2Sh+Hjise5+UHnwwzkC TVTpc/DxRqCxi5OhU+EFWrocsIM06ozX+VRM5uQ0nyCSiDkM5JXQ8JaKW3MyzfTHvCMWz4fo6gl N6Ywzu/hvYT9zLnjjOmBIFsKSxMyVCoBVS6mW2e/pWuIA7Wz9BPnZlzXOgJk7drSiNv9AiP03ZV 26+b/dVpchLrIJC9MnAnBdkHKfUTkl7t82d4NdJxj0EllsS8y5g8MkltJdn7KEvqhROIc96mIfk wC8Rxu030fOKvvwObzTv0QQtqtMUeWCKfManAKpd+japA== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> * gnu/packages/sugar.scm (sugar-datastore)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I9ceadd163d3f6cd49ed2623b6060b223257e9aed --- gnu/packages/sugar.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index e53d8404e6..c66ca1692a 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -251,9 +251,8 @@ (define-public sugar-datastore `(,@%glib-or-gtk-build-system-modules (guix build python-build-system)) #:modules - '((guix build glib-or-gtk-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) + `(((guix build python-build-system) #:prefix python:) + ,@%glib-or-gtk-build-system-default-modules) #:phases '(modify-phases %standard-phases (add-after 'unpack 'patch-build-system From patchwork Fri Jan 24 11:48:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37663 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 C00B427BBEA; Fri, 24 Jan 2025 11:51: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 8561227BBE2 for ; Fri, 24 Jan 2025 11:51:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbIDI-0003KR-8g; Fri, 24 Jan 2025 06:51:04 -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 1tbIDG-0003Jq-Qx for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:03 -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 1tbIDG-0005DV-FL for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=EyWQ75k+98xyosjqGTeijjYHOH46TpMZxmoA3dS5000=; b=Ue9sh4VgGpvDuAKHFv7ykz8Ztq9xTRreenl6SuL31emc2/O/gceQ4oQd889m+FOVEaMjjP0LoNLrYaXp/BTz4Dtg0uX8d5VdfUaWy+lFOyzWY45nwYElSrS+zFSva4cGzEfWQ3BPp/uq2y8AGA12vbngio3Wv+swB5tNs0SkPd5aiK7SvjNU+YVEPlM0npiOzx5kFKoqpK8sh3HqkAHyXbZ12Tewh4x0IZyK9cDUAvKEPzelkxwQYABrz9iPWnHFlvL5oh76mO2QLZBuWdm9gYfnJFpfhfIvInU4fe64oCZY0Itznd3iPNTz4/yL9/nFQu8QHkuFRGvKZFdpLkFjmQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbIDG-0000oa-Ag for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377194153037 (code B ref 68150); Fri, 24 Jan 2025 11:51:02 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:50:15 +0000 Received: from localhost ([127.0.0.1]:43934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbICV-0000mu-3U for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:50:15 -0500 Received: from 8.mo576.mail-out.ovh.net ([46.105.56.233]:37763) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIC5-0000eu-2H for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:49 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.2.21]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhW4Kxbz1qnn for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:47 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-4xk79 (unknown [10.110.96.204]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 424441FEC9; Fri, 24 Jan 2025 11:49:47 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-5b5ff79f4f-4xk79 with ESMTPSA id T4AjCFt+k2cZkgAAWp0NiQ (envelope-from ); Fri, 24 Jan 2025 11:49:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G0017dddc54e-0e17-4d35-a578-4ccb80dc5716, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:26 +0100 Message-ID: <20250124114934.24600-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9104871075390415377 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeeggecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeduhedtseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeimgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=EyWQ75k+98xyosjqGTeijjYHOH46TpMZxmoA3dS5000=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719387; v=1; b=pHrB1nJqgLXieZLzmnWpc7BVI/hHj1ivrQueTTpRxRwgMYGTxkIHYKDlNneJRekLzr9wntv6 fl8VAyUGvQ6H6aJreSZOGADsoZ638aU2VS+oROiGX22n1A6FAMUstMivFv9EB/mSUjTXo146iet B8VVjXjVfRgK0ndJD8T+F36HEMIuFku7mRF5y0/0gpM2glxORBTFVeNXs2H2g3U3MDHR4nvwFgm 5zPKawsl6iCFnGX8TFzngo4HyZTJIjRbrjqUED/juwRJ5hZacCYXHjjsL5jKGu3p7ZRLLCgC6SE X6gag+KIAWMOoTK3I2DkngOSy/bzG7z5+LkA8IU0F9obQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I6a5e4511d2e696a673f7d5b49f75285ee488223d --- gnu/packages/sugar.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index c66ca1692a..2bf1377b66 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -320,9 +320,8 @@ (define-public sugar-toolkit-gtk3 `(,@%glib-or-gtk-build-system-modules (guix build python-build-system)) #:modules - '((guix build glib-or-gtk-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) + `(((guix build python-build-system) #:prefix python:) + ,@%glib-or-gtk-build-system-default-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-build-system From patchwork Fri Jan 24 11:48:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37665 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 45E9627BBE2; Fri, 24 Jan 2025 11:51: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B8ADE27BBE9 for ; Fri, 24 Jan 2025 11:51:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbIDI-0003Ka-L4; Fri, 24 Jan 2025 06:51:04 -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 1tbIDH-0003Js-6q for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:03 -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 1tbIDG-0005Df-TE for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=PGku+8KUU6f4Jpw68nII8YP20w1MtRr1HFB09U3tdnk=; b=OHCZctiInH8ZqVmUlnICMRK69P2mrAmpYVErn4NAoO3ot3Mh5PPDP4z+PFK9TTSMJW42zIcvRoFjZ/iPExOu673RwVz37LFRdQfU3LvTlOEhbA6KhRfHnBr6ug7lVAMqO9GXgkhEVDKw/NmSmibpKXenUqbNtvTLpmR5+meQ8gP05VYFLrTt9PWkLhajOLs4q9fISBUga/6yJwmZESnj0R7y54ITswSaBixkX5fTP0P5DSWBRQlrHaudJXZdAPCI+JI9P6So116FziSlHwZTNmLogDH4S6fHMijBw+Z6H9wTLaTQjuc4T7TycMadoYCn5XEv9Hs9PFYLj9fatc00gQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbIDG-0000oi-P9 for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 7/8] gnu: nimf: Dehardcode #:modules. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377194163045 (code B ref 68150); Fri, 24 Jan 2025 11:51:02 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:50:16 +0000 Received: from localhost ([127.0.0.1]:43936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbICV-0000n1-SW for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:50:16 -0500 Received: from 12.mo561.mail-out.ovh.net ([188.165.41.191]:47677) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIC6-0000f0-4A for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:51 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.25.166]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhX2g4Dz1Nmq for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:48 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-7st7t (unknown [10.110.164.164]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E0CCA1FDB8; Fri, 24 Jan 2025 11:49:47 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-7st7t with ESMTPSA id aIMbMVt+k2fYbwAAkFM93A (envelope-from ); Fri, 24 Jan 2025 11:49:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0040ee4a7ee-6ebf-4e19-805b-deb8bade9c79, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:27 +0100 Message-ID: <20250124114934.24600-8-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9105152550315418129 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekudehtdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=PGku+8KUU6f4Jpw68nII8YP20w1MtRr1HFB09U3tdnk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719388; v=1; b=UoPFjYXaGWHzN2rlsb4lwfCymt1hvoGGBfXoEILd4Fs2LOFAzS4OUs3aggDCv6I21zNo2VKK QimZMAXDqbnhIuxTtXbUxt5s7W/D4TnmClqBBH77M3ZwQKswJP0BjggKOc5exPxmx1I/PGzkHss J8zWps6y02EH93pWINKqgYwE3UNWsWIxzaSM5uWKFnd75i/g5/SAGbsRwjIdxjNo6kh7uG3n7sE i6zL6ryEOFokk1t0AWubLgmJSx4yS5lWLNk3JPBBTFaqM3fX/N8JYHYmSkM/2pXcMk0LmCqaL4q HtkAIMhrkgn5qHh/8KN6erhmUED3iq6O5wzI0E2b0AJDA== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> * gnu/packages/language.scm (nimf)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5eaaac4cdd50b635d24b10c7fa2d365dcf392498 --- gnu/packages/language.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 6facc27174..cc76164f41 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -108,10 +108,8 @@ (define-public nimf (guix build cmake-build-system) (guix build qt-build-system) (guix build qt-utils)) - #:modules '((guix build glib-or-gtk-build-system) - ((guix build qt-build-system) - #:prefix qt:) - (guix build utils)) + #:modules `(((guix build qt-build-system) #:prefix qt:) + ,@%glib-or-gtk-build-system-default-modules) #:configure-flags #~(list "--with-im-config-data" "--with-imsettings-data" From patchwork Fri Jan 24 11:48:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37664 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 736B827BBEA; Fri, 24 Jan 2025 11:51:19 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 3B8EB27BBE2 for ; Fri, 24 Jan 2025 11:51:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbIDI-0003KW-Kb; Fri, 24 Jan 2025 06:51:04 -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 1tbIDH-0003KE-L4 for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:03 -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 1tbIDH-0005Dx-Bw for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=HTb4bw4r+g29RWDV4hFmLdX4JD8GGl+PDucLqulivvw=; b=aQb/J31042t3No7FtO9Y6zcQTyuCJ4kbRsSzSz6XeB4fNJN2xn5Fl38AuNQ/6EZyv5yrib8NjKvxpuSm+LLnORDMhAKgOPYRFvte+qJ2Rm+8LD+jcm6WYnVjAKbSE9ISz5cicMNHormtHmt6NAfpu5M2RWD5u+T3JmskDI61nV0UmLeTT7X4napovIkv8CgmododFEpB1rohwYPBnUNBvSdBNW/TDAtFcIdHYrIK9VIMA6u8oczAWrlsWAo+jmcPVsQrnUyLWiO9uVumSrHQWip0BPX4Zm5t4gwVU58mEqeka6/NNBVr7dobBL+dbaPXTV0g+c32wvIBl7QP9k19TA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbIDH-0000op-6x for guix-patches@gnu.org; Fri, 24 Jan 2025 06:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v3 8/8] gnu: hime: Dehardcode #:modules. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 11:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17377194163052 (code B ref 68150); Fri, 24 Jan 2025 11:51:03 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:50:16 +0000 Received: from localhost ([127.0.0.1]:43938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbICW-0000n4-7N for submit@debbugs.gnu.org; Fri, 24 Jan 2025 06:50:16 -0500 Received: from 1.mo582.mail-out.ovh.net ([46.105.56.136]:55321) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbIC6-0000f3-DV for 68150@debbugs.gnu.org; Fri, 24 Jan 2025 06:49:51 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.2.21]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhX6zsJz1Kb0 for <68150@debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:48 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-gv9ld (unknown [10.110.96.141]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id CAE6E1FE0D; Fri, 24 Jan 2025 11:49:48 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-gv9ld with ESMTPSA id TjmkKlx+k2fCswAAEWtqOQ (envelope-from ); Fri, 24 Jan 2025 11:49:48 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0040910126b-a311-4e03-88a2-b0300dd6c6a3, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 24 Jan 2025 12:48:28 +0100 Message-ID: <20250124114934.24600-9-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@ngraves.fr> References: <20250124114934.24600-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9105152549975679505 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekudehtdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=HTb4bw4r+g29RWDV4hFmLdX4JD8GGl+PDucLqulivvw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719389; v=1; b=30aK74nt4lw4HiyJOq9ILBCEtilsAZ8QHqZwrTjeFRDEf+HGQqQQ9N5WqDJP/J60xO7wO8y7 JGN0AVwGpxvUQK7B+Zp0V9ParQLOB0+89lIrhhkQ6nKNpPUkL+mGV16a0iw/Pz3VUYCSnav1gka byZ4tjkaCdxFMpAuLC0HL7ETKstwIl00B0+FOyEJMUKpHKwEJBVug4O77Rbexw3PhmyoOeZTdgl y3+rRklZaFMfKPtPX64L4rUcvmNCBnRhf9Jp8y0Qj6mgPTM3IjdGtVM7i8Y6a+R8dh5Fihh8Rnz fe5nkTtfKSgfnZiW6N/imu7m2xFglMlA+rmANlX3ANPmA== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Tomas Volf <~@wolfsden.cz> * gnu/packages/language.scm (hime)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5360c0000173b293e9e24290a2e8eaed84e05750 --- gnu/packages/language.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index cc76164f41..1d45c7e180 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -227,10 +227,8 @@ (define-public hime (guix build qt-build-system) (guix build qt-utils)) #:modules - ((guix build glib-or-gtk-build-system) - ((guix build qt-build-system) - #:prefix qt:) - (guix build utils)) + (((guix build qt-build-system) #:prefix qt:) + ,@%glib-or-gtk-build-system-default-modules) #:configure-flags (list ;; FIXME