| Message ID | 20250812090457.19016-28-ngraves@ngraves.fr |
|---|---|
| State | New |
| Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8FF5C27BC4B; Tue, 12 Aug 2025 10:07:35 +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=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 67BC127BC49 for <patchwork@mira.cbaines.net>; Tue, 12 Aug 2025 10:07:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1ulkyB-0007Os-BA; Tue, 12 Aug 2025 05:06:59 -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 <Debian-debbugs@debbugs.gnu.org>) id 1ulkxX-0006sr-7y for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:19 -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 <Debian-debbugs@debbugs.gnu.org>) id 1ulkxW-0001L7-O5 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -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=PefZY+/SVOgoYT1hIeAFZ+DQxGSFkvE/UdYFgjgLdh4=; b=CSQdVQlXGpe8ACXzsmaMmyKIm7jFj3zHp4Fa904/m0Z0ZFtqjBo3SvYG4BIY9VGKlB4aUzJNTheKYGTBA7wmASRqGUAaV1ia68EM8lNO+PNsM9BExeDjMtaYjWdO34IpvmrPaMsCSCtIxOeotwhDjNWfJPhNu9PWjlszBGMMW8bctpWAG01slwkq9jZIqHDFDO5R0AOqBOU5ut5bTOO30uvutuM105hrD6OH5GEqvDgI0sLqlnOexUgp4Ou5HL2ilRp5JcTESS/uzh+PfSGBxADg192G9245fEUQqqrxZcIy8fH88EVqBHv8gjKbtHHuk8ZeO8D1bgVZ/wWvZCEM1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ulkxW-0007k3-GO for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 28/43] build-system: node: Redefine node-build. Resent-From: Nicolas Graves <ngraves@ngraves.fr> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:18 +0000 Resent-Message-ID: <handler.79224.B79224.175498956529523@debbugs.gnu.org> 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 <ngraves@ngraves.fr> Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498956529523 (code B ref 79224); Tue, 12 Aug 2025 09:06:18 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:05 +0000 Received: from localhost ([127.0.0.1]:51857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ulkxI-0007fx-QY for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:05 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:58079) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ngraves@ngraves.fr>) id 1ulkx6-0007cd-C1 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:53 -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 4c1Qb32Pcgz20gM; Tue, 12 Aug 2025 09:05:51 +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:05:51 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.215]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb31VDtz1xrh; Tue, 12 Aug 2025 09:05:51 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 733D4783281; Tue, 12 Aug 2025 09:05:50 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002cd89875d-d98d-47e5-a9fb-f18cda9da108, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:36 +0200 Message-ID: <20250812090457.19016-28-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 283445303564755682 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=PefZY+/SVOgoYT1hIeAFZ+DQxGSFkvE/UdYFgjgLdh4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989551; v=1; b=k2L6jQNhqHvdI7oJVCurq/IIsghw1I2Hm5z9GQ1Y459B+KsIaRWF4UhmjuySI/+9LVIwNxW5 6S1QKh5Y3oapgS6fnS2sg3I8E0wKSPQEJFr3s2U/xQteR3Ccsc3B4/qTRajf83DV/5jL/O4n6aV pOWLBvNXzgrSiCDcYKtDKyi5USrUP8Xx4VtogZeCJZQntmzmKMLg4rFEb9yB+V/7PAS1JVAXB/G 7XqcCGURx9wLJiXz08Bmxg2e64SV30NyJnBS/GE1lfRtygjqG7G8psZq0/PgvWP83DW0LBwmXaI XL5Wh4P1Qn6g5Gpqy/yq2GAj+crP76kAEHaTC/Ttd2H7Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Reply-to: Nicolas Graves <ngraves@ngraves.fr> X-ACL-Warn: , Nicolas Graves via Guix-patches <guix-patches@gnu.org> From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org> 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 |
| Series |
Extend bag-build to gexps.
|
|
Commit Message
Nicolas Graves
Aug. 12, 2025, 9:04 a.m. UTC
* guix/build-system/node.scm (node-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I507547e474c379c0f66dde15abad73787953e5e6 --- guix/build-system/node.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index cde0ccb60e5..995a46d3029 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com> ;;; Copyright © 2024 Daniel Khodabakhsh <d.khodabakhsh@gmail.com> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,11 +121,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 node-build-system (build-system