From patchwork Sun Oct 6 17:00:24 2024 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: 68651 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 3950427BBE2; Sun, 6 Oct 2024 18:02:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6FB1227BBEA for ; Sun, 6 Oct 2024 18:02:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdt-0000hU-6R; Sun, 06 Oct 2024 13:02:01 -0400 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 1sxUdq-0000fk-UJ for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:58 -0400 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 1sxUdq-0000zL-Em for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=VZe3h0ljXUPaLDH8d6GUh4VyfqvPQiTotA1V9/R4nh0=; b=NPqhoOxrryGyw5jj2JgqqhlxUUzYA9EgvQHTV4VFUnG6rIMElLM62rvxf5bhp17HrqOZm1KfBShoyHxAeHbHgjQm0DwClqaVPSRbMTcJe/MXExRC3F7vmiF6Nkc714fFaxr7LavHqrVh3NfR/Be7b2XjweGUcwpcn7/cbDMvWJ9x5uMbONBPeiimiulxQqTYGZS+CZnYpL4053utYWrld+4vTnsQvsvpuEbw1SqLMI1REJaZ3TwLjiXxDsf86gko2sHq/UKypspvujH4X29Up+OHOON8Bw0KrwVBaIZYJIEpHzGedq6waaPsfsiaxKLJofTwREOvIfA+uctwuO8JyQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdw-0004ds-H8 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02: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.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 ) id 1sxUdH-0004be-6D for submit@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@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= 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 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 --- Rebase on latest master. guix/build-system/glib-or-gtk.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.46.0 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."