From patchwork Mon Jan 8 08:03:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 58663 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 AB05727BBE9; Mon, 8 Jan 2024 08:07:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 C392527BBEC for ; Mon, 8 Jan 2024 08:07:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdH-0003XB-Lb; Mon, 08 Jan 2024 03:05:15 -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 1rMkdE-0003S2-PV for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:12 -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 1rMkdE-00032C-GS for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdK-00084z-Go for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 33/48] build-system: pyproject: Redefine pyproject-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:18 +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.170470109130608 (code B ref 68315); Mon, 08 Jan 2024 08:05:18 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:51 +0000 Received: from localhost ([127.0.0.1]:34997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkct-0007xV-Cx for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:51 -0500 Received: from 4.mo584.mail-out.ovh.net ([178.32.98.131]:42441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcm-0007wg-FN for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:45 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.43]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id AFA83293D7 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:36 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gtjkq (unknown [10.109.139.190]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 686BC1FD5E; Mon, 8 Jan 2024 08:04:36 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-gtjkq with ESMTPSA id Zb1TF5Ssm2X4oB4AFX/BDw (envelope-from ); Mon, 08 Jan 2024 08:04:36 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006230cb4d8-7e88-4762-97a1-1ed207ec78da, 93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:05 +0100 Message-ID: <20240108080350.1665-33-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 X-Ovh-Tracer-Id: 12435564474315301602 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpeeinecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht 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/pyproject.scm (pyproject-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ia26001291b472c69c65647d8bddd1199f0ddc483 --- guix/build-system/pyproject.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index 2a2c3af3f3..c0404d0842 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2022 Marius Bakke +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,7 +101,7 @@ (define* (pyproject-build name inputs (modules '((guix build pyproject-build-system) (guix build utils)))) "Build SOURCE using PYTHON, and with INPUTS." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -124,14 +125,8 @@ (define build search-paths)) #:inputs %build-inputs))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:graft? #f ;consistent with 'gnu-build' - #:target #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define pyproject-build-system (build-system