From patchwork Sun May 15 18:38:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39381 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 5B01727BBEC; Sun, 15 May 2022 19:39:19 +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=ham 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 9971727BBE9 for ; Sun, 15 May 2022 19:39:18 +0100 (BST) Received: from localhost ([::1]:41386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9B-0001Yv-Oi for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8z-0001VW-5Z for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8x-0008Tg-9Q for guix-patches@gnu.org; Sun, 15 May 2022 14:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8x-0006bc-6m for guix-patches@gnu.org; Sun, 15 May 2022 14:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 02/27] gnu: Add tree-sitter-cli. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39:03 +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.165263993225320 (code B ref 49946); Sun, 15 May 2022 18:39:03 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:52 +0000 Received: from localhost ([127.0.0.1]:50661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8m-0006aE-3H for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:52 -0400 Received: from mout.gmx.net ([212.227.17.21]:54659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8c-0006XO-Oq for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639917; bh=6SFCEm0LtK0AgsP5BPXyPwkzDLNeUf+ymrXXihPZMIE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=QBhsx9jirW36u7C472o6XrAm55rWf7EyG9OiNg9ybnJXPid8uvYdrjOTNXqLIFQKm XWl8bOoD5zj1NzLpD3JmF7VXNWqslHnGVDgixASb3nr0hSAnmUV7/JFFtZXRhnZIZa MbHhtUU4KmYp4yKhUQhQ7D+NU7r/DmnqMmS5cvVY= 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 1MJE27-1oAJ7v3lF5-00Kgt5; Sun, 15 May 2022 20:38:37 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:09 +0100 Message-Id: <20220515183834.18771-2-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:yGGS110TQcSrO+WTzTemSjkS3YWIontOQL9Fejmt9U5JOTUCiDq TzcJMzcYU5Q79qje7TMtYXB1FxrpyyBc9htvl/1i+tL5+ILzICjB1FRmGIiy4O5nOIDh25G iPbrDRVKltlpKrEl974Sq8hFCofWRjRtlM1B8bgSOqJ4nDaEfXk6KuYW3tYaqoUWhIxL/VS POU+CLWokEM4thWHKokug== X-UI-Out-Filterresults: notjunk:1;V03:K0:pjSG98y1tic=:FnoUK60Y06R4J62ABjmYAI dAKOvLTK+z1urb2dG4T5gZ4M/4YYFsW6zfkXU61BMOXAe9J+N/PMyMJtUCFfS0drLGSn4K/qP VtKppcuBDu1P+xw8fWBCS0QYKxhhRSPd8QeB4CkVCPoXLh2HdZXElJpewFHqjMdGsmb6KsDjX wMDOqZpriURxDeu8pEDQG+R8LLOaxCDE2qXWntF83Gg+GWNNcnIWX/puyw+39BbXte6oibfRy YJM9rDZR9vN38eseKomxStoKKiyujkOUX0RUapy6qBH5vrhhB1YYgK6648VgFoIs2q6HNLnLk PqF7DDRYG3fFUZa9X6t16CiwxAG95Po6EqLTQr2bZ02PuB2K/eqB3QODM6FlugZJKdzmexlqw AOh8M+7xxndaRaybpV/2UY5KrNpHK8iISd+NxbklTvZVBenhNliAKpj5AoPbYe5zwYIeha2yI zznUBLR9evdKvm7VyZYk13wNy7C6bZzwBayQLSHsQBOIMMgVg8qxS/xB5gk4hC5gB8kk5MqVO HnB2lPeibWsQdOg6UD5A0Dh4QOkpxRudmw3cRLzdRbhE08F6WPogdjNOskZk5m9E2spDGhyCM dtCu3zHgdKXbQvlwGY5W93UWrxv+mKocNpDtq3j49mA9Rtoeb+xorb3Bo3JK0ivMA2LNP7Q1P 7S5qx3fFS2sDzoynUN3ZweSIYp6op4t+muQ/g4+wDAVZOSVLY/AYXXzxgEvPShEydMTtvKZCH pkibE2oRwGlT/86AaYVAzhXEKhQA1iu3/Ccom4Mrn6UDT8DdPuwa4BpHewMkCXBlPqceQ43Ql eIp8N16bL+cRmsdkktCq1Dxohnye4I/vcduejgybu6QGE9ewetz1ybyaIt3VWW8bsX93W342J 6jJz427Aasxg5ZFXFmJ8AeZwH91Vv1zn/D3n7lFeX75nnXxTLeZ0u9WbPV4uZ1fKJrHrv8He8 6Ya3lyipAJkvq2wFm9TtjBc7UfrI6qRW5Yohrffdzti9PUiOfOsuZbwaJPWl39UZKRYsr/BsF I+3CRr7y5JUHTxb1LuOCShH29OEKPdcI7UX3ZCTtbq9xYMmpwYS+BmvBYardh0lVCYkePaSgX O4beUxAiCb5EZU= 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 (tree-sitter-cli): New variable. --- gnu/packages/tree-sitter.scm | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 7116a10ed7..18c9fe0844 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -20,10 +20,13 @@ (define-module (gnu packages tree-sitter) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages crates-io) #:use-module (gnu packages icu4c)) (define-public tree-sitter @@ -76,3 +79,79 @@ (define-public tree-sitter This package includes the @code{libtree-sitter} runtime library. ") (license license:expat))) + +(define-public tree-sitter-cli + (package (inherit tree-sitter) + (name "tree-sitter-cli") + (source (origin + (inherit (package-source tree-sitter)) + (snippet + '(begin + ;; Remove the runtime library code and dynamically link to + ;; it instead. + (delete-file-recursively "lib/src") + (delete-file "lib/binding_rust/build.rs") + (with-output-to-file "lib/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 + `(;; Running test requires downloading fixtures, see the + ;; script/fetch-fixtures script. + #:tests? #f + ;; We're only packaging the CLI program so we do not need to install + ;; sources. + #:install-source? #f + #:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-difference" ,rust-difference-2) + ("rust-html-escape" ,rust-html-escape-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-rand" ,rust-rand-0.8) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-semver" ,rust-semver-1) + ("rust-smallbitvec" ,rust-smallbitvec-2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tiny-http" ,rust-tiny-http-0.8) + ("rust-toml" ,rust-toml-0.5) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-webbrowser" ,rust-webbrowser-0.5) + ("rust-which" ,rust-which-4)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.7)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-cargo.lock + (lambda _ (delete-file "Cargo.lock"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + (mkdir-p bin) + (install-file "target/release/tree-sitter" bin))))))) + (synopsis "Incremental parsing system for programming tools") + (description "Tree-sitter is a parser generator tool and an incremental +parsing library. It can build a concrete syntax tree for a source file and +efficiently update the syntax tree as the source file is edited. + +Tree-sitter aims to be: + +@enumerate +@item General enough to parse any programming language. +@item Fast enough to parse on every keystroke in a text editor. +@item Robust enough to provide useful results even in the presence of syntax +errors. +@item Dependency-free so that the runtime library (which is written in pure C) +can be embedded in any application. +@end enumerate + +This package includes the @command{tree-sitter} command-line tool.") + (license license:expat)))