From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SIObOeOsm2V5JwEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:05:56 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id OEykMeOsm2UOaAAAe85BDQ (envelope-from ) for ; Mon, 08 Jan 2024 09:05:55 +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=1704701155; 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=KYo2TM1uKX0/uOzs2QzPajrHaHpzgDqcsho6iWp3nJo=; b=qJjCLtBXlReWKQHbcOYHj9Zg2kTed7YH3qFJNxelD8Xzk1U3RqTrDXaHB1WG2plLI36mfU Zymu+DTtLROYi0W7LHpFqYomss3+qrFVDi0n+Rhb9tjPnKmlKXrzCgUuXh6Y4NKhS3wYJA muog9C0a4KeoW/+fAnyMt6D6wN3aH1mfzGKEJ8FYT1H5yRXhbcaOCSH9c+2RaFgL+Fm2Ih mWLpo0VYrgxWedrPtE1lg5OkhzS9fakjjPA3OhoK9sOUAiVHGrmxe47BUb5wVOr0FWf41D sudl8QyFQCg4Sxymx3sufp8T80vZUubEh6LN6AeqYUt++BxUDQFew5P82n3Wag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701155; a=rsa-sha256; cv=none; b=awfuxUESe0VHrKPUqoqy6zLB7tA9y6rACr+FurHg886fTQDEmQM10sGBrE7OQLVbiqv/V9 NWGPYNFl+559KQG0j4sWi2fRPdYcke+BC3rHn9k6uR5n8SvySy8PN6BorOmFOpT0cbP8Q1 +oFovHcdXYMwoVGRgni/UE7oasAf2sLBYvSUlYEJ/RXZTwkPiWDFwwcgL764ZwtCI+J1Eo qgHtMq8eNujs6Ft7QnYVd8y8/BFBJ7tLFjEyKCIWNsRXYnXCpJO0xhVajDhLgV+an8/61D lCveS5RZdFko7dtRuQoOQRH0A0wJ8pt8BS3GdZDG3W/Aw0jqvRVbhX9KUobnZQ== 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 83E1E77B1F for ; Mon, 8 Jan 2024 09:05:55 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdE-0003RC-F8; Mon, 08 Jan 2024 03:05:12 -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-0003Oi-Ob 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-000311-GB 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-000845-HI for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 26/48] build-system: maven: Redefine maven-build. 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.170470108230517 (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]:34978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkck-0007w3-BJ for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:42 -0500 Received: from 3.mo581.mail-out.ovh.net ([46.105.34.113]:60867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcb-0007uF-RI for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:34 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.148]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 9228426AD5 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:26 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ctm4h (unknown [10.110.178.103]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 32A9D1FEE3; Mon, 8 Jan 2024 08:04:26 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-ctm4h with ESMTPSA id uzyLDoqsm2VtAwAAr7VpSA (envelope-from ); Mon, 08 Jan 2024 08:04:26 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:58 +0100 Message-ID: <20240108080350.1665-26-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: 12432749725448463074 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth 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: 83E1E77B1F X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.81 X-Spam-Score: -6.81 X-TUID: JAW1jmegkbls * 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 4bbeaed6a4..22e86eb78b 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 ;;; Copyright © 2021, 2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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 -- 2.41.0