From patchwork Sat Dec 30 16:38:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58221 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 99C3C27BBEA; Sat, 30 Dec 2023 16:39:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E995C27BBE2 for ; Sat, 30 Dec 2023 16:39:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075Z-5P; Sat, 30 Dec 2023 11:39:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMY-00074p-3T for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMX-0008QL-Rp for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMY-0002ET-EX for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org 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" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMP-0002DF-9L for submit@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 ) id 1rJcML-0002CK-Qx for 68150@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= 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: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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." From patchwork Sat Dec 30 16:38:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58222 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4EE8D27BBEA; Sat, 30 Dec 2023 16:39:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDA0D27BBE9 for ; Sat, 30 Dec 2023 16:39:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075W-2R; Sat, 30 Dec 2023 11:39:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMX-00074l-TR for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMX-0008QH-LI for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMY-0002EM-2S for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org 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" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMN-0002Cn-Vr for submit@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 ) id 1rJcML-0002CJ-Qq for 68150@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= 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: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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) From patchwork Sat Dec 30 16:38:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58217 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F043D27BBE9; Sat, 30 Dec 2023 16:39:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 636E627BBE2 for ; Sat, 30 Dec 2023 16:39:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMb-00076X-U2; Sat, 30 Dec 2023 11:39:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMZ-00075P-N9 for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMZ-0008Ql-FB for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMa-0002Ex-28 for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:04 -0500 X-Loop: help-debbugs@gnu.org 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" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMW-0002Do-LJ for submit@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 ) id 1rJcMM-0002CM-Up for 68150@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= 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: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Sat Dec 30 16:38:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58219 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 177CD27BBE9; Sat, 30 Dec 2023 16:39:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 84A1627BBE2 for ; Sat, 30 Dec 2023 16:39:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMb-00076F-F9; Sat, 30 Dec 2023 11:39:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMY-00074z-FQ for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMY-0008QT-7T for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMY-0002Ea-R0 for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 4/8] gnu: sugar: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMV-0002DX-Lm for submit@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 ) id 1rJcMM-0002CN-9P for 68150@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= 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: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Sat Dec 30 16:38:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58218 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B573B27BBEA; Sat, 30 Dec 2023 16:39:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E9B027BBE2 for ; Sat, 30 Dec 2023 16:39:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075d-D8; Sat, 30 Dec 2023 11:39:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMY-000758-US for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMY-0008QY-Kq for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMZ-0002Ej-7A for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 5/8] gnu: sugar-datastore: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMW-0002DZ-1H for submit@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 ) id 1rJcMM-0002CO-LP for 68150@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= 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: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Sat Dec 30 16:38:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58215 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5A96227BBE9; Sat, 30 Dec 2023 16:39:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9FA8C27BBE2 for ; Sat, 30 Dec 2023 16:39:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075y-Lr; Sat, 30 Dec 2023 11:39:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMZ-00075G-9a for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMZ-0008Qe-1R for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMZ-0002Eq-KG for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMW-0002Dg-Bb for submit@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 ) id 1rJcMN-0002Cd-LL for 68150@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= 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: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Sat Dec 30 16:38:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58216 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 02A8827BBEA; Sat, 30 Dec 2023 16:39:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A030E27BBE2 for ; Sat, 30 Dec 2023 16:39:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMf-00079P-2G; Sat, 30 Dec 2023 11:39:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075o-He for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMa-0008Qx-9W for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMa-0002FC-Sn for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 7/8] gnu: nimf: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMX-0002E3-AC for submit@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 ) id 1rJcMN-0002Cf-LF for 68150@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= 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: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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" From patchwork Sat Dec 30 16:38:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58220 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DE71D27BBEA; Sat, 30 Dec 2023 16:39:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EA3727BBE9 for ; Sat, 30 Dec 2023 16:39:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMb-00076K-Lm; Sat, 30 Dec 2023 11:39:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075Y-4s for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMZ-0008Qq-TE for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMa-0002F5-Gq for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 8/8] gnu: hime: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.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 ) id 1rJcMX-0002Dv-0q for submit@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 ) id 1rJcMN-0002Cg-R0 for 68150@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= 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: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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