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 gI9+CAatm2VVDgAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:30 +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 aLNzAgatm2V2PgAAe85BDQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:30 +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=1704701190; 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=/XFk7Rr19JIXFGV5YNDezovkartQqXt5w5E/hBJbz0E=; b=aunYkLR015yiUcP/hK2poqZ8nHLbJFDDvbLN1TBdK+/VIS5KYYE09F4aP9yoXAXz8QyJXo D5sCXeCMg+02Al/FC4n3+KRd+Gk/pOfIWvLaHjJY6LQ7Ayb+ISBezUoZP9PxryuMu71eDO xbZZzC1KeoQOkTsCuZXu+4+Sk0UI83oaC1EtG7nX4xhJKMmToJ5lKipDcLcgSDiVKdpMPX Sdw3Em3rd581EiMScsJEKRqQtUJ7BDENXAAJfQK/ghD5wheNBVeYluqleoQmf0DpAMZTMK Rk9bMeex4hsEuwaLpSVdNd81iSt81SRZNDlQIGkWQOnAh/rK+fbysbCUGuU/bA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701190; a=rsa-sha256; cv=none; b=kEg0HwG4mUMdRIIhSwbMwuLctrwSLkPi8gnUWVGKoq1yfjvB9WoAhSXbFFzwl5lho+gZpI UigvhlMO/6kJZpELggFkJU4tHNU/gVQwO5sOTfqY28oHXro8JpgCkgMKUinfT1F5FaIVGD 4024FobW4AfAbCpaW+6vSrJIxIjnCcrklZVcM8WcCwM6QHbFnKp85AC0cGq+akgQsfk0vv Ee9+GEt9momneIJm/wwlL46mpookPFvNCPaME0d6xhqo/ERa6f4E8WBI9wc/QZoa10cK/S SrsjUqvy9H/yQ8GhxFt9goNguxYZxADm218riT9BKKU9BmSxhYlBEa6LGjsV+Q== 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 E97DB17D88 for ; Mon, 8 Jan 2024 09:06:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdN-0003cJ-KC; Mon, 08 Jan 2024 03:05:21 -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 1rMkdJ-0003Zb-QT for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:17 -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 1rMkdJ-00034o-HU for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:17 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdP-00086R-Hr for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:23 +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.170470110730857 (code B ref 68315); Mon, 08 Jan 2024 08:05:23 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:07 +0000 Received: from localhost ([127.0.0.1]:35039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd8-00081S-Px for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:07 -0500 Received: from 20.mo561.mail-out.ovh.net ([178.33.47.94]:45411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd2-0007z9-LD for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:01 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.139.157]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 65F38297DE for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:53 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gtjkq (unknown [10.111.174.111]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 03A921FE7A; Mon, 8 Jan 2024 08:04:52 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-gtjkq with ESMTPSA id 1nCHAaWsm2UVoR4AFX/BDw (envelope-from ); Mon, 08 Jan 2024 08:04:53 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:17 +0100 Message-ID: <20240108080350.1665-45-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: 12440349548405580514 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth 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: E97DB17D88 X-Migadu-Scanner: mx12.migadu.com X-TUID: uYRvRb0G/M09 * 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 dddf7ea14b..22c38aefca 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 ;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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) -- 2.41.0