From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id kEbGDSOtm2XqQwEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:59 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id +IUpCCOtm2WwEgAA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:59 +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=1704701218; 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=8s1KcAlH8h8EnscY/Iqmdi1yIXUJklBZNAadUqpPc88=; b=BDOn84XuFS51sJQBEow8Sdo+Os3Y29w4UktNE0PJiVQjNAD2LpKGQ4TM3hI7zwCyttRgJ5 kdGIWHZlzbzzHEURy2zPGa8/U+01goRjvVKd7F4JUQwCcFvIL71I0bMYQg9TpWmsXFhUT9 quIYWLY+CC1qSINvtyNG4gDDfyfj34JQzebDe1hcdO750iS9cyG0qxp7DO8n493tSpTGtb yXMEKe9dKzveA+VPdHeISnKTJ5Ixu0PzrX+Ff4pez0Ts+hPldvDG1zZYPAoHP9l9Aa9OoA w4cc6DMqqSjPMwd5mlTArJB7/sw9mtBiU2UUDVBfPkBnkubkZO1MLWbMsEUHfQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701218; a=rsa-sha256; cv=none; b=R0jg1I4lr2/xWOzWfT1X+aInqi+rpxK00bjIHbGiRScLLeFarnYwfVWkJVz6LwrM2Mwx3y a4OcFNyj4l7XNJYcwqniCq6dmfq/y8w+E3svRF1EYVe3BvSHK3tSgmntnd7IZqhAPTZ9SR U/wfHaROH7UOI3HKkq95lkVFhYfXepFLEPk2Q5GD68nrC4nHvgWDbBX9roibVNYOyUJr6r +x+YvtD3++lK1DBdXIGLQC4/9VO4k1DR1mCk77XGSWHsDV3IKVTW3QA8j8tU0Qrq6sZTfG yhUyEk3CeVtKEGhU6Eptj+1T5+ijgaqka9RvpB8BzrG/jub1gTbo1ihkOeUyTw== 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 CF5F277C2F for ; Mon, 8 Jan 2024 09:06:58 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdL-0003bB-LD; Mon, 08 Jan 2024 03:05:19 -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-0003Yp-DV 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-00034Q-42 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-00086K-4j for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitter-build functions. 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.170470110630847 (code B ref 68315); Mon, 08 Jan 2024 08:05:23 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:06 +0000 Received: from localhost ([127.0.0.1]:35037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd8-00081E-5Z for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:06 -0500 Received: from 20.mo583.mail-out.ovh.net ([91.121.55.239]:53805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd1-0007yq-Ty for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:01 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.2.251]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 6F08B28078 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:52 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zfqj2 (unknown [10.110.178.2]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 351A71FEB7; Mon, 8 Jan 2024 08:04:52 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-zfqj2 with ESMTPSA id 9gyHBqSsm2UmIgAAa/2oSA (envelope-from ); Mon, 08 Jan 2024 08:04:52 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:16 +0100 Message-ID: <20240108080350.1665-44-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: 12440068072054121186 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht 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-Queue-Id: CF5F277C2F X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.81 X-Spam-Score: -6.81 X-TUID: I6iZHlx1tcJ6 * guix/build-system/tree-sitter.scm (tree-sitter-build): Monadic procedure returns a gexp instead of a derivation. (tree-sitter-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I761d0663a511deefd0626ad427be22df09b72894 --- guix/build-system/tree-sitter.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sitter.scm index 21c4eb35b2..c9e45b1fb9 100644 --- a/guix/build-system/tree-sitter.scm +++ b/guix/build-system/tree-sitter.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -119,11 +120,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (tree-sitter-cross-build name #:key @@ -179,12 +177,8 @@ (define %build-inputs search-path-specification->sexp native-search-paths)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define tree-sitter-build-system (build-system -- 2.41.0