From patchwork Sun May 15 18:38:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39405 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 84D9527BBEA; Sun, 15 May 2022 19:46:29 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS 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 AB9CA27BBE9 for ; Sun, 15 May 2022 19:46:28 +0100 (BST) Received: from localhost ([::1]:48616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJG7-0006id-Tv for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:46:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJF6-0006hz-CA for guix-patches@gnu.org; Sun, 15 May 2022 14:45:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJEk-0001P7-JG for guix-patches@gnu.org; Sun, 15 May 2022 14:45:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJEk-0006qI-Fz for guix-patches@gnu.org; Sun, 15 May 2022 14:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 23/27] gnu: Add rust-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.165264024826223 (code B ref 49946); Sun, 15 May 2022 18:45:02 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:44:08 +0000 Received: from localhost ([127.0.0.1]:50747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDq-0006or-4S for submit@debbugs.gnu.org; Sun, 15 May 2022 14:44:08 -0400 Received: from mout.gmx.net ([212.227.17.20]:45367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDZ-0006nK-Jr for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:44:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652640223; bh=mYc4QxerQD6CZjWzT2A4030YAAjJX9gDMJigJNV1VaI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=U3ZHxMcR9TkIwtVHrjiPJcZ2abhygqd2chYtaXAQj4hO7Zjc71973uQEJr7HBrLQU Ju/4d+Pko3vuiUciYdfj5TqftrRAtgF6Ki7neLt1VOpM/LzPm10jFSdciEFWzs1gYg F9pkbFwowDW4tWUVLcvvhVQui+WqNB5WJqUOORP0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MyKHc-1ngUQB1qKy-00ygTe; Sun, 15 May 2022 20:38:43 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:30 +0100 Message-Id: <20220515183834.18771-23-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:i6vOMFocUJH1mPkdjDl+b4/VhA1bN6Piobd/Ziwg/5UUblr9A+S OmtZOzNHbbA5cGwW7YqncYih8fcy6S6sv46eI2A0NlbFXZHEt4U1jUfBDl6IcReaH5H/ug5 c7+9lmGEGh6Jo+Wcr9sdYXA79xfIDN63t3x9uDeHMPonkdD1C9Ss8vQzH0qdAyQUaiGLMD7 zoCiG2dqTvCo4BD0vOyow== X-UI-Out-Filterresults: notjunk:1;V03:K0:zr5IxEU0PUU=:MNqZbHVQ85dEmn8KTaFGvP JQVyOxa7rUaTUKzDVYsjIDLuJOIW5Sf7Ya67caXJP9ekaNJBMgZQOk5dnPwkqCo8km+fvZuPN rBD2AgePjg9y/bp6+ZZERe/mT/bi9nI8cCLtyp07VQ6gcmzIUG8+XIeCzyIDCu33sCqkVyHjo ruASCxX4s9p16joK9y+YbElxQxzv5sSb2qrWm44cZjaRzquMRYvrFksuv3rt9Qi40f0H6YUmo U9rZ6yxwn/GbBLw/b9aG08nJ6qmGfkpn9HJOefTdyT6Vj5y4lLWW2W9oQEnwA9KE6z/rzrZ+M AcgevSXEDs1FBkOJXPGY7pXr2ZkExR13X/gKb8RGoqdUG5tP7k+aiUxmEbT1ydKRCMwQR6gzM wkbMzgoBfiDATSPRZhWXTVhdMvBB5ec6DV9Zfe6kIMjEo6dVsoSppuTh1Xm4eqFigo30EfQqi jDncw+vHxERpo8bTUuwAuaicsvNWBb0zNvask8k3zcO3cnsrphZGYSk624c7YVFm7y97kWYx/ P2juUJe4FcM0wom3HXBWXkLBuPlet49esB9AYTdT0hsretDEnvePT89G8cmfNpfhKEiFv6d60 3HAd0p1Gds3RmRINK0VLbXf08zw1xpDp9n0gHEVaYfBnevA9LH4KPIRUB4pXOmaiNTib24IMi xuxCD2S50x2klwEhNf9GnFCrtk0T+vcN71A7Q3X7MwFMAXYR1rtMvWIaBDpd3nVki85MnpRpg CX7NK9XyIFRju5ehUuwk8I9r5arxYmdJ/D3SGimpW4ZsSDQu3UwGy5P7Lf309eUmEvOrUDAFR zMPneXPpNufCht1VS/9w6PWw1+1XvXJNhwumGD+cAekqzWbM/Oed3AqKHSWOYDp3b7gDkBQKH vumFYBL17qkrLs4mCuKUQArXe61APgkvS5QTBNz0PsU1/ey9Zp/2e5L3nf191WpRKzTiCcSiJ 2uS8pSUp/1FRz6z0hoCUML80JQE1m5fExFhad0RJKa0A9pw001GVXlW3mwxMS18CQqD1UyzAj wIwhb8vzboXoto8IlUtyizUKM8D40oCLkfNtCca1T+l92ttp6D8bFLfq1hVEvMa9d4V2uALGp 0urdueC2uToVcI= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (rust-tree-sitter): New variable. --- gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 04747f47e5..58ecc445a6 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -23,6 +23,7 @@ (define-module (gnu packages tree-sitter) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix build-system tree-sitter) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) @@ -157,6 +158,44 @@ (define-public tree-sitter-cli This package includes the @command{tree-sitter} command-line tool.") (license license:expat))) +(define-public rust-tree-sitter + (package + (name "rust-tree-sitter") + (version "0.20.6") + (source (origin + (method url-fetch) + (uri (crate-uri "tree-sitter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wcvxgnvj7ga1y7xa7wm0pmabkfj8936ifg8jacd4201cj0vgcq9")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove the runtime library code and dynamically link to + ;; it instead. + (delete-file-recursively "src") + (delete-file "binding_rust/build.rs") + (with-output-to-file "binding_rust/build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=tree-sitter\");~@ + }~%"))) + #t)))) + (build-system cargo-build-system) + (inputs (list tree-sitter)) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-spin" ,rust-spin-0.7)))) + (home-page "https://tree-sitter.github.io/tree-sitter/") + (synopsis "Rust bindings to the Tree-sitter parsing library") + (description "This package provides Rust bindings to the Tree-sitter +parsing library.") + (license license:expat))) + (define tree-sitter-delete-generated-files '(begin (delete-file "binding.gyp")