From patchwork Tue Aug 12 09:04:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43371 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 4C70027BC4A; Tue, 12 Aug 2025 10:07:31 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1589727BC49 for ; Tue, 12 Aug 2025 10:07:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkyL-0007bv-Ct; Tue, 12 Aug 2025 05:07:09 -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 1ulkyJ-0007Z8-21 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:07 -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 1ulkyI-0001Vu-OR for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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:References:In-Reply-To:Date:From:To:Subject; bh=VOD3JsBdCQTQZrWMus0MvxGqYfVQb0TH12m36qmVSBQ=; b=JMJa+/DV9Sb6Jww5Tr4oS7wls16aE/FzI/LDrjdlOURE35ml3C1D7fPJQXyz/6k9xgv0B94ajaTEaMQbJ5ovE0YRMtPu4RNkHlXYUsWhLUF2i6203AqCZv5LnOEDRB3IPUL7OKHXLxndvVCQ2P0ho08zt8+DnWbRcMOyzofSvKg/xuN309lfK68vRL58AKfaDMoJI+d1XZN5bzM4TS72WFMHouCx1wlUh50JroDVEpjY/vw30T0rAu99kkqh0o/KOjHH1yWSlbww4v6h2tKXvsLMa/dljYq0ngBqXQ7TRfLgA9ejnsIB0t8LwbHvewqDV+oIFhSSyhHql57AsXWKqA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkyI-0007ob-Hc for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 43/43] build-system: zig: Redefine zig-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:07:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79224@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498959429925 (code B ref 79224); Tue, 12 Aug 2025 09:07:06 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:34 +0000 Received: from localhost ([127.0.0.1]:51933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxl-0007mW-Px for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:34 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:43203) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkxT-0007if-0G for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:15 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbT678Pz20xd; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.27]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbT59kNz1xrh; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 4F50B783280; Tue, 12 Aug 2025 09:06:13 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G002c9804b44-bae9-4c3a-8c90-6b3129d2212c, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:51 +0200 Message-ID: <20250812090457.19016-43-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812090457.19016-1-ngraves@ngraves.fr> References: <20250812090457.19016-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 289637752566047458 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=VOD3JsBdCQTQZrWMus0MvxGqYfVQb0TH12m36qmVSBQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989573; v=1; b=f03t/iL4h9oyLYN8S5izi87XREsMEZhRMZq29ml36A32ZO+F0mS0Yx29qww7S2CaeAHcPZII 8pjnzYTaMX2rKla6efUzIsEHb39zvR9yklhbWXqkidOHyNfEXYMnnT6WCJI1jZQ71AF1V5YrTrF r76euXCgSZ+AvX8p4cki5SEgEgc+U+lxD/XLtRSirJIulHLM+SRM5ktHqJAccsPqgWF1wqNnIw2 dAl9HFpghRs71+mRXt0RjDY8+alp3cZERKWxeNj3jAVbTzSj5DnHBnKetRwJBKuvxOfQBJiF+E1 aMbqGvFcr8+ocPoixnwwjwUri2XPtQGyl5lND1mh/mmtQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/zig.scm (zig-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ide64e7047d6e7127024471b311366f3cf8533e00 --- guix/build-system/zig.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/zig.scm b/guix/build-system/zig.scm index 5d95e0bec49..d9190b9aa4e 100644 --- a/guix/build-system/zig.scm +++ b/guix/build-system/zig.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Ekaitz Zarraga +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,11 +94,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (zig-cross-build name #:key