From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id KK/hIwetm2U2awAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6OrnHAetm2XsAQEA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:31 +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=1704701191; 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=HmEtwWBD0+T5aSHvWEdwmYDG39lQ0U3aP9B6qx+ladc=; b=b7pWiz7koJ5cRZgk6fqT7IZchL1ohGfzR9VU2FWAoCAhVA2wQnQqao5eRdI+ii3OSv7vLs ENI3UzaQjatnJJJFjfe1v2oDM0YxvVhE9Uy/kd0f4pEh3UwRt41+c+3ysxxDlm6pQbHYxn N3O+h9jHYJtssqZnLKSX29E4M9XtanpQUeg/uVZSOzpiAfO13n8cy2YaS5pWoFgsZWI9u7 SJfsiuSrYrF9K3sZQ63JJ9AgRMn0dOwRJJc5HneFDh9i3CYpyqu4vNOACWxU1WLlFYuRJS jHMkjLpjP7rV0JnFGtzKG7q3E4w+3Iu1b5Gm5Rs7L0aFO+EVSbYSdZB/T1D49g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701191; a=rsa-sha256; cv=none; b=SDWVxaBQt9DvmGzQ4BbQS3X3H4al8QXzIVuiWzbCZ9k+FEkjhl96iQK0iBAgXIslr1KRR6 dw2egtUV43lxa4RFtARkrIXHD4rKziPlgxi3GALFG7Uxj8ZK8Gi9GF9Ll0pQ8QqtIvJnLY 0cdj5eOLghDJ6QLyad/i/JLSFUeD3yuG6No4ToL/WXJdSYwdi6iAHUFzAzcMpgPc18yeiZ /66sHg/O0opiaIPsXg7Z6iEKyLsC4Tw0CvwnDyjNmyVI2wfEFTuqLSuMExfJatt7vFtFeF y/AptyiAIdyrWM9H+p4wvhObk9NiVmpakVVLZE7VZ2CoIGLG6j/Vgm4aEmR1zA== 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 4CB3917B8F for ; Mon, 8 Jan 2024 09:06:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkd7-0003Kl-I7; Mon, 08 Jan 2024 03:05:05 -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 1rMkd4-0003ID-D7 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:02 -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 1rMkd4-0002nr-4Y for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdA-00081x-3z for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 10/48] build-system: clojure: Redefine clojure-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:08 +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.170470105730233 (code B ref 68315); Mon, 08 Jan 2024 08:05:08 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:17 +0000 Received: from localhost ([127.0.0.1]:34926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcK-0007rO-Kn for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:17 -0500 Received: from 14.mo583.mail-out.ovh.net ([188.165.51.82]:55611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcI-0007qW-3m for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:14 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.17.3]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 93E87271D6 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:06 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-779cq (unknown [10.110.168.127]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 490C51FEAA; Mon, 8 Jan 2024 08:04:06 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-779cq with ESMTPSA id cZZoEHasm2VUAwAA0YpIfA (envelope-from ); Mon, 08 Jan 2024 08:04:06 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:42 +0100 Message-ID: <20240108080350.1665-10-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: 12427120222675460834 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth 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.81 X-Spam-Score: -6.81 X-Migadu-Queue-Id: 4CB3917B8F X-Migadu-Scanner: mx12.migadu.com X-TUID: /ctkWq+ynQoL * guix/build-system/clojure.scm (clojure-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I5b5b552052cfffc45bc4d82871600b322eb23d85 --- guix/build-system/clojure.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index 037fcaf21d..cddcf8304e 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2020, 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,11 +170,8 @@ (define builder #:system #$system #: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 clojure-build-system (build-system -- 2.41.0