From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mEg/Ax2tm2X4rwAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:53 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id WMxIOBytm2UwegEAe85BDQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:53 +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=1704701212; 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=ZjsFh4rtQyoRaxYC+i7fkF6q50heL8ORdebierbiR98=; b=rhS4bO69dSGV2bQ/Pr2n9sZYdXzA6cJ0McG0p/NdZbhuVhihllwWPbnnTR2TMvLKMHz9Vn SeGEAL349lRlGBW4H/vH6cOFHSv6VMex2s3ktIW/EOTLg5BfKCl3YyK3z2mQ08jNEYlATg k4pUsYk2jJXaaNOdykmXl2XRJ8CGbqNkvA/vKnwxdjomJ3kC/heB3uOO6TRn8Yqq8fOSv+ mk+IORPuDh0l3d/esZnqyRtLaRhJzzR163jemPB0j375bT5M0IOdBsCdBXKVXxmjyv8IZ6 xk5nqvKKTC85vsjM75kAg9F/YJzfFeVb1ky+LcDbSdHPLVmkrurQkGjlzxJAAA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701212; a=rsa-sha256; cv=none; b=TXB87Yu/ErznIt0tvpxFBl+zEYlPsoyzSPVVftVDLAGukKdVLS4qR5S+J3OguxJ5wWXnyZ /X0DRGsw9GEiEpHaiUtN9w7v9/dyxBJhisLZz7O7CZrKOeGYnZJdvBD+to4GT+TS/dMsHW YDLvfdcnm8fxn1p+fLFfGHn4oXrAT/SnCe65NsIIVc+a7UM4JPl+RkLA2NVQhWRepL8gK6 xDOi4k8CYkcIm6zkaN5DOBT1viX0oytdJVPlf0d2hz+3lUz7C6tQnp9G/RZ/ZZd/8PqAZj H8Npd/cVxdK/ZVMNB2BMM6HTi4YFLAXJHodGxjShVQz/YTkFvfJP8mgdmv1Yog== 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 AEAAD17B2B for ; Mon, 8 Jan 2024 09:06:52 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkd5-0003JD-P9; Mon, 08 Jan 2024 03:05:03 -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-0003IO-VC 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-0002ou-Li 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-00082A-Lu for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 12/48] build-system: composer: Redefine composer-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.170470106430285 (code B ref 68315); Mon, 08 Jan 2024 08:05:08 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:24 +0000 Received: from localhost ([127.0.0.1]:34932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcS-0007sN-4b for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:24 -0500 Received: from 15.mo550.mail-out.ovh.net ([188.165.38.232]:59429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcK-0007qy-0w for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:16 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.25.248]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id B5CA5278F9 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:08 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-tglz6 (unknown [10.110.113.89]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 527281FE03; Mon, 8 Jan 2024 08:04:08 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-tglz6 with ESMTPSA id rZW3Fnism2UpAwAAP3B3dg (envelope-from ); Mon, 08 Jan 2024 08:04:08 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:44 +0100 Message-ID: <20240108080350.1665-12-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: 12427683172707721954 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht 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: AEAAD17B2B X-Migadu-Scanner: mx12.migadu.com X-TUID: 2fuxwRTR+IeL * guix/build-system/composer.scm (composer-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ib7787a5116744e61e3d0afeac6d85f61c6b6c9c4 --- guix/build-system/composer.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/composer.scm b/guix/build-system/composer.scm index 2ad7bbb36a..f8fafe778e 100644 --- a/guix/build-system/composer.scm +++ b/guix/build-system/composer.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2023-2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ (define-module (guix build-system composer) #:use-module (guix store) + #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix derivations) #:use-module (guix search-paths) @@ -151,11 +153,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define composer-build-system (build-system -- 2.41.0