| Message ID | 20250812090457.19016-9-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 5642C27BC4A; Tue, 12 Aug 2025 10:07:14 +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 3189527BC49 for <patchwork@mira.cbaines.net>; Tue, 12 Aug 2025 10:07:14 +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 1ulkxR-0006ns-ET; Tue, 12 Aug 2025 05:06:13 -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 1ulkxP-0006mF-0m for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:11 -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 1ulkxN-0001H9-8V for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:10 -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=DbiesCDqdSIVQVIzzAJFTsIRxhPcThe6FwpFtEZLkpw=; b=gfGMZy0o/qKxoq3k81ViTAUGD0SvoBI2aLFdo8YHmDHyR4jftoAASO6sjPxds8r6rAOQAR1AKkYwqnuFj+zqyNSjv+CcEbU9GwfMfVDzMmRHRbOAiqLSIAGd2CYcSgOASnMxm6/i+uOWVrxGtQRHlDsFUiZGp+ksqwFX+zEWldfT1AZNPlHiBE4m7h33ZvNgRiowPyqfPc4gy5gUmduVicFEm5w/Px36f4y6vONY4gJtlG5o31HTjVtDnjX4N7bgBDAAbiP+CD+vIQIGzwfINFjwxwGzkHb3vozttLGY75geXZX1DXJYb8g1cVGiJfFLBrbN/8zlwnmIavvuYFuX2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ulkxM-0007gw-1P for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 09/43] build-system: clojure: Redefine clojure-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:07 +0000 Resent-Message-ID: <handler.79224.B79224.175498952829163@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.175498952829163 (code B ref 79224); Tue, 12 Aug 2025 09:06:07 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:28 +0000 Received: from localhost ([127.0.0.1]:51774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ulkwh-0007aC-Tt for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:28 -0400 Received: from 8.mo563.mail-out.ovh.net ([46.105.60.197]:45079) 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-0007XO-D5 for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:20 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZP126Pz5wwm; Tue, 12 Aug 2025 09:05:17 +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:16 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.67]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZN5KzSz5wDm; Tue, 12 Aug 2025 09:05:16 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id AB1E93E3160; Tue, 12 Aug 2025 09:05:15 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G006beb8a214-542c-4b2b-8bd8-6e322b573554, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:17 +0200 Message-ID: <20250812090457.19016-9-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: 273593677502210786 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=DbiesCDqdSIVQVIzzAJFTsIRxhPcThe6FwpFtEZLkpw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989517; v=1; b=BGqnxBxaqcn9T7edfp/5/41yq6OzdgRAPaLQR0BDEXAFgxr2Q8HVfda90qyZiuYZJFPgvb0e IkOwurgejDbmRG//Pj+paoHHHE7PDchYkWlPcZ5C+p7tpbywfyAA+oxUF3QRs4V6RVs4K3BodCe HX71Lknw82lWYdgUPVOAgWNCn0n9hjfbAi6DdfbvVIJ/HcFB6RpQgmI/G1fw7IZIEATjGO4ByEg OdfVePBrJAjU3rGvutwd1ZXSAMf0LQugS967lAwmT/IFwkzlYy3x3tJ3JaM7rjxWNkimsDnbnhv TX0qvZaWF1Ry9CwA0/NDrc20wXyi2oqEKUDh75STEyNqA== 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/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 037fcaf21d9..cddcf8304e6 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 <alexvong1995@gmail.com> ;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; 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