[bug#79224,23/43] build-system: linux-module: Redefine linux-module-build functions.
| Message ID | 20250812090457.19016-23-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 E157027BC4A; Tue, 12 Aug 2025 10:07:42 +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 83BEA27BC49 for <patchwork@mira.cbaines.net>; Tue, 12 Aug 2025 10:07:42 +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 1ulky4-0007Dm-77; Tue, 12 Aug 2025 05:06:52 -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 1ulkxV-0006pk-LN for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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 1ulkxU-0001K5-8F for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -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=8cxoRCA8hwvTifH5BD+t4NQiC6a8qiDsRXJuEKtX/PY=; b=AHQKoP7p/lO03wbG3AYVQgbfCE8G4e1k3iqynyR71qsmQbia3/nDcz1lPIsN26t9xuhhk4Nk/5rdVTuXPrS2iep3ZJ7V461bA6mHcrrtjXOogaq37aR412SIN0aIYrCoohhmdONjJ1GiRpMixFl0aRxGyyAn+Mlj74+BRntTgY8kia1GmG0YgYP+CwtKe/jzzo3GoGfZDhekTEd94G+hBS+NKsJ71zt5Hu62C5GbAM2RyY6BKEgP8Qj/vuN3BgUF0v+uskbHgb44oRTnWVOZaWFpLXokqcb0xIVwOc5/7lWV2CuaeDxbjrsUZqbT7K25C6fRyzCrempRefMCBXdRlQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ulkxU-0007jD-1D for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 23/43] build-system: linux-module: Redefine linux-module-build functions. 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:15 +0000 Resent-Message-ID: <handler.79224.B79224.175498956129426@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.175498956129426 (code B ref 79224); Tue, 12 Aug 2025 09:06:15 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:01 +0000 Received: from localhost ([127.0.0.1]:51840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ulkxE-0007eU-JN for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:01 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:36583) 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 1ulkwx-0007bi-8J for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:44 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZt1YxWz5yVX; Tue, 12 Aug 2025 09:05:42 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:42 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.252]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZt0fj1z1xqp; Tue, 12 Aug 2025 09:05:42 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7644E783284; Tue, 12 Aug 2025 09:05:41 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003de486f8d-c71f-422e-b598-a7b293b85f94, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:31 +0200 Message-ID: <20250812090457.19016-23-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: 280912027421696738 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=8cxoRCA8hwvTifH5BD+t4NQiC6a8qiDsRXJuEKtX/PY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989542; v=1; b=je4bj+aTp2V0GEUpm+YxPyW5Dx33gECPDmtJli4qyg3t+Wwt7HLIg/cClWnonxAXqNiOiop0 VvyZ/6wfZUUostZnMmUqUIQ3Dg+T7SI3ASMNbQ1wQAlz9eebUlRZZW5EuAMF2SAjLFIV1XRHKa+ RB1b4jJ3uoSP+gGOC3TD/tteFfnDuTLHxum9HQVsj3meyxy/33p+remqAQblmM6eKOdZjUxk/c/ zcEGUsigt5m6goylOnugmLCC0olUpgQE9M/JxJZjoMSkaXod3oynarlsV9iUezmnfCT5Fi6EWeX /6ap316EZ8E+fD9fBA0n5Zp2EUbEvU54kFCISWwrJ7S1w== 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/linux-module.scm (linux-module-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I289c0c77a219445ae0c21f1a9709a67063b38f55 --- guix/build-system/linux-module.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index d8ebef60d0c..a0d213abd58 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,12 +191,8 @@ (define builder #:parallel-build? #$parallel-build? #: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 - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define* (linux-module-build-cross name @@ -250,12 +247,8 @@ (define %build-target-inputs #:phases #$phases #:tests? #$tests?)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile - #:substitutable? substitutable?))) + (mbegin %store-monad + (return builder))) (define linux-module-build-system (build-system