From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 4HfXKrmsm2V5JwEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:05:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id EPiRJLmsm2UBzQAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:05:13 +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=1704701113; 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=5yOIb5oR++9vGDDnH0c0j0G1q8j9mSEXEWNRajG3phE=; b=lQPNa3gkJu2eoshCg40uf8xOFc83+6eEC3K9Q6yA3JcQZDucrOZ9xXt2EShzFSRgf7uD5B hhzKcyGGDyjimJCaVdCVOO6oWyU71gv14XG6MkEp6mTI54cFepERtGjXkJb/eLFIrKCb8q 3U8euDvUZXsgB9sj82cHUOhuOpEU2a/uYYokxE8vGaxeANFYr62wizEeqKQyNh6dB2m/R8 SOIjng8G1GnqCb+gHTN+U6RnlpTcM0yngWmZCYV8eTxYo1keXIcy7ErIPn7xZm00niGER9 vhf2NlHyxQs/0v1kRkxTTIg5WSlSVgah7fXZlyYH2Y7GqzZn7Dy21U+pG7zbag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701113; a=rsa-sha256; cv=none; b=QMNShbtA/tGH2Hd30FijA7rXh4ME73mPoWOEeSoku3p8sFoeNGDl0oleP2yD0vv0aNOhhC +bXXjzf+810SbYsNonJ1eExAbhxAMQA/bn+Olt1dcz5WAizV9Xu3f9BTh74ygR+LCrp7f3 3N7H/ccLzM2zmP8ODoDs1Yw8L9f92ZO7+iRLwVgbGRRYbyl8gxwSuryyZDz0EDGBON+j4G Frby74jFw3Xa9m5MS5/FaKywaOLA+7XzTIkig+xzCFuf8cpE2VgJWH/6N2I4JId/V8v/I4 oYuam82QSAO6GEWn6TDHlr6dQLaQkcnDRVsWB3ZsJx0q/sxum8TPxbQUc/KilQ== 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 395CA435C4 for ; Mon, 8 Jan 2024 09:05:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkd4-0003IN-Ut; Mon, 08 Jan 2024 03:05:02 -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 1rMkd1-0003Fl-Dq for guix-patches@gnu.org; Mon, 08 Jan 2024 03:04:59 -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 1rMkd1-0002mS-5h for guix-patches@gnu.org; Mon, 08 Jan 2024 03:04:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkd7-00080q-6X for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 06/48] build-system: ant: Redefine ant-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:05 +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.170470105530199 (code B ref 68315); Mon, 08 Jan 2024 08:05:05 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:15 +0000 Received: from localhost ([127.0.0.1]:34916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcI-0007qr-Ub for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:15 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:34395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcF-0007pp-0z for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:12 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.2.211]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 2C83F26002 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:03 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-m8ggv (unknown [10.110.96.92]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BF3841FEEE; Mon, 8 Jan 2024 08:04:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-m8ggv with ESMTPSA id DwBSL3Ksm2X1HAAAWsevSg (envelope-from ); Mon, 08 Jan 2024 08:04:02 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:38 +0100 Message-ID: <20240108080350.1665-6-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: 12426275798907085538 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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-Spam-Score: -6.79 X-Spam-Score: -6.79 X-Migadu-Queue-Id: 395CA435C4 X-Migadu-Scanner: mx11.migadu.com X-TUID: +Q+VPvqulrnT * guix/build-system/ant.scm (ant-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I4f1152e29b938dbf37125bf156fb56b841011f06 --- guix/build-system/ant.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 84bf951fab..4e04737dda 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -144,11 +145,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (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 ant-build-system (build-system -- 2.41.0