From patchwork Tue Aug 12 09:04:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43390 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 77A2127BC4A; Tue, 12 Aug 2025 10:08:15 +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 B64ED27BC49 for ; Tue, 12 Aug 2025 10:08:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky1-0007Bu-0h; Tue, 12 Aug 2025 05:06:49 -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 ) id 1ulkxY-0006tG-Ek for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:21 -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 ) id 1ulkxY-0001LZ-44 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:20 -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=w2EN+RrUpuk7PWvybjO/zBSfFsLRVhm0d1Pu6kWYPt0=; b=di2FyCEgpoOXOIdTklI4N4X5o44PXFOq2ylXl94rxuFxqr7k0fylG9m1tTTO/KsxAG7HiwIQgwuALgVXnhgWAHLeugwDlWiGMR5NBmn9bksRVtDVvS5i/9L90G6zgXWrCLt/+Uji/FynJ8RmCahWHscw5sNgw5ANvulrCBdxYfH8c3Ey+i57Mw7SOTWqNcsGZCW8c7C+Wd9ykxFGIE7f5Xxy8eDS0ozNEr5WztR940aZInrt/j06xziDVvEGIS9nHNG/pF3SlKqVwEaJu8GCmYeJd56lLsGA307Q7topdP/aCtwLcWT2UlYvfRQ8YJb8apGetKXCiRUWLMMwbqgCMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxX-0007kX-UB for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 30/43] build-system: perl: Redefine perl-build and perl-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:19 +0000 Resent-Message-ID: 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 Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498957829752 (code B ref 79224); Tue, 12 Aug 2025 09:06:19 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:18 +0000 Received: from localhost ([127.0.0.1]:51898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxV-0007jY-0s for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:17 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:40303) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx9-0007ct-BW for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:55 -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 4c1Qb627r2z6MfW; Tue, 12 Aug 2025 09:05:54 +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:54 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.249.235]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1Qb61CjHz1xqp; Tue, 12 Aug 2025 09:05:54 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 819ABB8325D; Tue, 12 Aug 2025 09:05:53 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S00482c32f16-28bd-4f55-b6a6-b70816ec4e48, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:38 +0200 Message-ID: <20250812090457.19016-30-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 X-Ovh-Tracer-Id: 284289727419048674 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=w2EN+RrUpuk7PWvybjO/zBSfFsLRVhm0d1Pu6kWYPt0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989554; v=1; b=EnStLzq0R5hhF58jDSWH7N1G9UDo1x39ie35IWAmCOklnWCPJAB24PhHwrGrZbEd83kLyXe7 JSGC3xty2FTu+yh6HCU+DCEDuYF/K6tYAekx+XqKN/12o33jSlQSBFZXNPRRr5RbFnck18xxJat pYaIelgVyFoAXkNkAJGT3UwUpBzhbw/WdaDsALMmMuj7xyruUnDd2+f5P8tuhXygGBozf6avTy0 nLyggq9GxhTy3qzpmp2NRe4RyTdopZTXfSZM50fmYvlwWt1L+Dvt4GE3ELoTi7GdRSKzIs78z3y qJzo5OceXYPIGhE3phx0reQXcjFeZnmLmzIUwmGmYtzWQ== 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/perl.scm (perl-build): Monadic procedure returns a gexp instead of a derivation. (perl-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Id54ae050c2b64269ea42ec9f89d9c3a84ad4429a --- guix/build-system/perl.scm | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 98d48fec7c0..3f088fa6bfa 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2021 Ludovic Courtès ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define* (perl-build name inputs (guix build utils)))) "Build SOURCE using PERL, and with INPUTS. This assumes that SOURCE provides a `Makefile.PL' file as its build system." - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) @@ -146,14 +147,8 @@ (define build #:parallel-tests? #$parallel-tests? #:outputs %outputs #:inputs %build-inputs))))) - - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name build - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (perl-cross-build name #:key source @@ -211,13 +206,8 @@ (define builder #:outputs #$(outputs->gexp outputs) #:inputs #$inputs #:native-inputs #+(input-tuples->gexp build-inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #false - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define perl-build-system (build-system