| Message ID | 20250812090457.19016-24-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 EDA2327BC49; Tue, 12 Aug 2025 10:07:59 +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 8E0FF27BC4A for <patchwork@mira.cbaines.net>; Tue, 12 Aug 2025 10:07:58 +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 1ulky8-0007HP-5r; Tue, 12 Aug 2025 05:06:56 -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 1ulkxW-0006s7-9X for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:18 -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 1ulkxV-0001KR-Lj for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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=z7rwpLmIkMVk0YbvUdBOuBLGDfotC0SEm6k81UgqEzw=; b=WTlUkzLmQa75kuWPqUC/RhrJoa/GM7Oo6A4b9opYrwMK6htKgM3fGGYbcpGLgQoLflmjmY3q5+Ab3149/OtSy/FpOcSK/vCN4ij7B9140oMbKoPY/t3gjUQyZX7/qFl0gj+pnNvhF+WoG1wEuoWnE627vTNskZwYv+V+mqkBdkILTzkagyzw4/OhovQT0wPep61tzuf6GMPRW4t52tOorQmxOdXIGOXuVqjuI48iSili5GKodt8vukRanhFy9TOYW4FPqDEoYjMINc058QpZmCPC46YG5PnTUlIOxlGropBVuSynG33hGsU/smZSOQnb1FExauKDTKiZKDmHISikWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ulkxU-0007jL-F2 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 24/43] build-system: maven: Redefine maven-build. 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:16 +0000 Resent-Message-ID: <handler.79224.B79224.175498956229440@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.175498956229440 (code B ref 79224); Tue, 12 Aug 2025 09:06:16 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:02 +0000 Received: from localhost ([127.0.0.1]:51842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ulkxF-0007ef-IC for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:01 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:36127) 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 1ulkwz-0007bz-17 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:45 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZw06Xgz1y8c; Tue, 12 Aug 2025 09:05:44 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:43 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.215]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZv67ptz5wZX; Tue, 12 Aug 2025 09:05:43 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 43D408E327B; Tue, 12 Aug 2025 09:05:43 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S00460ca3d55-43b2-401e-ad05-d39cc20afe17, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:32 +0200 Message-ID: <20250812090457.19016-24-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: 281193502052311778 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=z7rwpLmIkMVk0YbvUdBOuBLGDfotC0SEm6k81UgqEzw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989544; v=1; b=RqN9Cw6JEObOeWksQS4jcDH6tdn9OB47D6hrpGjGlHzAnCuyfEZCzyvAmt5LkGKS7Kv0p5B+ oE78iq8tHsZomgh2AYeevozWWog24Hc3lb5Lijl7NhZXr2dDwg21mKdQKGYNhhFfhkiv7BGKnyf lcIvnGC5yztLhDtDBxH7D9p6EfGBhTklFV56XtoIYxywy4qbVOnBJaTO96LuUWs7YUto4eXxteO qpmAqGxhD0f5zAIULNtogUoq+uGPascIQtL2D8SCoeJA3GuhaK1xGnLwovXR0LjtFgBXoHLVc02 ksCCDgaBnyvA4WoWth4e3swNW9Yor+CXTenEwgoiYX7dg== 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/maven.scm (maven-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ieb96bcdb1c654371279bd7295ea69e2dfad71175 --- guix/build-system/maven.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 03e4e96b892..270fceb350a 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -185,11 +186,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define maven-build-system (build-system