Message ID | 20250812090457.19016-12-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 9355227BC4A; Tue, 12 Aug 2025 10:06:31 +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 A53C127BC49 for <patchwork@mira.cbaines.net>; Tue, 12 Aug 2025 10:06:29 +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 1ulkxU-0006pp-Vx; Tue, 12 Aug 2025 05:06:18 -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 1ulkxO-0006mD-WD 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-0001HR-TQ 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=rrnqq/XRldbdf1SkGHOysqvL5gx/N53CEewwLyUjgBw=; b=T4gpFtbVsO0sydBhRgMtcaZpVR9/WxCFYKbrzplJXuWx5v+KoEn7NjQKLwtqkve5HIWnjC740sc1loAaKjOU1VW4Nw9CDxB6CPgeHyg4TmOxRwkBhAPHgYvQDSztie0xaOrxKvL+wWkh5Ud20IlfHSGwqgJq21txaTl99t9+NGFpbgZAuaQEDvQ1Z6Al8bGbGd4oCA8uTUPv0IZ05ZmlxjyWdHjvI3UOv9G44AY8AKys5Q5HS9xUJtQsrMqOM1wWrpUHD+JpcXS0GXqSlIAtTyEt2tc8xzDCX/bY7WFfbgDGNfTQhmqCrHKUyKs8THefMvykf0vPMpkjBZAisqEmew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ulkxN-0007hO-Lp for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 12/43] build-system: copy: Redefine copy-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:09 +0000 Resent-Message-ID: <handler.79224.B79224.175498954929294@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.175498954929294 (code B ref 79224); Tue, 12 Aug 2025 09:06:09 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:05:49 +0000 Received: from localhost ([127.0.0.1]:51804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ulkx3-0007cP-Fe for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:49 -0400 Received: from 10.mo562.mail-out.ovh.net ([46.105.72.220]:36365) 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 1ulkwe-0007ZU-EP for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:25 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZV3Hmlz1y8c; Tue, 12 Aug 2025 09:05:22 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:22 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.243]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZV0vbhz5wGk; Tue, 12 Aug 2025 09:05:22 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8673A783281; Tue, 12 Aug 2025 09:05:21 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-112S006855ea233-d36f-49a4-9378-f61f010d358c, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:20 +0200 Message-ID: <20250812090457.19016-12-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: 275282527855567586 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=rrnqq/XRldbdf1SkGHOysqvL5gx/N53CEewwLyUjgBw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989522; v=1; b=C3IixZ+DbXj+bADb+sdht7tdtQV1JSLKU2FlHBoILbN94UPAUB1aduVJI2KFA8heVeREAlcx wimv4bOdvZMJnRCKaJJqDTvfvCQbEBS17lUijraIzeYhMSjHDnsT3+lQxWPBMOY+nOptsedXpKy 1lj+jO8NZHJ8esB+ct3Ocn5XQ5z7x0IB2rFY8DOBYlig7f4b/s7+2EcRGwmj1QpOYcIJx6tpYxj ofd08WtwYSjwljhizxoCPGzPWkbBr0DkVVTa0K/ExViy1Qjw8xhlw1HPHvHuefi5iSbceZvYxlu l/Te1ObW1N6VUjIsd9nPAj4+4qu2sWz2sj9mbpFHWHXTQ== 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/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 1f2937e0f18..ec0f3d95423 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; 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