From patchwork Tue Aug 12 09:04:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43357 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E173227BC4A; Tue, 12 Aug 2025 10:06:53 +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 C0E9127BC49 for ; Tue, 12 Aug 2025 10:06:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulkxS-0006oS-0v; Tue, 12 Aug 2025 05:06:15 -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 ) id 1ulkxP-0006mH-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 ) id 1ulkxK-0001H0-9V 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=+T7ASoP0cNvOjEThZFpWOQ9yxdbrd92okcosRYWbUkw=; b=opEPk2eMFg0AeblMOqwyWEHOwu1wSwo58fDl4HvGc5sUN0qGXknqy3sDYbCVzm2xOhpQnQL7rcVNUWGos/jh3NtCz2ThlZiEJbd93dDN+B4iInzH/7rQc83TkzBbnzHXyToh5jYpcNMJS+uv1SmYyazY25ClHjaslXEdIgylLox6HOcu2VFKPWCK/9YGcOFBH5OiHNrB/zLl3guyqseNsHjb8L8EvyEnuGmrvbrc8EeNXzlDn6vgWCO9BJHQ+Kz8yXgBnkEX7XVTaImnadXbI1JfF1qd9ueylybo3dbPvS06bNaeuzr+ZsEPlgBsBew0cIg/grYAJZuvbwVC+IH0fg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxK-0007gO-3o for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 06/43] build-system: asdf: Redefine asdf-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:06 +0000 Resent-Message-ID: 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 Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498952629127 (code B ref 79224); Tue, 12 Aug 2025 09:06:06 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:26 +0000 Received: from localhost ([127.0.0.1]:51764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkwf-0007Zd-2Y for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:25 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:52579) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkwT-0007SO-0i for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:14 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZH1NjNz5yRf; Tue, 12 Aug 2025 09:05:11 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.150]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZH0LH0z1xqp; Tue, 12 Aug 2025 09:05:11 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 80EB33E325E; Tue, 12 Aug 2025 09:05:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R002ddf96cf1-8857-4454-a68b-c0ea713c0866, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:14 +0200 Message-ID: <20250812090457.19016-6-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 X-Ovh-Tracer-Id: 272186306636866274 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 14 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludegmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=+T7ASoP0cNvOjEThZFpWOQ9yxdbrd92okcosRYWbUkw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989511; v=1; b=C2UuF2K8ajz1DssxEfu6wk2/PTQUmYKc3uzxwy8aSUuWAGIWgxWFNayAhHY9hiKDrbr0s4J2 Qb1d4pq5d23GhTXV0NZqbvGZINx+QUxyTrKS2umq8bKRnjfI7tU0KYFX7KelUx6Y79TXA8K/ORx YDEoRxP1Sil5uS/nGsfjdgWQFMVdyGk/Rzogw0b1oIsYbCkRcno7/P/Idugecp/5K7IKcsCHuP7 X4l5tDoMuredtx8Z2Mvh3L6OFs2DFs7BsDBD6iV3tnAwvlRVGcWBv2zVPGqSM8JSfWmge+vot6z enormeZKq5UwGbSC95vBbhMu0ku2hPj8PYJdUl8cqszYA== 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 X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * guix/build-system/asdf.scm (asdf-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ifdd57c4e5279d110ee7c670090b3ae4089703659 --- guix/build-system/asdf.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 5ce63d106fd..a4ff851dbb7 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2022 Pierre Neidhardt +;;; Copyright © 2024 Nicolas Graves ;;; Copyright © 2025 jgart ;;; ;;; This file is part of GNU Guix. @@ -329,11 +330,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 asdf-build-system/sbcl (build-system