From patchwork Tue Mar 29 19:43:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38202 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 3AD7B27BBEA; Tue, 29 Mar 2022 20:47:11 +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, 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 EFAFA27BBE9 for ; Tue, 29 Mar 2022 20:47:10 +0100 (BST) Received: from localhost ([::1]:40178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZHo6-0007hv-4n for patchwork@mira.cbaines.net; Tue, 29 Mar 2022 15:47:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZHlD-0003kN-86 for guix-patches@gnu.org; Tue, 29 Mar 2022 15:44:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZHlC-0001Eh-Sp for guix-patches@gnu.org; Tue, 29 Mar 2022 15:44:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZHlC-000506-PF for guix-patches@gnu.org; Tue, 29 Mar 2022 15:44:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v5 23/27] gnu: Add rust-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Mar 2022 19:44:10 +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.164858303819034 (code B ref 49946); Tue, 29 Mar 2022 19:44:10 +0000 Received: (at 49946) by debbugs.gnu.org; 29 Mar 2022 19:43:58 +0000 Received: from localhost ([127.0.0.1]:33624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZHl0-0004wp-4S for submit@debbugs.gnu.org; Tue, 29 Mar 2022 15:43:58 -0400 Received: from mout.gmx.net ([212.227.17.21]:55615) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZHkt-0004si-H3 for 49946@debbugs.gnu.org; Tue, 29 Mar 2022 15:43:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648583025; bh=RGC+79eN828/yRX8AtkNrEjyCZ96SBdYQtwgDCY5M8I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=CO26HTMwxRD1QeDXrby0TOpWPPaCrpccPWIN0wwEvlsEP0b0Lpl3x7hanBj8xhJ3H HjSEimlIloCYlX4ugDusyxsxYUFE51F854xLfvMP0t+HEX8x7X9Swo4YVQcAG4J5HQ lCcd2ZAgH3WX5G5dneGYMzSHjWovU4VrvWRPUfNg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mnpnm-1oNSnr2Pco-00pJUg; Tue, 29 Mar 2022 21:43:45 +0200 From: Pierre Langlois Date: Tue, 29 Mar 2022 20:43:14 +0100 Message-Id: <20220329194318.6106-24-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220329194318.6106-1-pierre.langlois@gmx.com> References: <877d9s2qa9.fsf@gmx.com> <20220329194318.6106-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:WI9kTdHiKS+zOjd5wtbE2ZLQTenV17Mv/M53F0Qk83uV63WHky5 C1YdfjrJoi4vTisK0fRj2EjkbDQ+/TARyKkcTpjJeq7DMVS3Yxo9NWaHFuRTaCgx3fyuyyT fH9Y4s8nRgf8K5JmgEOM/c+X0IxcpdBv1gCOAP9Tn7oc4R6WHKIinqPIWH1gUeZoAuSFJkH wocmhSA77brPKh67DnALw== X-UI-Out-Filterresults: notjunk:1;V03:K0:ri7HTXmC/vE=:PkgoxUgEaHjsPNtEw2qWle DU6UUimhbH6iKsRhSLuSz94UdB9zhCMm5DCaK9OmHGkV16uzPnpCWxkFy/BY3qo13moSirnEB QPcyrU0fqvFLgdxaDnIcLmD4iasWTrI49OAbkYUdchALD5Zll/WUstooJpYNDpjKqVC3wnLCI 4szAO8PPUTaLlGpBp2GmZ0hwbPqZX80Lh9GWWXZCTCM5/H2nNeO9Z94x+Qz1OLcvMfDOnBWK9 aoFCriX7W4Vlrt+KczyXl9jc/LrV/wGoubZzP+1TX4H5bFV47LsuDe+HL7R6wZo0xwtK1xOiB kaG2q2JrFmLvELCNtZm+xoEHunsWY2YSFxp3xfWFVjtFOi4N8x8iSoY3fbDMlD1m50XXe1iEJ dNxWzjYisWiqRb/8mLDZX1he1y6dRBe3AVDxSzpRXQ6bt8BJIi5cA/xAClLSVen0bEXwaWzNr qaP+e4EYTjzp6MvwH6S5d58kKnJxu82I6josUkf60yu0oUPbnwgESH0/KrBFeURS8bYdybMTN Pj1dLHBcs5cviqWRG7vzwVPqmGnT0pCtGus9wda3hKIRlx4gHZ7ZaWRZQhwYdRe9z/ypkHLzI vNzduJnm/mvkDiqKXAq+N3c30ZaN0bLdgj6G3LKkVvl0vH6DgUrk2bUO8gx86zzRncOeLbilQ Zxh39ccuGdpZYOVC9J3w5fl2xzbRozIZu28Zg51JVv4Ui5abBRr7BUs0oRdV/mCJ0Q9gzJXvk K9cM65ntrfbHfyJtQr5q5/ihsuOALWk3XxxfWoJv73LxDLWUIROaMNuWa6S7ZeQdOOd533Yde Uxtb+9RwjhdB3bhABzPA0DL4SPOkLhWaQ/pu8heyNf2yOH2R6jbKASEo8/WRWrbJf5q7y0LWj Bp+ZoK5qOqQxyL4r1DIwrhEfcKbDgCdkfUDIVSZf5LQ3mv5KGlJlFKpNGFHqVT6QO5Wi0racW 0aCkupum1vRdC0OUGeTFqX7LcymCOAer10MGvL3XYOCijQc+iZZOVFmRtLh4SG7wBWHVMsdo2 /tUmq/abZAVV5IhxVFJunu1bVqtUPnICgdn/4Bl3rluzF2gbe8bbCmZQMKlBLPUqicc9yz17x PV6jJGoVBL15Cc= 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.34.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 756dc0d540..389cb944b9 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")