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 eKBAGvysm2XMxAAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id mGXjFPysm2WyPAEA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:20 +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=1704701180; 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=aeHhEG4lohTaNQPImqDDicgckcXg9d4wS27I1U2a/RY=; b=okxPeMsi63er8D0Sa4PD60fgKeN1huHvSgcy0jlCHcAiXPREghOrtfvoxjmiC2q0Dmo1uQ 1jj0ptnc/IttAgRhiytzMRwoTNfrwIuw6d0gbcYciaZlesQUtElACUFqI4N3/NzGNmItCo dy00T2jfzYU2SEbz3lFRKsEJeEo9mabF626RN3rubib8OgVLAzycFy9GiJ6Rwi80xpNzqj DZzALynLO9oN14v3x6kxiI4bvJNaM35zX18/H9E0hiHGapuHNYKnrZ5v/ftMCDRvLB1yp4 DbmaU5byKa+TLR6LGkyij0GAlxmVaR29ZWhiq6sK+YHrnhdffNFkgR6+fP3HJQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701180; a=rsa-sha256; cv=none; b=XJ4zqEzF8S7vswbj8xuNwMtjZ14rG+WihtbnQPmRCh0Se2MV6TV3dGW8lIUV2r7SUNwkG4 B77TS5BbEQw1jPmXRdK4v6LNCOu6wyltaWFBuKc30FH40nUC60BOgLUDQxjPEtv2GP2zgO Ivv7eBWiyi8IjaHJAACm286iELtKn03hw8u9u7DD7wb533i7HjcYybi/bgZRCqNpfqGx3K 0v9c8HwEQ9v87p09FYXUSwIWGAs0KSZocePNnQ7kEsvkMPrB1LP48z8odn0+8zPfbe9rDN A2iCTDG8u5NVfabk9GN6F0esk6tfOmhQXeBy5aE4R8fhAEiboX64VfW5b0DSaQ== 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 0A0FA4496C for ; Mon, 8 Jan 2024 09:06:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkd3-0003He-AH; Mon, 08 Jan 2024 03:05:01 -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 1rMkd2-0003GU-49 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:00 -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-0002ml-SE 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-000817-Sb for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 07/48] build-system: asdf: Redefine asdf-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.170470105530206 (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]:34918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcJ-0007r2-Dn for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:15 -0500 Received: from 1.mo550.mail-out.ovh.net ([178.32.127.22]:47067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcF-0007pw-IS for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:12 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.176.110]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 293C127A5C for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:04 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-hh2pp (unknown [10.111.174.181]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DD8041FEAF; Mon, 8 Jan 2024 08:04:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-hh2pp with ESMTPSA id T0CyMHOsm2UClgAAmE5VRA (envelope-from ); Mon, 08 Jan 2024 08:04:03 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:39 +0100 Message-ID: <20240108080350.1665-7-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: 12426557271874659042 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht 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: 0A0FA4496C X-Migadu-Scanner: mx11.migadu.com X-TUID: YIZXdCz/k5+l * 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 2b17cee37b..4ee951e70f 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 ;;; ;;; This file is part of GNU Guix. ;;; @@ -318,11 +319,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 -- 2.41.0