From patchwork Mon Jan 8 08:03:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 58643 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 3BFBA27BBEA; Mon, 8 Jan 2024 08:06:40 +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 8590E27BBE2 for ; Mon, 8 Jan 2024 08:06:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdI-0003Xz-Np; Mon, 08 Jan 2024 03:05:16 -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 1rMkdF-0003SQ-7m for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:13 -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-00032r-Vp for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdL-000856-0r for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 34/48] build-system: python: Redefine python-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.170470109230616 (code B ref 68315); Mon, 08 Jan 2024 08:05:18 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:52 +0000 Received: from localhost ([127.0.0.1]:34999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkct-0007xd-QO for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:52 -0500 Received: from 3.mo550.mail-out.ovh.net ([46.105.60.232]:51341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcm-0007wd-7H for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:45 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.140.88]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 773FF26E47 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:37 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-qlq6c (unknown [10.110.96.204]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3B45C1FE86; Mon, 8 Jan 2024 08:04:37 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-qlq6c with ESMTPSA id 3jJSB5Wsm2UfgQEAiXcEww (envelope-from ); Mon, 08 Jan 2024 08:04:37 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R00163148b5b-8508-4b5a-b54d-aad5d49ddcbb, 93F3D688BC7B2D554E6C57CDC3775C4FA39180DF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:06 +0100 Message-ID: <20240108080350.1665-34-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: 12435845947312366306 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth 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/python.scm (python-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I1d270fa64192394072279f73ae0d77877d41f01c --- guix/build-system/python.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index cca009fb28..365d216592 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2021 Lars-Dominik Braun +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -182,7 +183,7 @@ (define* (python-build name inputs (guix build utils)))) "Build SOURCE using PYTHON, and with INPUTS. This assumes that SOURCE provides a 'setup.py' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -205,13 +206,8 @@ (define build #: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 python-build-system (build-system