Message ID | 20250812090457.19016-42-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 B72F427BC4A; Tue, 12 Aug 2025 10:08:05 +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 585A527BC49 for <patchwork@mira.cbaines.net>; Tue, 12 Aug 2025 10:08:05 +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 1ulkyQ-0007h9-PS; Tue, 12 Aug 2025 05:07:14 -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 1ulkyI-0007Yd-Qp for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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 1ulkyI-0001Vi-AY for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -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=awxPDHysrBMiOOWz6mzWHQPp0zLgSSvieggSypVwFkQ=; b=RS+AvdDVX3J1WmD23QxkgKX20oqXFjkN+MMHyErOx165nO5XB1i4ASCCXyj52SP/3Fk25bV0tqKwo73986qJfl5ReQFK7iSzVasqN0YIX7KnCy3w3+T4H655NWREbBA8pPW4fj5zEO/l/pZciwQqruVm6/dW0usQ/AGlsNaJtlmuXhNoEZNzJiAf9X4beEz+PRee4ynVcWWbgenHLH3un/XPuV6jBF3lJN82hP1mFqYowRq3BLB8V+iJ7zLaTOyOz1FtkRGkzvf0siLWDYGBaKdAxZkVtMko98KorrIKxvMsAKE4Z9uVfYnJHTtJh0rwuIy2S0uGq/9t2eqbf/iqow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ulkyI-0007oU-21 for guix-patches@gnu.org; Tue, 12 Aug 2025 05:07:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 42/43] build-system: vim: Redefine vim-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:07:06 +0000 Resent-Message-ID: <handler.79224.B79224.175498959329919@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.175498959329919 (code B ref 79224); Tue, 12 Aug 2025 09:07:06 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:33 +0000 Received: from localhost ([127.0.0.1]:51931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ulkxl-0007mU-Bc for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:33 -0400 Received: from 9.mo562.mail-out.ovh.net ([46.105.72.114]:41311) 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 1ulkxS-0007iJ-9F for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:15 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbS3xmvz1yVX; Tue, 12 Aug 2025 09:06:12 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:06:12 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.16]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QbS2jmCz5wDm; Tue, 12 Aug 2025 09:06:12 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id DAC31B8326A; Tue, 12 Aug 2025 09:06:11 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003cf4b506a-512d-497b-831d-17a49f9cd8dc, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:50 +0200 Message-ID: <20250812090457.19016-42-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: 289356276468671202 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepleenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledvvdegseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=awxPDHysrBMiOOWz6mzWHQPp0zLgSSvieggSypVwFkQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989572; v=1; b=hX7JdKK8rPCVZsX7/oYKiX3ZjniPNoQOwtItDJJxnOM7W2fj892W8Yizn+PjRsps0AZUswnN SGmxMy08r3xYwedMeClMiU/jV2a1tV4IuomsX3TS8jKpkyGgblwJS7tZ5+WQZ2TbkmQsGHrU38W wCKWwE0Ov12aZjcz/lYSkUluEWvpPcp26HKfhYB8uC8DXdlMw2pIsqtcNaTw1jXynHAI7tmnIGr T/FJY9glK21O6uSsp9vzNhqdEE1e/uNmBRP4J8FsMJGDL3IzQewddwh51gkeukkZwLMmn8BztBk UAXokrbUsOe4HhgVTjU4SA7qpfOSVWkr0AWfO2TZXGZuw== 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/vim.scm (vim-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Iedbb15faac445f169cffa16397b357bc4f15c0f6 --- guix/build-system/vim.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/guix/build-system/vim.scm b/guix/build-system/vim.scm index dddf7ea14b2..22c38aefcab 100644 --- a/guix/build-system/vim.scm +++ b/guix/build-system/vim.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Jonathan Scoresby <me@jonscoresby.com> ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define* (vim-build name inputs (modules '((guix build vim-build-system) (guix build utils)))) - (define build + (define builder (with-imported-modules imported-modules #~(begin (use-modules #$@modules) @@ -151,16 +152,8 @@ (define build #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad - ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name - build - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define vim-build-system (build-system (name 'vim)