X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 0/8] Fix usage of glib-or-gtk-build-system Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:35:02 +0000 Resent-Message-ID: <handler.68150.B.17039540678067 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.17039540678067 (code B ref -1); Sat, 30 Dec 2023 16:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2023 16:34:27 +0000 Received: from localhost ([127.0.0.1]:44925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcI7-000263-90 for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:34:27 -0500 Received: from lists.gnu.org ([2001:470:142::17]:36680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcI4-00025n-Hn for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:34:26 -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 <ws@HIDDEN>) id 1rJcHx-0006Nh-4C for guix-patches@HIDDEN; Sat, 30 Dec 2023 11:34:17 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ws@HIDDEN>) id 1rJcHu-0006Jm-Vz for guix-patches@HIDDEN; Sat, 30 Dec 2023 11:34:16 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 11C682778E3; Sat, 30 Dec 2023 16:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954050; bh=8b+Q8F8394YtSjTt40Yfkftg6eoA8Lr4eRe3wesXelw=; h=From:To:Cc:Subject:Date; b=ONvaOR3eBaE5Ipxm7jJkn8OWc2GBw1jS3WPvoKTh+l+lYSZ9jloS2zCkrdx1r3x/3 zg17268JQ2WZ1UO4XN/Bnd7doC/3uglWfCC6GfVZJ/KeI88L+VG6guQ3oe3T/H0fBT Ai81k/rhPLKxfceYMHUPAYSuPHlk2h9xDlNgzA0Rsx7Nv8xqHD7EjNIOpzs7PLhAr+ IdB9X8VYgdcSgdipQQvVC2Xmo0/+Okdqz0RczjwH4mjNdKfu5XJJfacgxxrlbpn/fB yUnCllro9RhVMStXXLq+EvS7EV+fwPsiUwc4a/imfjnezUZVVJBfkZfNbX6nEt7WCU OYcloRia1M+KdizEPky0ydDOr7i/edkHzD5G+y0tSdn8sydXX/sVAB9GcY2L2W04p7 E8qGYeLkc8L67swxkkfXqt0l6XAFffdDfeDe4nFBxuhOO9qehdi1TDho2GWqOyUieR iIrzDCWULVw6dNprue8B8CTc3u6WwUjG6rMmwmY71gVLdg9wstXA6QT97u+7C8xBfi gYh5PKuPDB0BHtq+GxIhqcG7zwjWOnFPhAjUrQmwhoxdQQ+a4wcvMUUuPdu/WNoKqX 9e0xIlp9NKPfxludvCkx8yBF9vZbnIUQaXy+WT2rhULV8wGI/qoCWYeGp4l2dKs9kU SKmVGule9YzVqPCVdd3CFniI= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 3A90E279D16; Sat, 30 Dec 2023 16:34:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954049; bh=8b+Q8F8394YtSjTt40Yfkftg6eoA8Lr4eRe3wesXelw=; h=From:To:Cc:Subject:Date; b=VrOMfdxH9hSxB9A+ua/aIQkDaiYeXZH9CHkQzCifw5W+oay9ZkBraiY4Qtt5be+9G TR83+ZcGIy50zHctutCtbnePpRZzERy/BKbJKBjp9aYRVaZ+Fjqx8bSFSyXODz9uKj 1n7AX/1qy7A65ECBRuV5buEhFZQ3qXU79H2g2Y6BVW+N5VezUovjyssoCFrPWV8Bnl KsG2FKrYAxRqndm9j4P0/ZRpnnRoAVouHFF3jO6zpsIVmfhPim8mHYMwf59YKhl7CV 0V4SpJMwtROq02g7+70u/+ZXoRrFp8HGwfQg/gebw5z1SakQBnnWRV6HdO12tRGsIm JIUn0KuYcdQqFL6CYGWpb+/ElU5s77fwN/WAuNCt+lC0XtHn5TbJbiS2V6L2T2p2mT VWhE6amz64OPI5NfVR6qIwdnFUUnRatZu4kYnA71GaZ5jrVvHW0wWU88t2YSrR/dxV 70A4xdfCNczmlCXgBTH1IXpe4GeTSqajA5j33EIyY8F+YEA2ImojZ11wvDNLTuILmt 7u7nHkP8vCo98VUK3RVg7rtIy471ELZvz/ZLXCPKIObZBCLigGkMa43peJEsvOciEb zyqgWgjdnZe2/8Ryrm0TYSSTPq0RWJKrCFqhJx42liiA2RRIbGdsIe/qLZiv/y9Mnj 7eFYhdWtTkyN6oUQ5a5v/YUQ= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 41237f4a; Sat, 30 Dec 2023 16:34:08 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:33:36 +0100 Message-ID: <cover.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: softfail client-ip=37.205.8.62; envelope-from=ws@HIDDEN; helo=wolfsden.cz X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_SOFTFAIL=0.665, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Using glib-or-gtk-build-system requires hard-coding the list of modules in #:modules. Libreoffice and netsurf tried to use %glib-or-gtk-build-system-modules instead, but that lead to crashes. This series introduces new %glib-or-gtk-build-system-default-modules that contains the list that should go into #:modules. Using it in libreoffice and netsurf fixes the mentioned crashes. Other places [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) Using glib-or-gtk-build-system requires hard-coding the list of modules in #:modules. Libreoffice and netsurf tried to use %glib-or-gtk-build-system-modules instead, but that lead to crashes. This series introduces new %glib-or-gtk-build-system-default-modules that contains the list that should go into #:modules. Using it in libreoffice and netsurf fixes the mentioned crashes. Other places were adjusted as well to use it instead of copying over the list. That would be hard to keep in sync. Tomas Volf (8): build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. gnu: netsurf: Actually use glib-or-gtk-build-system. gnu: libreoffice: Actually use glib-or-gtk-build-system. gnu: sugar: Dehardcode #:modules. gnu: sugar-datastore: Dehardcode #:modules. gnu: sugar-toolkit-gtk3: Dehardcode #:modules. gnu: nimf: Dehardcode #:modules. gnu: hime: Dehardcode #:modules. gnu/packages/language.scm | 12 ++++-------- gnu/packages/libreoffice.scm | 2 +- gnu/packages/sugar.scm | 15 ++++++--------- gnu/packages/web.scm | 2 +- guix/build-system/glib-or-gtk.scm | 9 +++++---- 5 files changed, 17 insertions(+), 23 deletions(-) base-commit: f24b14767d362a84e6469682b4fe303b50f4b589 -- 2.41.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Tomas Volf <~@wolfsden.cz> Subject: bug#68150: Acknowledgement ([PATCH 0/8] Fix usage of glib-or-gtk-build-system) Message-ID: <handler.68150.B.17039540678067.ack <at> debbugs.gnu.org> References: <cover.1703953716.git.~@wolfsden.cz> X-Gnu-PR-Message: ack 68150 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 68150 <at> debbugs.gnu.org Date: Sat, 30 Dec 2023 16:35:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 68150 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 68150: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68150 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: <handler.68150.B68150.17039543338512 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543338512 (code B ref 68150); Sat, 30 Dec 2023 16:39:02 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:38:53 +0000 Received: from localhost ([127.0.0.1]:44953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMN-0002Cn-Vr for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:53 -0500 Received: from wolfsden.cz ([37.205.8.62]:38666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcML-0002CJ-Qq for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:51 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 2420A278F2D; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=wj3/v5IRzU9rQcRGrqhv/VgtLzrWX+Gsg8YK+i5qGxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KIZN1+oyo8L5O+RJIQ8GyZOyXF/f+PhqECe5XAlBBnYkkFr4gWAgNb6htKWh8kiaz aL6J35I5AXZuSuvL023S8062+ESWRP5LXXy9E3FeGBaeLccj61dwX/W9zfi/4nUOkN INAP4o/97jcXxrWb5M/EI/qYux9wk7/5RcoyJOWl1rv2Y3Nlpey4R8mrzLt4ZqAOfO Gco/n2ya38+VNL54Ms62erKryllVCQQj6/bYVKqCyaGS3rgjKgeot3hLdvelPlXchD 3lzYoLmQe1SwcjHG/WqnajU5paN9WvWWt7O/DJLKMqFdUnryV2iTl4G0Tl4FtR1ab4 iVaZk3KsNF7L8LWevoaOxxqBHINotSfz8u5X0lPmM8sipx8pUIjIijXgi8pN3fYBJ7 NcMoI6SiRsgNPUEYB3RKAFaowAM31q9d3Ky69Y9JQYdag0xF1IlveotPw913rKQGfJ aT/t5PambLOXxXxk6UjPDdpJkK1aCZjI4plW4sbzDQXi6OBDAujnEJQ+Kwz8SGBxLB MoZoo6abW+Rrzr8LivvUZuWzt4kN+TehRBOKm0agjCeod2MbGpoxliAZx62JYWBjQG 3q0s0SiNMgQRdc0Ir9sQjbSf4Su+5eks4oztQbCab7q4iDazE7MO30a28sYMLl5FNl 1A+iQhZ8DpBJ7dm6I75lck9o= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id AE5A5278AC4; Sat, 30 Dec 2023 16:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954327; bh=wj3/v5IRzU9rQcRGrqhv/VgtLzrWX+Gsg8YK+i5qGxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i3PVmhZBmhDupOBkmWHhf8tTrUCO/jY2X47guqBI0wJpy/EBOeYU+yR30kZeyr+T5 1mYS3+g+vgd6nSFiqN/NcddBS0IcIEg9/XBzxVwqt03LpvSDsHOIkpuUT1Ek8tFMmV xBDUMT93/iwccR5AZ9IHFD162J9YPmjo0RMI3xQT2xb+RE/lVv9RhVVN3dN19aqZfG Ns+gffeFUQT3/evlb/orZ+fE4bB6wVeFsapEB1CJMsJHuATMT7EAxy0YwROMplN1gu PWSHeI2O2sIyjwwKzsPvRLCFbFSPTa+FEhfcQLHafpAgXZHVTmTNEz6FImpY8zh7P8 s04sOjS5fgrL1ZAlAD8lJ6AFAD/BlUMSEt/HO1FRtW1o1T0Cq4M6h+1DMnfUUH3jHt sHkXhI70nLzp5dr1GgFCaOJzRNW9BB0a4cgY8RlF8ql9ALeHivyCxTX3XoMbkKiJ1C iAD87yuL5mVAYa4eanbcgCH+9ozCovNfOZktGSVcYYzQpAC0GNdL3UL+rfuV4wW9ON w6b7pkgKyzX+qBfGWcyoVmlk0oWoKn2+Wh2amA1oU3/u9HlMA6Wj3KEkTmOxYwy09c 5JDXYFwmUDWmaJVAPK8kC+DiF2EdaIDCSIanfc9cmk2nyOcOLFybMuSx9JAnN0mnON ifTseTqSjuQGqlYfCKIqBFxc= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f46ad944; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:36 +0100 Message-ID: <e48f4e3a570af8f37f131ca170d67f81a1542243.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) 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 67f59ca9f9..df476e7ccd 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5927,7 +5927,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) -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: <handler.68150.B68150.17039543338518 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543338518 (code B ref 68150); Sat, 30 Dec 2023 16:39:02 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:38:53 +0000 Received: from localhost ([127.0.0.1]:44955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMP-0002DF-9L for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:53 -0500 Received: from wolfsden.cz ([37.205.8.62]:38676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcML-0002CK-Qx for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:51 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 057FB278AC7; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=gHSutvC0eRKoQoXUagk8wSUz9F/tGh4XsdzT1wZqAlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fLSKVlQWLG7KksR9l40aJnu8EtUbPkmVZiPhrSSSxuFPOagzmKhAI7wUvWykjhEfn QaDh3N8yA39vF4afJFXm2SK6NZCBNuslAR86Nu7KSoXJWTNSXQOLb7Vp0GnAinPp2F KY74rMzC+YvjKHCdsD180EHPIOetl1tnlpgTOdcVXMBUaq7SQuoSb/kI4FfiIGWk6R 24HcaLNaO7+nH5ZxcTVmzvZsg15R8TPba9MXineCXg7gInqNjkrqglqIErAkoQNdc2 0b7I3xs+nuUrlt3DaXIQxNsoqv/phAZPmz9K4vZSI6prkbYYxSpTZgkWfaXz5uCeMj Kt1bZGAVLWIw5PsXOsx1PU7wDFS6cnljv5zrSDsniLbjpGLKTuDjG673jlzX7T7i6t /PEJi4ro+8mKcz3jFoUuS2UmoXOyBdSOhwNnUR+3nP83KYOoDWuvlUb8tKx87bTImK yWqMV6Gb+inep7pF+mRrrqpZ7u20aQ/88qya0FsVi2zuFX4tt1fSmuA3TF+CbdlEhY dn86FJ1KlZRvqEg4TgkSGJjpMJxGrGIwpYEzetcDPfHgBl9YkDiSbQuJqdvI0SO0Pv TjVeImHC8nRLr72sSivUuNKKn2mgPBKe6zGCONTFuStF/9q9OpALK+6MDR6xXVHFf/ viz/tAauSl+4uy3SNi51A6to= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 3B8B52776D0; Sat, 30 Dec 2023 16:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954327; bh=gHSutvC0eRKoQoXUagk8wSUz9F/tGh4XsdzT1wZqAlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lVBo5/Bs8cSWcyNUoHLBU7sYv0upHNyqvtFhVnIVPFc0icA1La7sltH5b6NMYRefv 7IVZTMAYfPn4zl/fF+97Yj+nz259NkTkEiHkqh8YcWhVfzokr7VGwlomQrWSYv2oz6 Ha39KgUvM2ZPXJ49zxSvbfQ9AutO2SlmV64znN2N6qkHZJVwVDq8so3bG3Vft0QUyP si09mtmjqX+5I3+zOFnUy1qRGltjPJ76B8mcKyOKD0y5TiIhOrXM74sTDF5Em9czRQ D8sOset27U/jCNuvg6MVQeEYyy+RL7cFnd3Xrt9GnbFLjBR58j52yx1983e2BeSK/R QlQOuhHVOXynxl/mu98wNcTPPD42fwPN9fUB/TBYkSV6AT1tAwLdI5l+yubokT0ooB XLe8lKPY53xgGPkKgwvHZZSuH2txnokMw0cSdcqzPWgUIjgPhFltjikNfhIDwAf2F2 kEDc1Oh5Te8Hwtk11t2F9aTudm7eji7KzzCYpenAnbgVibvFVXGuFZ1XUk3fvYuqd7 b1/qFX3jXKsnNh3xws62JjRkrXEtbbqmuXNTIfCjsrWOgVLcvYp9H+0G6WZPh/d/PO egvnzadL3FYeX1e2Vuqi9/FDDo2LdjwJZA1LzlJ8C14BY8O3T0onq6bguTRrA14wEF 574GBuuWjxQO6XS6evkUf0dQ= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 717c2e1c; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:35 +0100 Message-ID: <c005e76b76bf4f5775e6a6750bdf2fc583bf3de4.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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, sinc [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) 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 726d19efad..38a6eeb178 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." -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 4/8] gnu: sugar: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: <handler.68150.B68150.17039543408532 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543408532 (code B ref 68150); Sat, 30 Dec 2023 16:39:02 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:39:00 +0000 Received: from localhost ([127.0.0.1]:44957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMV-0002DX-Lm for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:59 -0500 Received: from wolfsden.cz ([37.205.8.62]:38692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcMM-0002CN-9P for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:51 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0D98B2788BB; Sat, 30 Dec 2023 16:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954329; bh=/iZuiWFPci+s1BZAPXIkjXTvwCczWiyN9DWkRqVR3d8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HYF5DNpIQeZwxPhdAL6rv64O7JNV/TzR3Ddpsq98CFeZ6e+PA1UZgHDTa2feO/rYk tmSJW9RDXU0eaC5B91JQc2jcJQy4lLU4Ma7SEKjTwxcyEDYIpEu/Vr7cNIrtEtPF3n 65nvDrPhQnjGBDzKzXyRVf95Ov/OFEWSxgmkmxVVQd9WsXTf7hjla91P/KKHjIN9dS fwELR6DT4Q2Oy85pPu5yke6KkSBXQ3puMVOQO8lyuJx3B2K8Opj+Gq43Wq3wZZxEzy bJJfkhTq+7uBXTztL5A/AeCxzE9djtSXu5NeG9Y/97PsnKiVx1iNSu0ewYwFE1IyWk nJJa0/vTweIoRBOFgJAouDn/Jg5IvLtweXn1SBgKQlN7iJdMuwLFaGJQY94zsMEzpn K77Gv2vmfLMDdQsAJkL7HNhXu1vUuhKtHKGXeDwAdr6wJl60ANEZMKYpmPfXq5G9AC pmp/S6mQCNTPEJdmfWzec6vkJCMzPdYIw5sCma4b/RYSKOG7HXJ1Eo9eh4DypiUk7k U4cpm801mRbh32nwJPKPN0FZynlW5A9wSzNUS8BMSazh36tJPQA6eCqkx/k/B2FAs9 bemx2OfCtFdQDJ6bw3KJ8LmZQNRsb17nSB5o7//RXBmogVRgjJCVFbsWbYMKHIe7vw VFuRY5bR/mqwsMqYQvsoy54A= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 9EDF027912A; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=/iZuiWFPci+s1BZAPXIkjXTvwCczWiyN9DWkRqVR3d8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qY0Gq1BcshfgKg7+76JXvgtCLyAnFh/TuqeD55dsIFORztJYPEZtPWeaIu5K0uBpy nPefGYe6nagIqYdgC1jWFkv9NjcAoeguM7CzfFGhIJSYogIkd/xPK+zqlCpUimttlF cQO8cSx8p100LB0hHtZ1THMDwTL+hxcClftfpocsQ7DAR40XDEUTO953Sl+iwNIZtH uOZ3f16muyXKnMVMwv6SnQrbBNHYLL6QZ43843hDUUmLb2P1D3hGnCSTk4ReYaBveM PDBGFFeTV0b54qFCY1MgCJw1d+4X+/hq6gcRtvNd/d6/s4fzIimxMzmMsbGxqRNjON JnW246FzA3K9QgSXgya1R5xXlmsTLh8F9msp1wZCEFGzY2rTvDkTaPdgZ/kKayrQ7Q OeDr4P2Zrjmj8xxjIZ3dCFzOqmKuIB+spieXgqfo1UiGic1gqxorAZhPIwheg+SHsI n0bmfX4YYMTs8/wu+GxnaD0GLx6L/fsIEvAQ36QcIho7vMIIvUyxkFZMpOP9DlY4C/ wj7g6VRTtZmg//G4Ei+gnbrDv9/DgHcmdCadqRgv9Sz9114GkVyGHSbFvao+2wfGiu G8GFJp4aupNA+x14Dc1MlFD70nhfU9y68nUis787CIWE0j2mvH61TZzbqEM8551iTK qpiq7AXzanGXnXUkUwZ6ryrA= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 47194c20; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:38 +0100 Message-ID: <a8fd8db36ca2c87c22c437a2c0b406d3fff52a62.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) * 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 4a0de1b55a..30f78c5576 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -70,9 +70,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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 5/8] gnu: sugar-datastore: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:03 +0000 Resent-Message-ID: <handler.68150.B68150.17039543408539 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543408539 (code B ref 68150); Sat, 30 Dec 2023 16:39:03 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:39:00 +0000 Received: from localhost ([127.0.0.1]:44959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMW-0002DZ-1H for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:39:00 -0500 Received: from wolfsden.cz ([37.205.8.62]:38696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcMM-0002CO-LP for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:52 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 646822790B9; Sat, 30 Dec 2023 16:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954329; bh=g+MKkDhp9lgiuhOsWOPBuObrS6UckM/I/nwQeXK3IUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xv2FDAPI0NPX7OWOa23uZb0JDLH+Kk3kdxsu6WHJNhSHc9hM7z95KXY9ncgIjfVv+ QpgZtIZofAg51NbGmTMHrDHjyoDELNTjO28hp67z/FgLjlbV7lXOjcL/nQ3PBQ7QpZ OPTc/uS+UIylL6YI0gy1RSl+Oe+tzHDZX/DU6phVrxisrWQVSXNUMBTugOBzfjIgmi /DQOLETtX6hvzT/rXVFbFIRzCL5P6Kg7zwGlF6ws8xQ+sBGHopYuiRolOpTnyku3tz etC1x44AFtcouRQsSAk42NBo25Ho9RO9/osUWnJiP+4JgzZSxsIbCFK6nuOZk5Uueh 45Y7qsfMCLM2fp9c6IDPOh0rJK4SPgZLHWB/1FieenTxsR2kaBE+s5oUCZrbPslumD KPvPm8XB+BV8xvWhRr04+Bdmp+q+jl4Fgbecy41EoKAwyTDEMzM4dh/e3hDRomOWdU E2egQKERZopNLfJ5To1d9uLwIh/zQk/yfZMGOSDVIQNFlYYsv6+Vk2KJxDd4tUPBQ5 oFBvg84sZoTzygOzwrxnlgbqpENdHGgqfz/PmWZwz5myi2dxy8xF48gV5PJ5l+c2vI KrfJxvH0LHGP10SXWV2c+dO7Mjn806gMOxJkMuT4sJBqP7NJ7InSymQq+CqEd4pei9 g2t1gWiJh/fzHMtqzxiquyf0= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id F413127969B; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954329; bh=g+MKkDhp9lgiuhOsWOPBuObrS6UckM/I/nwQeXK3IUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xv2FDAPI0NPX7OWOa23uZb0JDLH+Kk3kdxsu6WHJNhSHc9hM7z95KXY9ncgIjfVv+ QpgZtIZofAg51NbGmTMHrDHjyoDELNTjO28hp67z/FgLjlbV7lXOjcL/nQ3PBQ7QpZ OPTc/uS+UIylL6YI0gy1RSl+Oe+tzHDZX/DU6phVrxisrWQVSXNUMBTugOBzfjIgmi /DQOLETtX6hvzT/rXVFbFIRzCL5P6Kg7zwGlF6ws8xQ+sBGHopYuiRolOpTnyku3tz etC1x44AFtcouRQsSAk42NBo25Ho9RO9/osUWnJiP+4JgzZSxsIbCFK6nuOZk5Uueh 45Y7qsfMCLM2fp9c6IDPOh0rJK4SPgZLHWB/1FieenTxsR2kaBE+s5oUCZrbPslumD KPvPm8XB+BV8xvWhRr04+Bdmp+q+jl4Fgbecy41EoKAwyTDEMzM4dh/e3hDRomOWdU E2egQKERZopNLfJ5To1d9uLwIh/zQk/yfZMGOSDVIQNFlYYsv6+Vk2KJxDd4tUPBQ5 oFBvg84sZoTzygOzwrxnlgbqpENdHGgqfz/PmWZwz5myi2dxy8xF48gV5PJ5l+c2vI KrfJxvH0LHGP10SXWV2c+dO7Mjn806gMOxJkMuT4sJBqP7NJ7InSymQq+CqEd4pei9 g2t1gWiJh/fzHMtqzxiquyf0= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 77e1e680; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:39 +0100 Message-ID: <83443339431be8eba633a862e259eb20b1583895.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) * 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 30f78c5576..8a79509de2 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -252,9 +252,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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:03 +0000 Resent-Message-ID: <handler.68150.B68150.17039543408547 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543408547 (code B ref 68150); Sat, 30 Dec 2023 16:39:03 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:39:00 +0000 Received: from localhost ([127.0.0.1]:44961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMW-0002Dg-Bb for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:39:00 -0500 Received: from wolfsden.cz ([37.205.8.62]:38710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcMN-0002Cd-LL for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:52 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id DE8142783CE; Sat, 30 Dec 2023 16:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954329; bh=NfqOkEA+NtnFt72aKroJnVbMgI8wqGTaLYIo+RqSb50=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UCCiJ4UB4VJBNDViSnL9aW60AnHGtFTbXQdgPbI6zAPB/oiCjVpSUabxYgOUxfyRC WcBcUHxorroLz67FU/Dl0ymVIB5Q8ryQ1+C6zmbctNIEQJ3Xo5RtyaChTGn1UzUh7D mxzHeE53TXi5rq6fSBQgTenXnyrrf31EuHJr5yvPgGmK2/YUxoatjoUs5pY+hebBTZ /6U8fM2cvUcbEsH9OYWPZzL7cnvVqDATZWSbcDxL0buf6uVPsWTGaTGZdgs0zxgQgd /xj7WWSQ7NpADQ3YYGeFc3cOBNg3TVF4udrhqh4AaRwezPx0NS/R9lJexFAHsy5LqG nIzRRHzZJcYzy/c4ulfuyW32zgTy8MDmblnl4HEoi5H64V4Nlj6D8REgLSvS3kXQTZ wGjWIz3pLfz+VNJ+Zrs7KcUomx0tYPnqKi5RgLvAV6wZ1s3urum2y8SA0ocFrDAMAB PvzgA17FTLTXsuY5vJzfaEkDqER6wVB4rE20GjRommhHE89XQ/v8NnjTeNxIR9T6YF iy5iIm4OLr6VZvggDIV00nOSqAbHjteJkp0HnEPaJa0pcAdpS492NcfHAmvlVAQqfe f9U3iVfFpachPsLlEnkxZNRM5GOPjnEVVudQgVXiq9PmKuD1J1P4j5naiFijKQYOby c38Off1TKzHzOq8u8JXEtKXs= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 6FAB62778E7; Sat, 30 Dec 2023 16:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954329; bh=NfqOkEA+NtnFt72aKroJnVbMgI8wqGTaLYIo+RqSb50=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UCCiJ4UB4VJBNDViSnL9aW60AnHGtFTbXQdgPbI6zAPB/oiCjVpSUabxYgOUxfyRC WcBcUHxorroLz67FU/Dl0ymVIB5Q8ryQ1+C6zmbctNIEQJ3Xo5RtyaChTGn1UzUh7D mxzHeE53TXi5rq6fSBQgTenXnyrrf31EuHJr5yvPgGmK2/YUxoatjoUs5pY+hebBTZ /6U8fM2cvUcbEsH9OYWPZzL7cnvVqDATZWSbcDxL0buf6uVPsWTGaTGZdgs0zxgQgd /xj7WWSQ7NpADQ3YYGeFc3cOBNg3TVF4udrhqh4AaRwezPx0NS/R9lJexFAHsy5LqG nIzRRHzZJcYzy/c4ulfuyW32zgTy8MDmblnl4HEoi5H64V4Nlj6D8REgLSvS3kXQTZ wGjWIz3pLfz+VNJ+Zrs7KcUomx0tYPnqKi5RgLvAV6wZ1s3urum2y8SA0ocFrDAMAB PvzgA17FTLTXsuY5vJzfaEkDqER6wVB4rE20GjRommhHE89XQ/v8NnjTeNxIR9T6YF iy5iIm4OLr6VZvggDIV00nOSqAbHjteJkp0HnEPaJa0pcAdpS492NcfHAmvlVAQqfe f9U3iVfFpachPsLlEnkxZNRM5GOPjnEVVudQgVXiq9PmKuD1J1P4j5naiFijKQYOby c38Off1TKzHzOq8u8JXEtKXs= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 18a643f1; Sat, 30 Dec 2023 16:38:47 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:40 +0100 Message-ID: <489ff2a82cc757acebd23ac1e93f9bbf48112ed3.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) * 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 8a79509de2..6df07d5cc2 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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:04 +0000 Resent-Message-ID: <handler.68150.B68150.17039543418554 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543418554 (code B ref 68150); Sat, 30 Dec 2023 16:39:04 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:39:01 +0000 Received: from localhost ([127.0.0.1]:44963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMW-0002Do-LJ for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:39:00 -0500 Received: from wolfsden.cz ([37.205.8.62]:38680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcMM-0002CM-Up for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:52 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id B07DD279698; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=6vc9hPR327MG1IyfnLw5msvjN5x6xfHvwkGh9LZcUhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z+4rpG3itdoCnXpwIPXWjAPXZji4XockA1VPVx3V06YvO5/BCE6BmWkvwYy7H8tk8 JUN6lrlgZa0GfLo2eyyloMmGlGrtk48x/LC3E48Bxj0rF93eM11Oxi8E0oABd1haQe 6woPGgW1oe69hC7MTGqwj2nrWQPKP0OOYZhHo0JmwfqgtfTIKJNxZvuIJtwMErA5gd 87zPYkiv8vBK5OfmT1VUiCq6+1LAmYQ/a7NiF8Tgu3ZQ1gKRugrRKPk/p6qb6S9uoJ wOJEKJyuE1u1k9WQAKHopYXZ7YDxWKxrdvNZyqVvqRF+PiNx35bCEt2o6s5uUpJpYz MJBn2zjG7twDQjEg8wStzESZGeIz170guR/TY1vIzw4i7LRaMvdBKmpzm1KNBO65dN rbQ0muelKDnKi2bXQTclk7xJwlFf5fgfYTIEXKB9nolmug2jUX6fUduwUZqg6WS2nS GnCVAEUzHmGUJF7zcQZOZ9mzzkb823E9jTC+wmPxa/8LfYnrRrd/fvh+rGlvn8KxZe sXXHld0PyAxroREIalDfd+wM2kiS0eavlt/WgCOY4HJ92nN4R2/k31sUiS8axGIsCQ z7vwOLC3q+v2EAdhKnyn4O58psxOFy8lLtk94bO7n5pm54y5otJOoyDUwdX1bTIWEV c/FObxejRAGG59SoPPdOP/+Y= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 27DA2278F30; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=6vc9hPR327MG1IyfnLw5msvjN5x6xfHvwkGh9LZcUhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z+4rpG3itdoCnXpwIPXWjAPXZji4XockA1VPVx3V06YvO5/BCE6BmWkvwYy7H8tk8 JUN6lrlgZa0GfLo2eyyloMmGlGrtk48x/LC3E48Bxj0rF93eM11Oxi8E0oABd1haQe 6woPGgW1oe69hC7MTGqwj2nrWQPKP0OOYZhHo0JmwfqgtfTIKJNxZvuIJtwMErA5gd 87zPYkiv8vBK5OfmT1VUiCq6+1LAmYQ/a7NiF8Tgu3ZQ1gKRugrRKPk/p6qb6S9uoJ wOJEKJyuE1u1k9WQAKHopYXZ7YDxWKxrdvNZyqVvqRF+PiNx35bCEt2o6s5uUpJpYz MJBn2zjG7twDQjEg8wStzESZGeIz170guR/TY1vIzw4i7LRaMvdBKmpzm1KNBO65dN rbQ0muelKDnKi2bXQTclk7xJwlFf5fgfYTIEXKB9nolmug2jUX6fUduwUZqg6WS2nS GnCVAEUzHmGUJF7zcQZOZ9mzzkb823E9jTC+wmPxa/8LfYnrRrd/fvh+rGlvn8KxZe sXXHld0PyAxroREIalDfd+wM2kiS0eavlt/WgCOY4HJ92nN4R2/k31sUiS8axGIsCQ z7vwOLC3q+v2EAdhKnyn4O58psxOFy8lLtk94bO7n5pm54y5otJOoyDUwdX1bTIWEV c/FObxejRAGG59SoPPdOP/+Y= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 975a8ad1; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:37 +0100 Message-ID: <035edc6095b0f8e7c3bee5408d37e0d23d493a6e.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) 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 79b30cecaf..6368dbf5bb 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -915,7 +915,7 @@ (define-public libreoffice ,@%glib-or-gtk-build-system-modules) #:modules `(((guix build python-build-system) #:select (python-version)) (ice-9 textual-ports) - ,@%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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 8/8] gnu: hime: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:04 +0000 Resent-Message-ID: <handler.68150.B68150.17039543418564 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543418564 (code B ref 68150); Sat, 30 Dec 2023 16:39:04 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:39:01 +0000 Received: from localhost ([127.0.0.1]:44965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMX-0002Dv-0q for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from wolfsden.cz ([37.205.8.62]:38728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcMN-0002Cg-R0 for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:52 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 95C4927826F; Sat, 30 Dec 2023 16:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954330; bh=nXNaDgrLOz/aEV3yLROXeL5wF3Hm0Ur8KdBGAvnNo44=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Oyk0z0jwvNKA6c8XwD4ICCrXOeROsVrdcsuEz32amcLdNWFV8yztOn56yEu8qaNrv /UQJ3frsnXUglZJ2qttKQnBUthbXN+gUrIU1IcqKQuSOoWIT3s21LqKxZ/IjlCl4JU 4wugAWDN+KLOkDkmXVWlcn7gbqkwgjLtAmAXXZpKIxVJqT2mZDkV+2zBchogob2675 MAXaL2Z54Ktnl9uU9aOtfWIVc0SHBrIOjmozLOJqqu/VhbrQ+NiWfUNQvqC+qyh527 P+d2EQlQok7uyatvdXQruyySBEshSCWcKnfY0+qWEb7Wq1zZY25oO4p5oZrL/tCjTG BXS6GiNNXM0TGudHYJlCETPe7D5X4JhB9GQdHQYtCTwGcIZhlwcWh1g8EJTYMHgdo4 I+EB0tALeoaiQyh0nvTPX6MZW9RXyeJCBPXgKp4LJMpdBVsM4vQKMcUyTAwf1GMefO WJNKbgZC025e5SS+jWDonbeADFXu6m9G6IuY7lGodGWecoR0qXNOQiewc73mOSCik2 rHx/VYM+XuGliqoJTEsw2cR5msCKyWsI9QhKWbEnEQbqjbH9CmUlVKrIyiQR8fgu3s 0LG72WDKfutTVbmFw30NC6C3QiwO83MBeGAoIfTgjCasQaoS5/VXF56URRu+PemEnr CHwNGGN1rrz21Gjl31hlldxk= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 359692792AB; Sat, 30 Dec 2023 16:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954330; bh=nXNaDgrLOz/aEV3yLROXeL5wF3Hm0Ur8KdBGAvnNo44=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Oyk0z0jwvNKA6c8XwD4ICCrXOeROsVrdcsuEz32amcLdNWFV8yztOn56yEu8qaNrv /UQJ3frsnXUglZJ2qttKQnBUthbXN+gUrIU1IcqKQuSOoWIT3s21LqKxZ/IjlCl4JU 4wugAWDN+KLOkDkmXVWlcn7gbqkwgjLtAmAXXZpKIxVJqT2mZDkV+2zBchogob2675 MAXaL2Z54Ktnl9uU9aOtfWIVc0SHBrIOjmozLOJqqu/VhbrQ+NiWfUNQvqC+qyh527 P+d2EQlQok7uyatvdXQruyySBEshSCWcKnfY0+qWEb7Wq1zZY25oO4p5oZrL/tCjTG BXS6GiNNXM0TGudHYJlCETPe7D5X4JhB9GQdHQYtCTwGcIZhlwcWh1g8EJTYMHgdo4 I+EB0tALeoaiQyh0nvTPX6MZW9RXyeJCBPXgKp4LJMpdBVsM4vQKMcUyTAwf1GMefO WJNKbgZC025e5SS+jWDonbeADFXu6m9G6IuY7lGodGWecoR0qXNOQiewc73mOSCik2 rHx/VYM+XuGliqoJTEsw2cR5msCKyWsI9QhKWbEnEQbqjbH9CmUlVKrIyiQR8fgu3s 0LG72WDKfutTVbmFw30NC6C3QiwO83MBeGAoIfTgjCasQaoS5/VXF56URRu+PemEnr CHwNGGN1rrz21Gjl31hlldxk= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 20d18994; Sat, 30 Dec 2023 16:38:47 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:42 +0100 Message-ID: <fde756b510c44ffe19c41d44281cd99f54344132.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) * 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 30af9e33f5..4e64324af1 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -218,10 +218,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 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH 7/8] gnu: nimf: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 30 Dec 2023 16:39:04 +0000 Resent-Message-ID: <handler.68150.B68150.17039543418573 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17039543418573 (code B ref 68150); Sat, 30 Dec 2023 16:39:04 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:39:01 +0000 Received: from localhost ([127.0.0.1]:44967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rJcMX-0002E3-AC for submit <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from wolfsden.cz ([37.205.8.62]:38722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ws@HIDDEN>) id 1rJcMN-0002Cf-LF for 68150 <at> debbugs.gnu.org; Sat, 30 Dec 2023 11:38:52 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 41FE827963B; Sat, 30 Dec 2023 16:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954330; bh=dfy5eris0V/j1+mJCy5IDXyVkJI/VfY3dIjlaDdT4S4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DGcQZEVtY+Bl0rt/FjXAnjNN/rt+sl91wltfmpoawOuICHUjmuUANddlQ1vqAN2Z1 Nb5MBrmjeX8FyKaI1E2oL1aq8bPuydNQ5tLdh+P929H4dD95mWifNzPw3LMmVJuUVm Q2CPUbue0mNfBw/J/+u6+RIXOsrsZn2U7fUzg2sfAhsmsU7sS+vEz/pbwoJpbDVGIW MgpvN2rdhvpFqufMVkkCGOrn8ZsbNXb1iyBdC19qalB8heIHBHeGeS/BkERsolajnK z1VElEfm/bxLG8t0z/eZDoKpj4VSzxSzdt+JRW9Pc/vv+jixZggwK9Rn1bv25pX+98 sSzx2SouPGs6Lr6iTi4fep18ibog13kxExBdV2YPrFO5Itz/IcvNg+nTmDcgEJI788 wClkLeL2f9xxswb4yIop/MEKR0hQWr6oMO2AOYMiqUzq7A9vuhHVG43wHRysr7zx0W S2CQgep/d4zjVFcxKFtFA+PYBxmFogSBwpaaMdV1yhhAOEzWQNaCXAxrZFZoiIoOJC OgNaNKSHAosMkXoUrk5epYubLWGd2eA4euNSd79Xsc4lBgPYUNpAQrBxg/pIB8BVfs EzjSqW6sGTkntizAJuycyhV+qdqCYpBerNJI2iAEFVjJXoeUu00BJrVmRDx32o0DTc CT5kitv4KTG9CnLImSjH0EDk= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id D43F127826E; Sat, 30 Dec 2023 16:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954330; bh=dfy5eris0V/j1+mJCy5IDXyVkJI/VfY3dIjlaDdT4S4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DGcQZEVtY+Bl0rt/FjXAnjNN/rt+sl91wltfmpoawOuICHUjmuUANddlQ1vqAN2Z1 Nb5MBrmjeX8FyKaI1E2oL1aq8bPuydNQ5tLdh+P929H4dD95mWifNzPw3LMmVJuUVm Q2CPUbue0mNfBw/J/+u6+RIXOsrsZn2U7fUzg2sfAhsmsU7sS+vEz/pbwoJpbDVGIW MgpvN2rdhvpFqufMVkkCGOrn8ZsbNXb1iyBdC19qalB8heIHBHeGeS/BkERsolajnK z1VElEfm/bxLG8t0z/eZDoKpj4VSzxSzdt+JRW9Pc/vv+jixZggwK9Rn1bv25pX+98 sSzx2SouPGs6Lr6iTi4fep18ibog13kxExBdV2YPrFO5Itz/IcvNg+nTmDcgEJI788 wClkLeL2f9xxswb4yIop/MEKR0hQWr6oMO2AOYMiqUzq7A9vuhHVG43wHRysr7zx0W S2CQgep/d4zjVFcxKFtFA+PYBxmFogSBwpaaMdV1yhhAOEzWQNaCXAxrZFZoiIoOJC OgNaNKSHAosMkXoUrk5epYubLWGd2eA4euNSd79Xsc4lBgPYUNpAQrBxg/pIB8BVfs EzjSqW6sGTkntizAJuycyhV+qdqCYpBerNJI2iAEFVjJXoeUu00BJrVmRDx32o0DTc CT5kitv4KTG9CnLImSjH0EDk= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id befa55d7; Sat, 30 Dec 2023 16:38:47 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:41 +0100 Message-ID: <dfe58c52b4c7be158fbbd5fbe05328e23c405319.1703953716.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> References: <cover.1703953716.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) * 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 db78425ec9..30af9e33f5 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -99,10 +99,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" -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:02 +0000 Resent-Message-ID: <handler.68150.B68150.172823408017676 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408017676 (code B ref 68150); Sun, 06 Oct 2024 17:02:02 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:20 +0000 Received: from localhost ([127.0.0.1]:42190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdD-0004ar-Aw for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:19 -0400 Received: from wolfsden.cz ([37.205.8.62]:53420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUd9-0004aK-RK for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:17 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 70E8C320E1E; Sun, 6 Oct 2024 17:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234068; bh=tFClRpeTe8fCns+OD2qta3i1vCnV3SJERlKtrDRilhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbbVzelALM8qRdiPM2niAvEIkyn8l7Y7XXq6kuUFlOZrXAn7qTeN+6JGG0OMzALp3 8BQU9hwlDQnCLV/trW3f541Rg6CSWzxvg8+SeV6T07Wae0pIBhyMhsEC+wcp8nyqDP 5t5dLaa4kuPweQP1PBkzKwMmOK9jaago9ajBQGyd3ltsYdQ79RlVfMvzL7KE3Mv7sU M0Au3VM1ceQs0w4MpJsx55Hdc78ath1Y7pcZYH0Yg+7N7ziGS0FZXZn04JvuGlK+br 6y3dA9YbxgETP7nwu6DJzvBXTF845mqBViV274dwSZ5UPYRieOAtc5C1O9YNQY6u8r dvXy0hjxLIH/1hGUoTqtTPRcOFQ4ffvZY8SCA8zQt0M8qKsqx79TlbF/qIFUrX9pt8 s+mxnsebX15lXN4eLghAXgP6++4sIhFOz9hKgis73l/qyaV8g3Vtwbh4wA5moGWzgR wgtio8t5eDUmw/d5unPl9JPmh3aLwnLyvNEbcjB5VZtUpRPpgBbwN4K8OJrJtQ80Bq Mm8VISM05glBBE6BsaxMzVUCFqJk9a/xjArDW1AlkQVnYSDEVqEYgbD5p9296SNbsw zP0M+LmOcLVc0HhKwS00DAKQisqSuHdIVg2Vg6l2kpmFAanKH6azYHbAtB26POdaQy P3Wo5P9+zRvDLavkfgKAc0sE= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 0ED6C31EE3C; Sun, 6 Oct 2024 17:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234068; bh=tFClRpeTe8fCns+OD2qta3i1vCnV3SJERlKtrDRilhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbbVzelALM8qRdiPM2niAvEIkyn8l7Y7XXq6kuUFlOZrXAn7qTeN+6JGG0OMzALp3 8BQU9hwlDQnCLV/trW3f541Rg6CSWzxvg8+SeV6T07Wae0pIBhyMhsEC+wcp8nyqDP 5t5dLaa4kuPweQP1PBkzKwMmOK9jaago9ajBQGyd3ltsYdQ79RlVfMvzL7KE3Mv7sU M0Au3VM1ceQs0w4MpJsx55Hdc78ath1Y7pcZYH0Yg+7N7ziGS0FZXZn04JvuGlK+br 6y3dA9YbxgETP7nwu6DJzvBXTF845mqBViV274dwSZ5UPYRieOAtc5C1O9YNQY6u8r dvXy0hjxLIH/1hGUoTqtTPRcOFQ4ffvZY8SCA8zQt0M8qKsqx79TlbF/qIFUrX9pt8 s+mxnsebX15lXN4eLghAXgP6++4sIhFOz9hKgis73l/qyaV8g3Vtwbh4wA5moGWzgR wgtio8t5eDUmw/d5unPl9JPmh3aLwnLyvNEbcjB5VZtUpRPpgBbwN4K8OJrJtQ80Bq Mm8VISM05glBBE6BsaxMzVUCFqJk9a/xjArDW1AlkQVnYSDEVqEYgbD5p9296SNbsw zP0M+LmOcLVc0HhKwS00DAKQisqSuHdIVg2Vg6l2kpmFAanKH6azYHbAtB26POdaQy P3Wo5P9+zRvDLavkfgKAc0sE= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:25 +0200 Message-ID: <c1524d27f8384098ef301c1902e129fa3806f460.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 --- Rebase on latest master. 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 552abf83c5..0ed88c11cf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6265,7 +6265,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) -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:02 +0000 Resent-Message-ID: <handler.68150.B68150.172823408017684 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408017684 (code B ref 68150); Sun, 06 Oct 2024 17:02:02 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:20 +0000 Received: from localhost ([127.0.0.1]:42192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdD-0004b3-S1 for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:20 -0400 Received: from wolfsden.cz ([37.205.8.62]:53424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdA-0004aN-Bf for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:17 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 987A8320D6A; Sun, 6 Oct 2024 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234069; bh=Rbmu5DDHRtiM7xI8m/s0uaYnXW/XXoA4KYy+ji8Rogo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RykUM7lEOnF1trTq3Iy5IULCM1vY/0U+RDT26AAmRcfC7Jqewe9fSMnPCBxpaMcu2 k9zw6lC5jz1LK/1jsVLg2c9UG6ivoj1IdGuC9vUMY83VKOGxdiTgP1OdywkSSaiy6t wjep/rzWSVtoImpq5j97mbBimXE3t/wYaqFCvKcZk099JKvQpqzNSX5t4m96AzQWog m5FB9a4iZLLFbM7fleq2JIb3QoA7JQ1odjw4IbWEVLvzFJ7eDA8SyKOQXJyfOIq4iC 6aKeAUYeDk1Khd2ozqN6Q+9SlrP6ymm/tVDf+OeBCkBq1zXLFkX6+HXzIKHaz5IwrI NfWYbZ/GuODP3v8oy4V1rXOkyKpC2Jll+86YuvLWkYe734P2R+vD/xLtOaGjj5TFSa QPzO9mD9TW9ucMNs66NcWmtj9IaEOM8jdYVDyG9FEdUPW7or2DJAmpuadqxJZs2n6w RDRLHBfcB+Tb/jFsQfSNhu8I+xqE1y3Usha3WQ4I9gUzFbO/wPVIEufyBrzwVcRxGN z3ZeBl6wg6f7XVfDElxc4Ig2wJ97ETXM1/k3e4Vgp7I3ByTo6uOpbkkc/740XhxO4l 1PS+MuLB59xEL1Wc0UX8dtruVhF8lCi0PemFcw4E/X0gukhxg1LEay5lSTHPe7Yd6g ohhYWrFgnJW1sxDwbOs4Ppuk= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 34421320AFE; Sun, 6 Oct 2024 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234069; bh=Rbmu5DDHRtiM7xI8m/s0uaYnXW/XXoA4KYy+ji8Rogo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RykUM7lEOnF1trTq3Iy5IULCM1vY/0U+RDT26AAmRcfC7Jqewe9fSMnPCBxpaMcu2 k9zw6lC5jz1LK/1jsVLg2c9UG6ivoj1IdGuC9vUMY83VKOGxdiTgP1OdywkSSaiy6t wjep/rzWSVtoImpq5j97mbBimXE3t/wYaqFCvKcZk099JKvQpqzNSX5t4m96AzQWog m5FB9a4iZLLFbM7fleq2JIb3QoA7JQ1odjw4IbWEVLvzFJ7eDA8SyKOQXJyfOIq4iC 6aKeAUYeDk1Khd2ozqN6Q+9SlrP6ymm/tVDf+OeBCkBq1zXLFkX6+HXzIKHaz5IwrI NfWYbZ/GuODP3v8oy4V1rXOkyKpC2Jll+86YuvLWkYe734P2R+vD/xLtOaGjj5TFSa QPzO9mD9TW9ucMNs66NcWmtj9IaEOM8jdYVDyG9FEdUPW7or2DJAmpuadqxJZs2n6w RDRLHBfcB+Tb/jFsQfSNhu8I+xqE1y3Usha3WQ4I9gUzFbO/wPVIEufyBrzwVcRxGN z3ZeBl6wg6f7XVfDElxc4Ig2wJ97ETXM1/k3e4Vgp7I3ByTo6uOpbkkc/740XhxO4l 1PS+MuLB59xEL1Wc0UX8dtruVhF8lCi0PemFcw4E/X0gukhxg1LEay5lSTHPe7Yd6g ohhYWrFgnJW1sxDwbOs4Ppuk= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:26 +0200 Message-ID: <048211ca5d3fca6a7d86973ddf7bfb8dca426649.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 --- Rebase on latest master. 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 ed8dfd432b..2acbddaa3b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -908,7 +908,7 @@ (define-public libreoffice ,@%glib-or-gtk-build-system-modules) #:modules `(((guix build python-build-system) #:select (python-version)) (ice-9 textual-ports) - ,@%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 -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 4/8] gnu: sugar: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: rekado@HIDDEN, guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:03 +0000 Resent-Message-ID: <handler.68150.B68150.172823408217706 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ricardo Wurmus <rekado@HIDDEN> X-Debbugs-Original-Xcc: Ricardo Wurmus <rekado@HIDDEN> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408217706 (code B ref 68150); Sun, 06 Oct 2024 17:02:03 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:22 +0000 Received: from localhost ([127.0.0.1]:42200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdG-0004bR-EH for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:22 -0400 Received: from wolfsden.cz ([37.205.8.62]:53434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdC-0004af-Fj for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:18 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id BA9D531DF59; Sun, 6 Oct 2024 17:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234071; bh=7LrDJ5c6x1yxgVKlZZd7DKsR4VUnLcgW+nIrYRxook0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Gex6si4t1p+8MDXPSz/+tLtoJzfL99DWf0M6SnKF5qDDc9UsGP5ARzaYNFNaBkGQ/ wh1wd6l7UrfGYqfAiIlAGDY1T5/+WXJrIZwcXEQdpzZdg5GxocAFcRD3+Z2hQWx2OH qYxyU4rYAC64PLwtDOdJyI/O4HKy9fz0WoyxKFLNSVYYjsJRIdfrjdo+9BmtTOBnEB w4ungDZ6BQN5SPRUyl2gDUsUXFQO/GwjPbEp77RVJNmslKOg2jpfff1bAN7bS0vL0D McZyx5k1cTean/OPJgQ7Ab2tPikw6AaVg51+tBuEEbMxr2f452d47rC9wjthP2dXh8 P07JPcEZYh2/G8Kk7ge/ekrnpCUNvSa74HQ7LHZVOSyJFX4WFxWNqX52hH3J2N/oBf cgIoqVjtrxVTK6HRNZVeX1nE3VqJJD5SwCSjk2s99w3TYMxpjAThSwcwhzXyTOXpy9 8xli5OUwNtuPTv6a+yyg7x+cgT+/4MwstDMNFdYaVXtyOttQiIKH4ADAiAD56HUecg MCvZQMiw/nLXhCdy4BmR/eB4vLkdrDQ0zAcv2UZisAwp89IVN2iOkC2L9Cx+YyQnlA l+FLI2SahdyJhmr76jixD3J4E0sekeLZXLKeROhsQu3h+e60GeaE9dOFc09P+CceZ6 oa619DiDR6aic/5KNLyVnjXs= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 446EE320A5D; Sun, 6 Oct 2024 17:01:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234070; bh=7LrDJ5c6x1yxgVKlZZd7DKsR4VUnLcgW+nIrYRxook0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pTj7D7+SsPrKtWrrBOtvjsjeDCqa+1MGps2fLle9uxsbsTsytZbJtp/8HEb9d04KA p7i+0n0P14ujNklztVWjD2PhsJk/vglMbA7A+XtkGZmDhx999EbIa3E9/y/eo9kg4G Z9y9hS2GBTgmt2O6QAhvsHdgjPPjdAgpQnvsF/Tw8/uhdNKfnCQ4vA5BaCVmBFEHim i0iMMPgDgk4sbgj3oemQbKwX1HXg6DRWOOXPtuKdxf9HjnRludKlQKhcRlAPyuqsP8 8DH0TXVmwWYR9AGDf7dno7ch4Wa/8rJ2nOzdRuorW251nvK9qqg/T2p6XJITaM++9Q +iv4z4zevoq64JSRXKUKLSJ8f3snnD6YH7HD6/8A8Rmpu16vWdRsrBZdmOMjV2gF4w PeFsLyAcKdC6A0yaRJtKW+moPgH1ZlmsTxvfHYMrMtgBdt2zHpyb3I1WGj6bwaZ9LM 8UYgkI1kccslG3ymd6aJKTnskNQ2zAt7p5Ut/PGUhh0VzA2E6pXRWYZK3+gEFxLsUR kE/cLYrVXeMQ2uXckW35frC2DDcH3OfEWM++mUU1fd8vkS+YGvTQvEiLe63ROGIchJ kYY2QTv2IRuAWy6Vxnp0zgCpGNi4FzImrw6qLraCzWMjSBjcVtQfU1ar0ywcPWfTGo NK1pDtujqHL4hsdt66FQUpWM= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:27 +0200 Message-ID: <40bc3cdf0208472a340ed15a2c3e5b83cde7437b.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/sugar.scm (sugar)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5a98d356c3e1a32b71e7949e3425da74081c1e82 --- Rebase on latest master. 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 77008bc078..e9cfd1a21a 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 -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 5/8] gnu: sugar-datastore: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: rekado@HIDDEN, guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:03 +0000 Resent-Message-ID: <handler.68150.B68150.172823408317713 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ricardo Wurmus <rekado@HIDDEN> X-Debbugs-Original-Xcc: Ricardo Wurmus <rekado@HIDDEN> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408317713 (code B ref 68150); Sun, 06 Oct 2024 17:02:03 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:23 +0000 Received: from localhost ([127.0.0.1]:42202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdG-0004bX-QQ for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:23 -0400 Received: from wolfsden.cz ([37.205.8.62]:53430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdC-0004ae-CP for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:18 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id A0606320E67; Sun, 6 Oct 2024 17:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234071; bh=Y2M2jqKa8IF+sb9+5mPI5TnAcyxU2+t9bcSmoj7bueo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j0nIRaSeK4KJyCKbEym9riFC82s3+HAWzSBg03/UDLsAR/SBhdIShGnrPAK7Bpgo+ FvgLU4/pyAeRYavRbPUQLpbVJD1Uv7u33gtYQ3BRDvMajrk3bRVhFStYTGzMJJshsY gZUw91PXWVcGswSE0LAtKp0lrPPHuBMa2+eFWHuLGEpAcRWf7Wi3d1zPi9/7rGY7SL u3F6cZ4aaSQSWnIQl8aHVN3oG9h6XO6egLz1n4QOlLUCr173yJ9PZiJukCHA594wWH 4xhVmn2BnFOVfaCS3+CJWpwXsiCVwrseWcBehbvYljotGuPXKOsS+K6R9mN5go5wNl WIWzEU4tJtNkAvwe4RLPUGd7/keu27o4M9gR0fSv/L/s2ctIHbsC5fZ+0mbhdzOulw r5eGkW+oB0QFwBhtAxiADR0FPaAD32qCfIfzCOkmec5zDuVqPugI6+RYZznFGyOGhq MIKvcY/8fuPMr85GaaytgVbE0ZfL8AEHYpe3OPK+xLcBuGAdz8GGY+lExOcS4qmXMk r+flgA6AZB3DQrueERC1GnNEfZNHDA/wmTsgpd5QiuKNUbfGwDUKuk4bdBhMvu9Lsk YLecdIrcP7K6PZ3NQWkcWrhQG+HH94maWgBZcm8jsvzaGz9hNy3iw0MvxWQhLNFFQx zkuoQAu0LfXrVuPNELfbM9Bs= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 48B7831F141; Sun, 6 Oct 2024 17:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234071; bh=Y2M2jqKa8IF+sb9+5mPI5TnAcyxU2+t9bcSmoj7bueo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j0nIRaSeK4KJyCKbEym9riFC82s3+HAWzSBg03/UDLsAR/SBhdIShGnrPAK7Bpgo+ FvgLU4/pyAeRYavRbPUQLpbVJD1Uv7u33gtYQ3BRDvMajrk3bRVhFStYTGzMJJshsY gZUw91PXWVcGswSE0LAtKp0lrPPHuBMa2+eFWHuLGEpAcRWf7Wi3d1zPi9/7rGY7SL u3F6cZ4aaSQSWnIQl8aHVN3oG9h6XO6egLz1n4QOlLUCr173yJ9PZiJukCHA594wWH 4xhVmn2BnFOVfaCS3+CJWpwXsiCVwrseWcBehbvYljotGuPXKOsS+K6R9mN5go5wNl WIWzEU4tJtNkAvwe4RLPUGd7/keu27o4M9gR0fSv/L/s2ctIHbsC5fZ+0mbhdzOulw r5eGkW+oB0QFwBhtAxiADR0FPaAD32qCfIfzCOkmec5zDuVqPugI6+RYZznFGyOGhq MIKvcY/8fuPMr85GaaytgVbE0ZfL8AEHYpe3OPK+xLcBuGAdz8GGY+lExOcS4qmXMk r+flgA6AZB3DQrueERC1GnNEfZNHDA/wmTsgpd5QiuKNUbfGwDUKuk4bdBhMvu9Lsk YLecdIrcP7K6PZ3NQWkcWrhQG+HH94maWgBZcm8jsvzaGz9hNy3iw0MvxWQhLNFFQx zkuoQAu0LfXrVuPNELfbM9Bs= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:28 +0200 Message-ID: <2e5a67cccc836e8a49b4cdf086763d558b93f048.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/sugar.scm (sugar-datastore)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I9ceadd163d3f6cd49ed2623b6060b223257e9aed --- Rebase on latest master. 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 e9cfd1a21a..1a353f6f3c 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 -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. References: <cover.1703953716.git.~@wolfsden.cz> In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:04 +0000 Resent-Message-ID: <handler.68150.B68150.172823408317721 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408317721 (code B ref 68150); Sun, 06 Oct 2024 17:02:04 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:23 +0000 Received: from localhost ([127.0.0.1]:42204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdH-0004be-6D for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:23 -0400 Received: from wolfsden.cz ([37.205.8.62]:53416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUd9-0004aI-RM for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:19 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id CF2DF31EE38; Sun, 6 Oct 2024 17:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234067; bh=CZGt2UQnNoUSqApr6L77CSLg6OZNusKyd+X+f99FE5U=; h=From:To:Cc:Subject:Date; b=ZsK7KWKYRXzVBGABX/XKwzGxcJAYe+pM2WL+Ins5h6WkK7hwW99EUiAwgFwzBm6Wf sCKSkPz57hoki7COMR4ZKMpKp/Sjj6MCMoa44SPKGF5culU30vPGVHyGaFBZ575gU9 Y8tt2R9qKa1+DsMxq8jTooDoKoyoW95uKQeEoqjTzmynq0b+XoGxyJTmtm+LdTRLGP 7auv5+RFqE3X4WGm6+SBeEEolkTwbd8jCYIMD06tCLvTTVR93jI2da/kFlT0UyWwYc hRH2Mt/wbNd6hHvA59EnXLMynUHHd7E7vdEXOIKzue4U4s4cvHHfCAIhto1lK0Dr5H nPwb74M3t/sS/toHdAqojOZjjh84iCm9hO7BI823rBvChhqBvwkG2PTZT+Z5VEBY9F uAvBEaM93WU8fDbT3rF1TSQShVgsxNC8HDDUhkLtDBqnOCf9MLJtEJfAJEbHmtF3lB eq/T6sfF729Kfl82sR0mFC2JUxnZSWoCCUtyj9z4JkmoCJDmWjeH+udflCYU1vmk07 I7ZmItttGx+zG2xl8KQ+TacESewgLhjWxEnGvXaWaAr18VchYHxRWkC7vjfB8U0K8x NFCffsaV75x/NVUn4RVyTwdMTuhykajRGy6MBt+nKz9udCk0Lvg0brjvNF5mU6QIKz pSrOWOKQ9rAmg/JS/RcPQdAU= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id DE49031E6FD; Sun, 6 Oct 2024 17:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234067; bh=CZGt2UQnNoUSqApr6L77CSLg6OZNusKyd+X+f99FE5U=; h=From:To:Cc:Subject:Date; b=ZsK7KWKYRXzVBGABX/XKwzGxcJAYe+pM2WL+Ins5h6WkK7hwW99EUiAwgFwzBm6Wf sCKSkPz57hoki7COMR4ZKMpKp/Sjj6MCMoa44SPKGF5culU30vPGVHyGaFBZ575gU9 Y8tt2R9qKa1+DsMxq8jTooDoKoyoW95uKQeEoqjTzmynq0b+XoGxyJTmtm+LdTRLGP 7auv5+RFqE3X4WGm6+SBeEEolkTwbd8jCYIMD06tCLvTTVR93jI2da/kFlT0UyWwYc hRH2Mt/wbNd6hHvA59EnXLMynUHHd7E7vdEXOIKzue4U4s4cvHHfCAIhto1lK0Dr5H nPwb74M3t/sS/toHdAqojOZjjh84iCm9hO7BI823rBvChhqBvwkG2PTZT+Z5VEBY9F uAvBEaM93WU8fDbT3rF1TSQShVgsxNC8HDDUhkLtDBqnOCf9MLJtEJfAJEbHmtF3lB eq/T6sfF729Kfl82sR0mFC2JUxnZSWoCCUtyj9z4JkmoCJDmWjeH+udflCYU1vmk07 I7ZmItttGx+zG2xl8KQ+TacESewgLhjWxEnGvXaWaAr18VchYHxRWkC7vjfB8U0K8x NFCffsaV75x/NVUn4RVyTwdMTuhykajRGy6MBt+nKz9udCk0Lvg0brjvNF5mU6QIKz pSrOWOKQ9rAmg/JS/RcPQdAU= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:24 +0200 Message-ID: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 --- Rebase on latest master. 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." -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: rekado@HIDDEN, guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:05 +0000 Resent-Message-ID: <handler.68150.B68150.172823408417727 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ricardo Wurmus <rekado@HIDDEN> X-Debbugs-Original-Xcc: Ricardo Wurmus <rekado@HIDDEN> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408417727 (code B ref 68150); Sun, 06 Oct 2024 17:02:05 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:24 +0000 Received: from localhost ([127.0.0.1]:42206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdH-0004bm-L2 for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:23 -0400 Received: from wolfsden.cz ([37.205.8.62]:53434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdD-0004af-5n for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:19 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id B65CD320E79; Sun, 6 Oct 2024 17:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234072; bh=vWusWujdWvgev+ZhgMe6UpQfzIl0VkitoYhQoPf/siA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=andDftwULnV6Oq3+Qy9RHZosISJJHmIlN9QFCe1zLAW07zlINDM9O6VEjgM27Mrrv fsIfC718Lo+c1cFLFYKp+uqECS6tLjQfYJOpzbBufoNsmRSQ6uyTlgkREsDo3RL7iA c0b8nyJ89CWVkoxHSQVwP6NqUQrAzRq7WS4IYty1l71Mbo9veiY1SHH1VwZRSR2G89 m/dl5/GaLtUi8wnHAIRq5XFlJ55T0y0jhIHQgEYYZ4n5seIUyaaoUz9b6Fefe/SnCg 7AM6/udpO/iv7TPoah464ZtMkhIROAzzfU51EcWCTD8QZlZ9AGVKRcHo8pms5MpEM6 n0ElRGPmuXCl9KzftuZo1fYOmsUS4dTpLLRah5gIEGz3TZW51kNvEhNp8Wnos/V4TD +j1fKrYQIorM2UV7axN300WHIWhChfZjryaJFyc4dU3s19TWmPkrjsPGtlSJbaEW7I UnpXcO/XF/J4zQNohxlaHoZPHPl5NXqfK8Jrp8oQkU4Z4VTapgbIJ+LuMx0GgwUp4L RqffMfilWV1sDu3NMYqd+GzF4SsJAUU4YeAcPLi3ibHcVwEsD/dgll1TPXg5oAzNfX 2Q+SuW1ZL8EXPsw3RQy5F2N7ltsn+eiNp1suB4v5i+jsKL7p3MW7z8z2RlEXgXvQ9T /FbLuI1KxfKkEN6EzfVEIIA0= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 5B88F31E102; Sun, 6 Oct 2024 17:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234072; bh=vWusWujdWvgev+ZhgMe6UpQfzIl0VkitoYhQoPf/siA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=andDftwULnV6Oq3+Qy9RHZosISJJHmIlN9QFCe1zLAW07zlINDM9O6VEjgM27Mrrv fsIfC718Lo+c1cFLFYKp+uqECS6tLjQfYJOpzbBufoNsmRSQ6uyTlgkREsDo3RL7iA c0b8nyJ89CWVkoxHSQVwP6NqUQrAzRq7WS4IYty1l71Mbo9veiY1SHH1VwZRSR2G89 m/dl5/GaLtUi8wnHAIRq5XFlJ55T0y0jhIHQgEYYZ4n5seIUyaaoUz9b6Fefe/SnCg 7AM6/udpO/iv7TPoah464ZtMkhIROAzzfU51EcWCTD8QZlZ9AGVKRcHo8pms5MpEM6 n0ElRGPmuXCl9KzftuZo1fYOmsUS4dTpLLRah5gIEGz3TZW51kNvEhNp8Wnos/V4TD +j1fKrYQIorM2UV7axN300WHIWhChfZjryaJFyc4dU3s19TWmPkrjsPGtlSJbaEW7I UnpXcO/XF/J4zQNohxlaHoZPHPl5NXqfK8Jrp8oQkU4Z4VTapgbIJ+LuMx0GgwUp4L RqffMfilWV1sDu3NMYqd+GzF4SsJAUU4YeAcPLi3ibHcVwEsD/dgll1TPXg5oAzNfX 2Q+SuW1ZL8EXPsw3RQy5F2N7ltsn+eiNp1suB4v5i+jsKL7p3MW7z8z2RlEXgXvQ9T /FbLuI1KxfKkEN6EzfVEIIA0= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:29 +0200 Message-ID: <f838b575a22cc4038b9f472c3b48dbb2e7061d73.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I6a5e4511d2e696a673f7d5b49f75285ee488223d --- Rebase on latest master. 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 1a353f6f3c..10893a1dfd 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 -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 8/8] gnu: hime: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:05 +0000 Resent-Message-ID: <handler.68150.B68150.172823408717740 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408717740 (code B ref 68150); Sun, 06 Oct 2024 17:02:05 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:27 +0000 Received: from localhost ([127.0.0.1]:42208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdL-0004c3-1M for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:27 -0400 Received: from wolfsden.cz ([37.205.8.62]:53436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdF-0004bI-Oe for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 0B3E1321016; Sun, 6 Oct 2024 17:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234075; bh=zvWsa7Fnpm3dSSjuQeCQ4qpNg76QQdCXsBmMqcY0eeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yfLOy0BhGDWDR95qP195jIU1tSVfRMj8QzTe1WTJiNRxT+zTX7emRXDseF0pgp3lP t40KzrFh5NfTmkX29rdplCQVIqtTQc68MbI7OaZahRSOxN8WRL5H9dVDAQwnIORS6j 2sBOBTkhxDRQbejq+r/irY1hB7uzwh2Jo1SbgLUsSZ8Cs9ci0njAhmAi1XbPkRxeAo 3Kj8rg8lkcxZc+jW4O6SRjhwIXlvb6US7ZDE4XsbRElQFvW8dcFXYreXh5T1GOUsA/ UhBuZm16KPhhH2edZ5mYv+lId9niTSbK9Xhy1U9K0GbHHOxuW6UUd6UBRSXTG+U4aM PA9jHyhrWE5IHFXdQLwHawPoffP2Sfeau2EVXxIt4+P2BlyxWcXYZqzh+0+asRYHcF FKS/lGeiR6nkYnTsGUcWSOFYymW4Jj+jP5eC2QzHVDtz9bNXuilB+fnouFEOHikSpk 4tFLUQS2Jj6aD5ViTssU5EHftZ8SLJtaH2UOKlR6NSLixAXRrydgErNqNwf+WcbcJO mUh4OmNw+dvgn8iKTg576wT4ND+tRusgxtz54riJzStmSjn4fpg2trVJhh/fc4wArl dyPlBmsOv+WKT08S6K1VkKukl8bF1bwMEFxXqrQJdOFb1f5snpDX5sw2Z6EoXXyJSv k5BqvwJzyGEgYoFpe5DJIjxk= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id A153B321012; Sun, 6 Oct 2024 17:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234074; bh=zvWsa7Fnpm3dSSjuQeCQ4qpNg76QQdCXsBmMqcY0eeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SbW3MaV7IyvP6xCBU/2NuU4jmCDn2YN9nu7zoGie9Sf1/xatgwdjmFrGIdOi4djit J3febKjWM6A4MmdjBRXu5gtoXLESOI1E++0lneTnTvdyjkFLNCwKeLkTlVjQ/Y078v wiQW0m8W7XVYLTnFg/vp6DMN0m59p5AmJz2B/T51ymA2EDqrFEdJkXEObqUDkPJMuC 4R45+sQ7/CoDo2VV9SsztxURJemkfT659283fr801s2TNM1d5loTnmHOjZExkalFBZ Q3VLmaSGmSs5MePJK9uM1qbu+KwJnfolct7ZL5cGH0fHAY7whhfpGEPtL/oMX3F/8o 91oInSkq6rChlIOK5sq+sAaBos74denhPzs5dhM/bewlel09CXY2XSYpOLhypl8eUu O+XYMpRydTSMurxpTwP4ECyfcm86SjxMEWWC1ozuCxie6JGYngJQM3oNrVE+q8Nx9w xyF6H6KXYAXUauErOiUrjD0rZ6Sd1aafIOFTR1wK0ccaquHsvbDsrGqMP+CfWvJGen rTkd2Dn8afAc06zpBpX3UVKB8fxnEurkC5+P4kG34cLccyqI1EK04Hw02Bkz/nPAnN lJ9jf3XXU2sW7xXQEV2QmGaaU8sGU7wiHIUv6NMO13D5/x3K0d7hX7nylXnYtKhAXM Qdvec0/ub96esiCytwe+BFec= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:31 +0200 Message-ID: <9199fb3edff0e5ebfd28dfead197e8f8228096f2.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/language.scm (hime)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5360c0000173b293e9e24290a2e8eaed84e05750 --- Rebase on latest master. 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 2d522f6877..fb8d090fa3 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -218,10 +218,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 -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v2 7/8] gnu: nimf: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 06 Oct 2024 17:02:06 +0000 Resent-Message-ID: <handler.68150.B68150.172823408717747 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.172823408717747 (code B ref 68150); Sun, 06 Oct 2024 17:02:06 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:27 +0000 Received: from localhost ([127.0.0.1]:42210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sxUdL-0004c5-BC for submit <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:27 -0400 Received: from wolfsden.cz ([37.205.8.62]:53446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdF-0004bJ-Ql for 68150 <at> debbugs.gnu.org; Sun, 06 Oct 2024 13:01:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 18AA431E6B5; Sun, 6 Oct 2024 17:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234075; bh=gANqb4yaugW04t+OLOEbQxsylSJEXs8mpibnzyK+hwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oW4dlLjmrcv3WSiHYA1sBmME/WROLadweLM0weKk/6YMc+hA+l6CCPYODGVOg8VGU IA8CaYfFB+iFf0bpUrn4QogY/nqZsGa8o4jVai5836yZ4XZuUfwHhcLO+k6ZncupH2 3cZ34O3JVFwg0PaQTyW7UN4cl/HqfDnJwl2OSTnuWsbuNSj4PrFrS0AFsos39VPDQs OFaDj5PiZd7/gii8kEutFkAddK7HziyiuqMfUCEn030oJ9/7pIactDuJTvoNke3196 HrhEEt6GXC2lj1u1kNCMAAxeWvEs6vrGVAXohUeOF4cNCDtLySdzSd/Du5b4xzNyJm 2TVrGCZWhOrk6CcQ0iEe41lQ5yF+GadUlCh0+mp5G6oGuVTGtJEzVOl/r7kx3PcC6w M9Vcn+BLodn796NWNF6Mu9w86j3GBObMmphyKkfg1xJxBkidS36BBMGLX1YlAegAL3 nE/Q3TDcAPd/kxFLRrCZHvHPMygH3NsectPodcqvBmsN4w51RlLtjaJEDT7j5wGXBw 9CKf4ualbI6lNSaokmzGBKzXPJSwtfnT4P419FglX8tKd+ll4IsDykTtwJED9Gim3o 6/ccG0ea/mIXBemGlzmH+2ncwXSobLBkTBD0/9pQ2IIs4mizY9o8JzeSKhJ48ez0H3 u+CNtqzAc0241gHpns2HWcCY= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 6FD2C31EE41; Sun, 6 Oct 2024 17:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234073; bh=gANqb4yaugW04t+OLOEbQxsylSJEXs8mpibnzyK+hwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G0MVl68vIa6IPtmJDtLL/OrCsGHMRaadIQ5ojh90HURyZxwAo3iFJTjIoGf/029kJ IwJn+qx/vXGFGqRi8XViq7dJ4noTrLQUPke+g5czggPOk2hByv2uuSOlnxxw+aTVFs XX5MmMCZecmUZ5ClM+YUoEDkqkVTHMjEEC7IoABl3GzMlG0hCuvpAJSEolrNxCUF2+ UyGe8AC1LWM4Xu1aeq5qA1e7B8Uh2V+Q0bnyyJ0Lt7nyU9bROLP/02zyy5B4o66gWk 1DsLcRxAPjviCGhTQhr0iWJXnTaRwz7/9DGqjmjpNk73KBeNE8+ROWbIzmHtWuknFK UfKjFQmqG3HaPMAlXdn/1JY5Wen2W0BTW8vdiyxC6Il1QsZjAHhaa0SGvfEpzn3c1a TsTQWSW9MSpbnUeDSBgkOzgq7SxMDRbl1NHHPIwFzrFcDwzuZLuZ+Tq219GEpQ4IjM x00IcnNWYUFokQvADUQ21K32+whiUJdromVm+TI/kKYAVwuYIF6x+NabgkdbtdqIIB CfnGVrVEqyH7iYVwzcWmibmhjNK3rSZXx/9+e1nojbZgKcIvRC3HNl0TeVSAfSIHB1 gT09DQ86ZeMh9UzDfmZgtEnVZW2kwMYhXci8NzAif723FMtkXhg8vy6gb2yR6EW4VO 1xPzQlLE74IdbxFV4ok0p1EE= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:30 +0200 Message-ID: <4df57c09796c144f2c8f6103228a5206895d097f.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/language.scm (nimf)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5eaaac4cdd50b635d24b10c7fa2d365dcf392498 --- Rebase on latest master. 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 7a3deb0b43..2d522f6877 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -99,10 +99,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" -- 2.46.0
Received: (at control) by debbugs.gnu.org; 16 Oct 2024 17:08:38 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Oct 16 13:08:38 2024 Received: from localhost ([127.0.0.1]:60320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t17Vm-0002zH-4Y for submit <at> debbugs.gnu.org; Wed, 16 Oct 2024 13:08:38 -0400 Received: from 3.mo576.mail-out.ovh.net ([188.165.52.203]:36343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t17Vk-0002z9-CH for control <at> debbugs.gnu.org; Wed, 16 Oct 2024 13:08:36 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.22]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4XTHV76K70z1bjX for <control <at> debbugs.gnu.org>; Wed, 16 Oct 2024 17:08:15 +0000 (UTC) Received: from ghost-submission-55b549bf7b-94z8t (unknown [10.110.113.51]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 673071FD71 for <control <at> debbugs.gnu.org>; Wed, 16 Oct 2024 17:08:15 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-55b549bf7b-94z8t with ESMTPSA id osi1Dv/yD2erSAEAOC58eA (envelope-from <ngraves@HIDDEN>) for <control <at> debbugs.gnu.org>; Wed, 16 Oct 2024 17:08:15 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S0016ea63d6c-2fa5-4ed4-a820-faa5088cd408, BC581D0AC8476CF08C37484D3F5A4D28D157660B) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves <ngraves@HIDDEN> To: control <at> debbugs.gnu.org Subject: control message for bug #73439 Date: Wed, 16 Oct 2024 19:08:14 +0200 Message-ID: <87zfn4ugap.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 17509713878791217765 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdegledguddtlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeujeelieeljeffhfelteejtdeljeehveduffelvefgudefkeehgfdvvdevgeevfeenucfkphepuddvjedrtddrtddruddpledtrdduuddtrddujedvrdefgedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtoheptghonhhtrhholhesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=nBuJI4LETjwvG7DrMSmYelerXwDqskmkroBdUk7BK8s=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729098496; v=1; b=QCDgoFijdfbgyWWPCwEu4nE8HtWg3iPncCymJF6p4T/OpZwYs2lrGcA8kvhvaNa5KNKFu0Bx UK5fKniJjmxpNwMG3jbjpGaq3TpmSGMSmy8PQ8cFYlXUsxZ3aSVQifGtWnJJ8GYReTQGeHX4Hgp /75dwSPLqSz6HOSc+M7ctVPHld60m+2RWGA8REkwyfJpJD4LHrzVAVtFcfqZT9RpVc3widEM/nO 34BQL7RUmFfsAnD0ki2YHGNB4NT8h7VIEkIvwI9r2heYmPpy1EDn4yYDOanDMoDT+gD1/lmQl/L dJtc+2Rmkzz1g8l/GOyO2ODWYfComVCBl0J+gSkES0BYg== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) block 73439 by 68150 quit -- Best regards, Nicolas Graves
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 0/8] Fix usage of glib-or-gtk-build-system References: <cover.1703953716.git.~@wolfsden.cz> In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:50:02 +0000 Resent-Message-ID: <handler.68150.B68150.17377193862520 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17377193862520 (code B ref 68150); Fri, 24 Jan 2025 11:50:02 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 11:49:46 +0000 Received: from localhost ([127.0.0.1]:43906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbIC2-0000eY-7O for submit <at> debbugs.gnu.org; Fri, 24 Jan 2025 06:49:46 -0500 Received: from 10.mo561.mail-out.ovh.net ([87.98.165.232]:45855) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1tbIBy-0000e6-RW for 68150 <at> debbugs.gnu.org; Fri, 24 Jan 2025 06:49:44 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.25.23]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4YfbhN1kl7z1NMj for <68150 <at> debbugs.gnu.org>; Fri, 24 Jan 2025 11:49:39 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-4pvw8 (unknown [10.110.178.161]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 969FC1FEB6; Fri, 24 Jan 2025 11:49:39 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-4pvw8 with ESMTPSA id wdg3B1N+k2fE5xsAkvPquw (envelope-from <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:39 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0049f401839-5d6d-4f4d-b076-46c30af28b53, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:20 +0100 Message-ID: <20250124114934.24600-1-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 9102619275259208418 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekudehtdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=mlhwYV0lzekJBgku5j+mRDMIo6CRw3bFy7FL/Y/7D3o=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737719380; v=1; b=Iq9TScNgZF5VJzhOairH27yXpCGGU4e1wz7WekID0x2YJ13Fcm0A4PWACl6v1E2puakRF810 XhaOjwLiMjnBwLvXXpE87Ahpbw4BqzI1v7IhOdBZIo9DGIZ6R2BpRLKIy6l2H80jRlqxG3uhj4R n8iXkk4fZzDxsQFGk35bUl+ZwFpeCBbbM/nFLYBz8FjQOqM2IhEmDeoORv0EF6R/WoyxFvo1ZTR h3C+tAlQGv6t8qllQwtzqa5LbwzhlNTaGGKa2E30fa/1q839LuIEwl0oELO6abBgirvkeMCvoEu 1F6R/f+1P0TRBU82KaOpK8kGotuSYpTfaKLz1mlNmsOVQ== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) This is a rebased version of the patch series by Tomas Volf. Using glib-or-gtk-build-system requires hard-coding the list of modules in #:modules. Libreoffice and netsurf tried to use %glib-or-gtk-build-system-modules instead, but that lead to crashes. This series introduces new %glib-or-gtk-build-system-default-modules that contains the list that should go into #:modules. Using it in libreoffice and netsurf fixes the mentioned crashes. Other places were adjusted as well to use it instead of copying over the list. That would be hard to keep in sync. Tomas Volf (8): build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. gnu: netsurf: Actually use glib-or-gtk-build-system. gnu: libreoffice: Actually use glib-or-gtk-build-system. gnu: sugar: Dehardcode #:modules. gnu: sugar-datastore: Dehardcode #:modules. gnu: sugar-toolkit-gtk3: Dehardcode #:modules. gnu: nimf: Dehardcode #:modules. gnu: hime: Dehardcode #:modules. gnu/packages/language.scm | 12 ++++-------- gnu/packages/libreoffice.scm | 2 +- gnu/packages/sugar.scm | 15 ++++++--------- gnu/packages/web.scm | 2 +- guix/build-system/glib-or-gtk.scm | 9 +++++---- 5 files changed, 17 insertions(+), 23 deletions(-) -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:50:02 +0000 Resent-Message-ID: <handler.68150.B68150.17377193872532 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbIC2-0000ea-JN for submit <at> 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 <ngraves@HIDDEN>) id 1tbIBz-0000e8-LT for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:40 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002e60afb90-94ec-4eaa-b501-5dab90be2950, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:21 +0100 Message-ID: <20250124114934.24600-2-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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." -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:50:03 +0000 Resent-Message-ID: <handler.68150.B68150.17377193992582 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbICE-0000fZ-7X for submit <at> 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 <ngraves@HIDDEN>) id 1tbIC0-0000eB-JL for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R006460fda66-9e6e-4d8f-930d-eef12ad76909, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:22 +0100 Message-ID: <20250124114934.24600-3-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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) -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:50:03 +0000 Resent-Message-ID: <handler.68150.B68150.17377193992590 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbICF-0000fg-BB for submit <at> 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 <ngraves@HIDDEN>) id 1tbIC1-0000eD-FP for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:43 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G0064b7b6814-c630-4334-b685-c8c21dc0d3aa, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:23 +0100 Message-ID: <20250124114934.24600-4-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 4/8] gnu: sugar: Dehardcode #:modules. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:50:04 +0000 Resent-Message-ID: <handler.68150.B68150.17377194002597 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbICF-0000fj-Mx for submit <at> 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 <ngraves@HIDDEN>) id 1tbIC3-0000eR-10 for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-113S00733755dfd-c07b-4cda-ba66-30228bc49959, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:24 +0100 Message-ID: <20250124114934.24600-5-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:51:02 +0000 Resent-Message-ID: <handler.68150.B68150.17377194153037 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbICV-0000mu-3U for submit <at> 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 <ngraves@HIDDEN>) id 1tbIC5-0000eu-2H for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G0017dddc54e-0e17-4d35-a578-4ccb80dc5716, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:26 +0100 Message-ID: <20250124114934.24600-7-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 7/8] gnu: nimf: Dehardcode #:modules. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:51:02 +0000 Resent-Message-ID: <handler.68150.B68150.17377194163045 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbICV-0000n1-SW for submit <at> 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 <ngraves@HIDDEN>) id 1tbIC6-0000f0-4A for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0040ee4a7ee-6ebf-4e19-805b-deb8bade9c79, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:27 +0100 Message-ID: <20250124114934.24600-8-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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" -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 8/8] gnu: hime: Dehardcode #:modules. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:51:03 +0000 Resent-Message-ID: <handler.68150.B68150.17377194163052 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbICW-0000n4-7N for submit <at> 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 <ngraves@HIDDEN>) id 1tbIC6-0000f3-DV for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:48 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0040910126b-a311-4e03-88a2-b0300dd6c6a3, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:28 +0100 Message-ID: <20250124114934.24600-9-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 5/8] gnu: sugar-datastore: Dehardcode #:modules. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 11:51:03 +0000 Resent-Message-ID: <handler.68150.B68150.17377194173059 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbICW-0000nB-Jp for submit <at> 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 <ngraves@HIDDEN>) id 1tbIC4-0000ep-Fv for 68150 <at> 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 <at> 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 <ngraves@HIDDEN>); Fri, 24 Jan 2025 11:49:45 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S008cf27bc6c-8fcb-485e-a2a2-99541404d18d, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 12:48:25 +0100 Message-ID: <20250124114934.24600-6-ngraves@HIDDEN> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250124114934.24600-1-ngraves@HIDDEN> References: <20250124114934.24600-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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 -- 2.47.1
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] [PATCH v3 9/8] gnu: libreoffice: Update to 24.8.4.2. References: <cover.1703953716.git.~@wolfsden.cz> In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Fri, 24 Jan 2025 13:39:01 +0000 Resent-Message-ID: <handler.68150.B68150.17377259151328 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150 <at> debbugs.gnu.org Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.17377259151328 (code B ref 68150); Fri, 24 Jan 2025 13:39:01 +0000 Received: (at 68150) by debbugs.gnu.org; 24 Jan 2025 13:38:35 +0000 Received: from localhost ([127.0.0.1]:44201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbJtK-0000LM-ML for submit <at> debbugs.gnu.org; Fri, 24 Jan 2025 08:38:35 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:33793) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1tbJtG-0000L9-NR for 68150 <at> debbugs.gnu.org; Fri, 24 Jan 2025 08:38:33 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.17.59]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Yff5w2cspz1flL for <68150 <at> debbugs.gnu.org>; Fri, 24 Jan 2025 13:38:28 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-28qbk (unknown [10.110.113.226]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9E9B81FE81 for <68150 <at> debbugs.gnu.org>; Fri, 24 Jan 2025 13:38:27 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-28qbk with ESMTPSA id tIv9F9OXk2czyQAAimzGBw (envelope-from <ngraves@HIDDEN>) for <68150 <at> debbugs.gnu.org>; Fri, 24 Jan 2025 13:38:27 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S00293e38c13-6255-4d9b-9a59-3d7f1cfd2dad, 42C72E775661E59A11C2D2C7F937A80047EE2A81) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Fri, 24 Jan 2025 14:35:37 +0100 Message-ID: <87y0z0pc19.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 10940087921793884694 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedggeeihecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvgffhueehvddutdeigfefudduhefghfekhedttdevtdeggfekkeffkeevheduvdenucffohhmrghinhepughotghumhgvnhhtfhhouhhnuggrthhiohhnrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeduhedtseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=YgitYok658c8EgLM+EJ9PPr1ZNLWYDs34GLWbnF0+3Q=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737725908; v=1; b=yw8wd4c0t1jzoA5LlHFvjfhxpEcBlOAxagn7GYf9xNVtJmf2k9RsZjlDBA44gSPC4OGcNxOg haniw8xYTyJWu/NMeu8Yt/ynjp7b2Rasqy8ae4WpehnVMqfhtIb0cz5QTIPGTTLme9d3+YtFiFE HNydZot3kGTk3YnGKg6nqGeLi94rbLQyBzC2Ls6FLZlxJSxE50IR3Mc0YuH3py09WZvt4nMaLx0 B5EH2MA7L2yFDRgPiXsvRarzlA3DXEbZB0vEp8V92KXKWUZ3GHS0yNokd95Op+Gx2H2/qteDf3C x6c9R+6W4GF+5Yx54a+aQxfiNOKPCauVezITKDk425YAw== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/libreoffice.scm (libreoffice): Update to 24.8.4.2. This patch is to complement #68150, if we're rebuilding libreoffice, let's update it too. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e61ed11143..4ca0857b01 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -893,7 +893,7 @@ (define dtoa (define-public libreoffice (package (name "libreoffice") - (version "24.8.3.2") ;keep in sync with hunspell dictionaries + (version "24.8.4.2") ;keep in sync with hunspell dictionaries (source (origin (method url-fetch) @@ -906,7 +906,7 @@ (define-public libreoffice "https://downloadarchive.documentfoundation.org/libreoffice/old/" version "/src/libreoffice-" version ".tar.xz"))) (sha256 - (base32 "1sa7bxxh7v26p77vj1mspynhn2l2b1vnz1mpyczhnmcxcan9nw2x")))) + (base32 "05qs12z0xkpqy3yl7378d99y82rswic101aw65k1macslcpdwr0m")))) (build-system glib-or-gtk-build-system) (arguments (list -- 2.47.1 -- Best regards, Nicolas Graves
X-Loop: help-debbugs@HIDDEN Subject: [bug#68150] QA review for 68150 References: <cover.1703953716.git.~@wolfsden.cz> In-Reply-To: <cover.1703953716.git.~@wolfsden.cz> Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 25 Jan 2025 09:22:02 +0000 Resent-Message-ID: <handler.68150.B68150.173779691423826 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: control <at> debbugs.gnu.org,68150 <at> debbugs.gnu.org Received: via spool by 68150-submit <at> debbugs.gnu.org id=B68150.173779691423826 (code B ref 68150); Sat, 25 Jan 2025 09:22:02 +0000 Received: (at 68150) by debbugs.gnu.org; 25 Jan 2025 09:21:54 +0000 Received: from localhost ([127.0.0.1]:48493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tbcMT-0006C9-UP for submit <at> debbugs.gnu.org; Sat, 25 Jan 2025 04:21:54 -0500 Received: from 2.mo581.mail-out.ovh.net ([87.98.143.68]:49431) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1tbcMP-0006Bn-R3 for 68150 <at> debbugs.gnu.org; Sat, 25 Jan 2025 04:21:52 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.176.170]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Yg8MH3zhSz1CcZ for <68150 <at> debbugs.gnu.org>; Sat, 25 Jan 2025 09:21:47 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-nvklb (unknown [10.110.188.76]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1485B1FEC1; Sat, 25 Jan 2025 09:21:46 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-nvklb with ESMTPSA id wekAJiqtlGeffB4AaCQ40Q (envelope-from <ngraves@HIDDEN>); Sat, 25 Jan 2025 09:21:46 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001945bc765-b57e-47a0-a67d-a22a73cb7848, AC25A2E6FC4704283EA03205559AA81FAFBEEAA6) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves <ngraves@HIDDEN> Date: Sat, 25 Jan 2025 10:21:46 +0100 Message-ID: <87v7u3p7th.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 12478067193785803286 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudejgedgjedtudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeujeelieeljeffhfelteejtdeljeehveduffelvefgudefkeehgfdvvdevgeevfeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeduhedtseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=UnZPeBx8e5nDbEcnHrcguivZ2dSYFsMZLle3PfgunNc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1737796907; v=1; b=a5UuPjDyQtfmcWxaVmrlbGF/oMlrNQyaai/fu3cHgV4DCj37Woj4mmG/vGOBNkGN6I3JowPd iR+uiCBD3WjnT+whfSvHvh+oiATOP0ICTdbO+SSQp4T8RPA8shcKBKTKbRtlqF5/WeM47uddXFG 4bpInoVNkm9eMpiuSsDJwDq/j74ezoKOb+3Iu33tAZEp4aJ11V6zv1UHipVv1oMOEzW29a9CEYC rc3baK7tVcem5gY8ei8WM6v8SpbHTrIszvdjS2FoUU2pyup5rYJVQUsmuQF+Y1KYu2Ev3Iz453R 9m8dKzB7m60ZxFkSLTAUOTvOUTI7St76Wat80EyZZD4DA== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) user guix usertag 68150 + reviewed-looks-good thanks Guix QA review form submission: Tested, makes guix shell --pure libreoffice -- libreoffice work properly (fixes reopened #30642) Items marked as checked: Lint warnings, Package builds, Commit messages -- Best regards, Nicolas Graves
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.