From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id MLwNKfKsm2VVDgAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id eG48I/Ksm2W1AgEA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:10 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704701170; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=R8pnSDD2u7KrNAeYD4YorgYlJXus0PDaUd+7DtvwpFA=; b=ax01bcKaVwRr+B8d2NccCgcG0dT6Y95DnBp6um9uThBa9GeOboGVKR7R6qJXUlShqKH4bV gsN2i3g+7tFp2FFBELqbHFHYZlxUp0SI3RFNpC1+VSifICFkKaXim6xp9Vn/Ec/VxUQS/e N1SymPQPBh0PCjXGFpJDPCH5AvXLIuybIgua1ZcLFfWhb2mqtp6I/+Q/4oOnKjfsRQ3q+C ZorMhM+mV6A1YiYbux5DOU3Rb2P/sF5DFU87kQzjWHmky1u3zKQ3LoIY3pAYgbPoxecsIB Xmnxm7jowSPlcDC25RFuqUmgFafkkceJry4+k/Bz3GYjDm3/9TbN8mjcdc2CDA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701170; a=rsa-sha256; cv=none; b=Or2om4dg30PRr05aoUtCD++lVgpdsDVtgVRG8Qa9gIAEKBJTOiflbZm/HaR27j/e3J1jqe 82X3KeLJR30R8sVcTZgvW/ZiSwKmaYuh2uJvGKYBA/BhTp2Y3rX5qDxjfesj9Qn7gVVwJl wbGkOkfePA8H/1ym+5vQlNlb9zvb7YCxBX/UYG9HYFOcB7AXG6IJonwS049caPmVRxjWLC QpxIGjDgfokPQF37/X8sMhf32ynGM+Va319knlnEN8tyXCJq8HgtyNaqXq12NQHJlu7sZ2 jN4BfEIHrOGiO6UzF3svDInYem9oOqm3LgTczMPCdQ6EUvz7gGzgjzGr7zc/qg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4007277D11 for ; Mon, 8 Jan 2024 09:06:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdC-0003Ph-To; Mon, 08 Jan 2024 03:05:10 -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 1rMkdB-0003O7-DJ for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:09 -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 1rMkdB-00030r-4P for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdH-00083y-52 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 25/48] build-system: linux-module: Redefine linux-module-build functions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68315@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.170470108230510 (code B ref 68315); Mon, 08 Jan 2024 08:05:15 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:42 +0000 Received: from localhost ([127.0.0.1]:34976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcj-0007vs-UE for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:42 -0500 Received: from 4.mo584.mail-out.ovh.net ([178.32.98.131]:51161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcb-0007tz-4N for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:34 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.2.89]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id C10D42938C for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:25 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-rr9q8 (unknown [10.110.168.247]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 769B21FEAA; Mon, 8 Jan 2024 08:04:25 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-rr9q8 with ESMTPSA id J+AyGomsm2VVAwAA5xo7qg (envelope-from ); Mon, 08 Jan 2024 08:04:25 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:57 +0100 Message-ID: <20240108080350.1665-25-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr> References: <20240108080350.1665-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12432468249777464034 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpeegnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 4007277D11 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.81 X-Spam-Score: -6.81 X-TUID: oET0D2guBN5a * 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 e46195b53c..87aa485bc1 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,12 +190,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 @@ -249,12 +246,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 -- 2.41.0