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 +BkKJSatm2VfCAEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:07:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id yDOuHiatm2X7hwAAe85BDQ (envelope-from ) for ; Mon, 08 Jan 2024 09:07:02 +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=1704701222; 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=+b0FqrmF/LYPKKJ9g5qB4SkjbreMPh4r/7qWX2IsqaM=; b=su72NJ6s96gmxDQC8ciPbi5C0u6JHgKYVOW33gwID7FhAlW93T3SSevXjuv9yKfkq07C+d nxr9lU/KBNf1lr2m1NIiXvYnQWwXboFZM4g4xQtFfTA7gXyosKhzoKqMcOIYk7B8XSwg0r O2c50YSeIW5twc3080XLLsPY6k0eQWVUUu/+aul86n4iIMPp3s3YGp3UmsN+X4Dw9lJ6PR dzXrKt8Bsg69kyMwNlcvOX1uJ9l5/9a/lv7qArWnSi/2bYU20KYV1IHDptdujg1qM++QA2 XgF5dNKgN8qVdh/NQyuikxgYlHY6nvSFPthniYTQ/rrVHU8bgomUQ7Byqy8gVA== 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701222; a=rsa-sha256; cv=none; b=taiVe1FiL3ai7Zvq306/vciG5LVjpQmReVK5PxcIt8TsSaAof8CV0bqWd5s4A2Zkw9YiVI 4MBH844FwFXxr1kgSmf3/+kaEVAB7HrDjKe9HjNc6KFdzSBI6/3L9DQBHhDTrMxq5/giMX P2xDJHfrDnEVp211qPa9X2PiXgGrC0QtDomXpYMzw6gUtiMS5kyOyh+W8VMnioNO9z0rPu Api7wj5FWvzMRy0/VW0Oo56q3N98fOhXWZ6AXZcUanM+bUzqesGeOBK8yIu9aTsCt/5B4C qyyHYghzgeg3ScoS4wQeD9tDetoI71T4bk5VmpW5p9cy0SwR4LB694JHtXwPvg== 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 4138415C4A for ; Mon, 8 Jan 2024 09:07:01 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkd8-0003L3-8Z; Mon, 08 Jan 2024 03:05:06 -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 1rMkd5-0003JE-QH for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:03 -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 1rMkd5-0002x4-Hz for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdB-00082P-It for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 13/48] build-system: copy: Redefine copy-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:09 +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.170470106530309 (code B ref 68315); Mon, 08 Jan 2024 08:05:09 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:25 +0000 Received: from localhost ([127.0.0.1]:34937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcT-0007sZ-2p for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:25 -0500 Received: from 4.mo575.mail-out.ovh.net ([46.105.59.63]:52519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcM-0007rn-QK for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:19 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.140.229]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 7AEDA27024 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:11 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-fdn7w (unknown [10.110.96.102]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2F1631FEA1; Mon, 8 Jan 2024 08:04:11 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-fdn7w with ESMTPSA id ya32CHusm2XhAQAAWGpxOQ (envelope-from ); Mon, 08 Jan 2024 08:04:11 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:45 +0100 Message-ID: <20240108080350.1665-13-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: 12428527600413500130 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.79 X-Spam-Score: -6.79 X-Migadu-Queue-Id: 4138415C4A X-TUID: l/oWkC8ju7ea * guix/build-system/copy.scm (copy-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I96dfa099501796df007143db63a49e2adedbee92 --- guix/build-system/copy.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index d58931b33c..e6a1cf36f7 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2021, 2022 Ludovic Courtès ;;; Copyright © 2023 Jonathan Brielmaier +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,14 +127,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:substitutable? substitutable? - #:graft? #f - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define copy-build-system (build-system -- 2.41.0