From patchwork Fri Nov 25 01:21:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44825 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 6656327BBED; Fri, 25 Nov 2022 01:25:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 326E627BBE9 for ; Fri, 25 Nov 2022 01:25:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQn-0005lT-H6; Thu, 24 Nov 2022 20:23:05 -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 1oyNQm-0005kS-9d for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQm-0004SW-1H for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQl-0000Nx-Si for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 01/32] gnu: tree-sitter: Move to its own module. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23: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.16693393471264 (code B ref 49946); Fri, 25 Nov 2022 01:23:03 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:27 +0000 Received: from localhost ([127.0.0.1]:60790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ8-0000Jo-S7 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:26 -0500 Received: from mout.gmx.net ([212.227.17.22]:38713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ4-0000Hk-5C for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MZkpb-1pVC1h0M4d-00Wqk7; Fri, 25 Nov 2022 02:22:14 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:11 +0000 Message-Id: <20221125012142.22579-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6WxYIqMF3fwzXWIk77MKVzNKTEVf65VP94CilXoaVldj95zpd0O VZAfcWnGGE4POzbaiKwqGiue2oTUrk2UGQ4/8uGLCKhpS0xJdCBXWNIiKHVa2AH4qfkm8hZ ougV/oCL+56k21pDLl1NGD22PiDG1ggidd0IB/uit/sm9TvZ5HgptoeF+klAj7azcEubCcJ R+jeRnPY1wiXROebDtxQw== UI-OutboundReport: notjunk:1;M01:P0:dwukKEOGV+k=;k99kAgy/DMoRmXwNjIjFyRnsvgv ODGs+YJLLnNqwUOBFyAEYptFeWPXrC77Mkay2aZVadcBH9Z5poh50hfsga4we/HY9/AlNB6jS BmUQFZQvHCzAndTo00Tdb+a76qaRpa8mrmv952Lg1bQ4pQGhZKX0B7iUJwenuYlG+vgEZ7e8q TAvnycZ/s9lwFu/PE14gOPbWjlR795RCWvshWmvy3bkozGksFV0bL2ZxGwrr+MjsQN+e5mO3u 4tJC/Y88davMVUBzKr47Q/D3506gb0og0wFxZGt7gyfnbUHZOROesCyZOIQYK51uVp2e2JahI ctk7rMIhElQXRK804mS5/g9y5WsVWk/LaMH2E6dQiaEQHfSsQDX1oPbjT5TkWTK8MJkXOVJSD zupBqc93aG9Qo7WDEI5LGKcGiG47Cf1tpVs9wXCU/QU8rY/2KIF2eGhXGK452FeR6lgNF19Di a3ip+FvgqvAnODcHMHAyvu69/8jRaYiUyR39Y8JeVqqUVFmS5F2xVCbXLNtJiJY3QL80MZ+IR z5Xk3ET7QrnMwq+Bjkv4MIvDKW4bYYnSpTeg7UqD1208kgj0A1pqWDVJ5zr0lfi4OSFkQ2zC8 nBDw9i41GJpDJSpNG9JgdatV+oIZ1SzQJf8AweFQ+RJa/L6eVOz+6Sv6X6KOUXTtHBouf5igh oJVePk0c9U6yzfxv+HQe90kxhirrWdQtdvXOFyl28EE/j7Ah1UJiWM7+5dHCtzzjRJuGiwuCY E0E61BL4ntu02i5b0cMaN/f77KJtuOL/bdnaV6NchzPBILkaj56P7g+sme0M5SaqayAz6nvh3 bWCDGx1bGLO4S90CZyWtdjy9ezao+ogWBXGw508nUNczz/Uu5MHW1x11p2Pq+am3V5Dol+v5u M9XE2RiR7eRiiohmrOHsrkZrSIJPvlhr+cXq499L34ra515alyxNtvD+VsCd7oAfiwh11Uo0x K5gQXhkmD+AUWVK2BVW+A+9pfeU= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/text-editors.scm (tree-sitter): Move to ... * gnu/packages/tree-sitter.scm: ... here, a new module. * gnu/packages/vim.scm: Use (gnu packages tree-sitter). * gnu/local.mk (GNU_SYSTEM_MODULES): Register tree-sitter.scm new module. --- gnu/local.mk | 1 + gnu/packages/text-editors.scm | 52 ----------------------- gnu/packages/tree-sitter.scm | 78 +++++++++++++++++++++++++++++++++++ gnu/packages/vim.scm | 1 + 4 files changed, 80 insertions(+), 52 deletions(-) create mode 100644 gnu/packages/tree-sitter.scm diff --git a/gnu/local.mk b/gnu/local.mk index 7278c50e4f..7d11f4bb27 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -603,6 +603,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tmux.scm \ %D%/packages/toolkits.scm \ %D%/packages/tor.scm \ + %D%/packages/tree-sitter.scm \ %D%/packages/tv.scm \ %D%/packages/uglifyjs.scm \ %D%/packages/uml.scm \ diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index ed77113726..57178e7b87 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -70,7 +70,6 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) - #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) #:use-module (gnu packages libreoffice) @@ -1219,57 +1218,6 @@ (define-public edlin FreeDOS as a functional clone of the old MS-DOS program edlin.") (license license:gpl2+))) -(define-public tree-sitter - (package - (name "tree-sitter") - (version "0.20.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tree-sitter/tree-sitter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d")) - (modules '((guix build utils))) - (snippet '(begin - ;; Remove bundled ICU parts - (delete-file-recursively "lib/src/unicode") - #t)))) - (build-system gnu-build-system) - (inputs (list icu4c)) - (arguments - (list #:phases - '(modify-phases %standard-phases - (delete 'configure)) - #:tests? #f ; there are no tests for the runtime library - #:make-flags - #~(list (string-append "PREFIX=" - #$output) - (string-append "CC=" - #$(cc-for-target))))) - (home-page "https://tree-sitter.github.io/tree-sitter/") - (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: - -@itemize -@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 itemize - -This package includes the @code{libtree-sitter} runtime library. -") - (license license:expat))) - (define-public mle (package (name "mle") diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm new file mode 100644 index 0000000000..7116a10ed7 --- /dev/null +++ b/gnu/packages/tree-sitter.scm @@ -0,0 +1,78 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Luis Henrique Gomes Higino +;;; Copyright © 2022 Pierre Langlois +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages tree-sitter) + #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages icu4c)) + +(define-public tree-sitter + (package + (name "tree-sitter") + (version "0.20.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove bundled ICU parts + (delete-file-recursively "lib/src/unicode") + #t)))) + (build-system gnu-build-system) + (inputs (list icu4c)) + (arguments + (list #:phases + '(modify-phases %standard-phases + (delete 'configure)) + #:tests? #f ; there are no tests for the runtime library + #:make-flags + #~(list (string-append "PREFIX=" + #$output) + (string-append "CC=" + #$(cc-for-target))))) + (home-page "https://tree-sitter.github.io/tree-sitter/") + (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: + +@itemize +@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 itemize + +This package includes the @code{libtree-sitter} runtime library. +") + (license license:expat))) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 957f00a92e..0c44c3c114 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -72,6 +72,7 @@ (define-module (gnu packages vim) #:use-module (gnu packages tcl) #:use-module (gnu packages text-editors) #:use-module (gnu packages terminals) + #:use-module (gnu packages tree-sitter) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) From patchwork Fri Nov 25 01:21:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44813 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 EFD1627BBEC; Fri, 25 Nov 2022 01:24:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 92CCF27BBE9 for ; Fri, 25 Nov 2022 01:24:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQl-0005kH-Nj; Thu, 24 Nov 2022 20:23:03 -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 1oyNQk-0005jv-Kn for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQk-0004Rj-Bv for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQk-0000NE-8H for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 02/32] gnu: tree-sitter: Update to 0.20.7. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23: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.16693393431183 (code B ref 49946); Fri, 25 Nov 2022 01:23:02 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:23 +0000 Received: from localhost ([127.0.0.1]:60777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ6-0000Ii-35 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500 Received: from mout.gmx.net ([212.227.17.22]:56749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ4-0000Hm-5o for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:20 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N3siG-1opojG1Uh6-00zpy0; Fri, 25 Nov 2022 02:22:14 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:12 +0000 Message-Id: <20221125012142.22579-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ikdjNxpj2bid3uZ1gZ8L4ND392cW2J/aRaPfveMkTetG+Ko0Riq rFrFsbZzj73dC3zAVptcutPUZFEnG9FPskIsA2A0fI0htuBi3i2iBUN/RHfJupBDuKLLMNG yVgo/8U3eieEDr+3JJijTfzqFgWYZQjfhEjnYum44Lxj5WGeEWY+VN727PXaauPgtfVBk0e Rwq88DBfExYuF/QhKjYyg== UI-OutboundReport: notjunk:1;M01:P0:QRVPRZtbeCY=;bHTQLJkdPeMEth8pZrZ9QWDriMx SY7Gv6My+SxpnieB/GglivMlmqa4MfU0Osp4hdQg2q24XI7zDaLqOl3UIrSHsGELH5KcVunDi q6NrFMUK0f6ZnTv2ujGq+j0bUuHkbcP0+B26EoR/LuqaW71DMs7aIFWhHFdvLTyKBgGXyBas8 NETe2xlN3k8D5wc/yZwWSl+I365A+TxIvIzoQdvc8EFUNq9u61c1og3sgQI7Cv6LaSWZwE6Gv SEz4wRpartrOlzfPLI0iS69wyCTVcypFSR0tr1mICShWJF+lvRjB2tp5Arqhlk8Hl72ySYS6N RlqHW7IIeqT5fgdpHoqf2mW0yto252XOJj+23rYG7+9Rrs+W6o8RWTYnqNPmI2Pt30vFnEo0M eDqJhPxEn/2fQck0atzqV6yUkYNaZs/5iulOEhDLkGpEgQnedFnT4CmiNe+LMAVSxQ5FMkDZD Dq9VQa6OqttXDkpXsFvTVW5j26LBMxdtKmwkgKhB/XPoZnNJbtvvQFm1+fu7eIo92p2fxX71v 24AmQS6DYJpFyzWyiEvqTGALNFYAsEGKJwz+5pidoRvCSztJ0bzcJKNmHlmATpuAYLbRFe4jY 3EijJ0LwZ0Uwh0wjmge24mER9jDVucVJcZ5TgWtDfeVm+LH8eg9fF4FYL4tFYDmR9r4MmlDv0 riiQQz63cDhL/YAgEKWss9nm/toqVXEMw3B0V9AO+waJlJ5HUiJV/+WiSvlEcyY72I5oRFhXd 2n7mgbL6JzLOuezaOXO7uuZLJb8Zk9O2ickenlH0JTKvjbQ9YEnQcI0SWiQvUQVjAlJFSyaJ9 Z41R1Tv+UfhO9qhKOkdI4D+Dimao7Vo1QBwAKJIz98UeODzFklk/dwRoA934I/kpLdNStQqrJ GvTTP0kMHF4OT1IfAZxjyhrOjOOAf+uWQ9tuWXLiwq3G3Ex5DEY5mr8ap9uWNw8XPDINNmwpT fo9Sg2wgCF4q89BbL+K5G2KuLvo= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.7. --- gnu/packages/tree-sitter.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 7116a10ed7..8ef4e87e41 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -29,7 +29,7 @@ (define-module (gnu packages tree-sitter) (define-public tree-sitter (package (name "tree-sitter") - (version "0.20.6") + (version "0.20.7") (source (origin (method git-fetch) (uri (git-reference @@ -38,7 +38,7 @@ (define-public tree-sitter (file-name (git-file-name name version)) (sha256 (base32 - "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d")) + "1nv2a2hr22w8ix71b6rkkxv9rfvhvwlmyql0g6lva9qzj4vy50p4")) (modules '((guix build utils))) (snippet '(begin ;; Remove bundled ICU parts From patchwork Fri Nov 25 01:21:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44811 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 6F49D27BBEC; Fri, 25 Nov 2022 01:24:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 E5CFA27BBE9 for ; Fri, 25 Nov 2022 01:23:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQp-0005md-QQ; Thu, 24 Nov 2022 20:23:07 -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 1oyNQn-0005lV-QV for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQn-0004T3-IQ for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQn-0000OZ-Ce for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 03/32] gnu: Add rust-html-escape. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:05 +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.16693393471284 (code B ref 49946); Fri, 25 Nov 2022 01:23:05 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:27 +0000 Received: from localhost ([127.0.0.1]:60797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQB-0000KY-5b for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:27 -0500 Received: from mout.gmx.net ([212.227.17.20]:52485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ4-0000Ho-O7 for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N95eJ-1ow8G12iox-016BUh; Fri, 25 Nov 2022 02:22:14 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:13 +0000 Message-Id: <20221125012142.22579-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:j/GBuCaTupN2hxm4kSPiIiOjEgb3TCYrHA0a04irikdHlnG8rQo zi2tQWqCaGITJDfQd7e+TP2ZZubxp/nJGgyNJJmI45g5/Isc8tqMmhCFcokp5LL7/3hGLdj 7aammJTuvqZuOYiscLXLCCxrfcKlMiRMaTeQutGn+Pj7JoSyDV5Z+T+9N+HBvYXQUbSx1Wv DRmK88JYUL2fyCOvSLBxA== UI-OutboundReport: notjunk:1;M01:P0:oUbA3+6DPl4=;qLrMYBz2B4K0V7a9xMnOWCvolf5 9YaLeGaIqx7bQHG4t9D7bCi2mTrDh+eopgd5w+GUHj5Xpb+ihcMqnT3HuZbLl7+h35KcrCKYz 39zEKV58Q8C/Ceak71oCvneC7gBkCgDl9njmlH3/w41v85JLOmJg2hIW/4qZeaGLbPPKXTG3T my0ViudDcpXdBJv4fnxiiSpDdfMNxEbtybkM0fVzl+zxD2agBRhGPa+KhGRCNl6wBRAJQfwI2 x6DoSNYiBVryFDFcTSvyA9QhOOWpvn9oO7/T7i+fe7XZArIBJTMtdnAPEzPUxZ7XCnNu6Qmqi WLR0udbZX8/O+yxVQ0JS2WoD+Muxx1/PnUEs/lTcyWeuen+cBOLTWtCyF58VSBCMXJJaVm5kz gVpOhl+jqgCC9COAt0mLNBX3/60MHHCFNUrxyHHsj4Yc2HBi2Jmz5vrLmkLMX1dnORaY9TuRv brPUdn5ZDstJFSnOlwirHZR2f9XaEpIByaIstU1N8g1Sj/i7C0CT2V+bRS6Z+suiAiDthcSlQ IGXNKhEi42nfZfI3QbXOcaL6oietW3cgQmskTYoetdY6lDMT15kVQHSR8FJiifspekS8tpOJ7 VnfzOMfKksWD9uEDX+OUIUncV+orDnDAjWdM3qHU1GsVz3azTuoz+oVjDu3oKedrH8YY8YTS3 vZvzSc0MBEV3tlBoaz5POXzDHpNcyA+6NpWLV3RlXEuqTbpdW9tg5wGDc5DOLizfsnHsdifEC GFlCZ5+/eikVMgvoZh4e/ql7KzwC1ic9ChhQ2AHc/YELGtI6C16LFPHpZKm3wFSYyzv1Gd5ro +QzSblZSxee4JNcnu1ykqWXhm1mt1aWblSSvwFGaboc8KdGQcnORFUWuHNc6pI5ijNSebGOAm ABH0nNVa8SsT1frracsNu8Dom/QNvEmgXT5ZYpViuMDm+dX0ZekHAvQWqJRzGjgY10b14gwfe i3smHg== 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-html-escape): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 792779a28f..cb3d83de5d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25913,6 +25913,30 @@ (define-public rust-htmlescape-0.3 "This package provides a library for HTML entity encoding and decoding.") (license (list license:asl2.0 license:expat license:mpl2.0)))) +(define-public rust-html-escape-0.2 + (package + (name "rust-html-escape") + (version "0.2.12") + (source (origin + (method url-fetch) + (uri (crate-uri "html-escape" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01f2v3c6j2rk5h2lhdbh62j07cm1fvzqw4vplj2sms83jpx5qc8m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-utf8-width" ,rust-utf8-width-0.1)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1)))) + (home-page "https://magiclen.org/html-escape") + (synopsis "Library for encoding and escaping special characters in HTML") + (description + "This package provides a library for encoding and escaping special +characters in HTML, decoding and unescaping HTML entities as well.") + (license license:expat))) + (define-public rust-hts-sys-2 (package (name "rust-hts-sys") From patchwork Fri Nov 25 01:21: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: 44812 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 5FC8327BBF0; Fri, 25 Nov 2022 01:24:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 D565627BBE9 for ; Fri, 25 Nov 2022 01:24:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQo-0005m7-St; Thu, 24 Nov 2022 20:23:06 -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 1oyNQm-0005l0-VR for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQm-0004Sk-N7 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQm-0000OC-Is for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 04/32] gnu: Add rust-smallbitvec-2. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:04 +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.16693393471277 (code B ref 49946); Fri, 25 Nov 2022 01:23:04 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:27 +0000 Received: from localhost ([127.0.0.1]:60795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQA-0000KL-P1 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:27 -0500 Received: from mout.gmx.net ([212.227.17.22]:54707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ4-0000Hn-M2 for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MfHAB-1oWiZp3uih-00gmqF; Fri, 25 Nov 2022 02:22:15 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:14 +0000 Message-Id: <20221125012142.22579-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:gK0VlDPPT7teCYlck52FBCQ4uVc09jn/5f3Cn0aLzOK42ETfeVI 27yOi062U7Z79ay+M/q3a6MUsYDAuHTwhbQFCsvoagyXZfjnINVBuhX6vVF7NOjfhxgWZG5 L37idD+E3OsfpbI/NL2VmTGFV9/H01P382KLIfIvWMJkLSnw7xLZ06HInkiPFK6gXlMjfkN 3o/5roEpVZjK1c9mVSZ2Q== UI-OutboundReport: notjunk:1;M01:P0:lsVgqErf/7M=;kp2Mi7XnGuJYGh5eAgRVXdXmJGC mYjMQT2FkrKOyzxUWzjWepBuPwByGjONEUXwqpFsg6BuvwRSaZptj9+4ng+vDvYau8XFadvYi C4NFtnfKm+oQwLwrDLlpMpAe+I+Q5pGAz7nKoSgGGWzuUmKWgiIlrCoyPTvkv/zFNLuT8jhMI /NYTjqCzGBBweDSl/2V0fabuCbIO+5WqTJqLVIhj4PTwa8CIwi1wWvUlUbcyVLLMYlGdIhRlQ 5gcqL89XlSfOS0pa9cgLuRYhpby9Sm2Rwi1MCKDX+3PY/a0GEDFULCEiVA/ewZ9H0vhPmP4bQ GYqA7xyVdO4kjazs6AJaxHn5IjIFrV6vFsvo2WlsFlKSgKabPsirqSdyFKZcLgoIR9Qjn7ZBm wRB4EPsY0/b9kFctbA3EDd9qO5lynvNwYcyNRSOTIsqKSo2aHhXis7rpm2C7i31245GzcRWOC Ae4C1kScU9zN0Ix0cMwz5XeEFtrrqPPdzpp6iV1M8VRKZoLMBpYftf0csoq+MgVZ+dfzzvFsp DllyO1yuwdiHd0B8hAkrQGl/BLBLrUQUd5H+oAKhemcaEky9KJdyEEVZO+vLXR7n1KCqIvHJ6 0GNiadu1mBieevZfpYCcOQy3psEAajH/Rt1M79gTmm4bDRgvH9HemV1Ncv6oKMDHt9HsxpjSE K7XIvnC5qa4zzTz/6qTS/nWOaiWrjLmL9Qb0Cw0kkB/CFo0WBMVGb0ubp9iqP8nfBHfHqFSwa GKbnAAB8PvCvGwbQM7HZtzBfRWtPC7qq+jSARU+xv0emqh5kWyaTeoRmwGY/rqxEWih2Vzodm 2v2y1znPieDyMHD/uO7G4ZkyWhVkBxPVYsIkw5jDHJWRcBHrJU4+3Jx/SWGEmN6Pq7ziwswW+ HRNz2wIJssh3/q1knyTbsujISfbF/8Nv+M/eMxgXLNR+elR/8dIv4GMF302Yxt3fDYh21yoLG hTDR2INGpV++IUab8dnVyk3A3iM= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-smallbitvec-2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb3d83de5d..9ca52587eb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53163,6 +53163,28 @@ (define-public rust-sluice-0.5 I/O programming.") (license license:expat))) +(define-public rust-smallbitvec-2 + (package + (name "rust-smallbitvec") + (version "2.5.1") + (source (origin + (method url-fetch) + (uri (crate-uri "smallbitvec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0plrbldsjpwip3afbzd8fgrnvdhizcg5z4ncfqs4q6x4qjflzkkm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-bit-vec" ,rust-bit-vec-0.4) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/servo/smallbitvec") + (synopsis "Bit vector optimized for size and inline storage") + (description "This package provides a bit vector optimized for size and +inline storage.") + (license (list license:expat license:asl2.0)))) + (define-public rust-smallvec-1 (package (name "rust-smallvec") From patchwork Fri Nov 25 01:21:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44805 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 D70FB27BBED; Fri, 25 Nov 2022 01:23:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 B2FD027BBE9 for ; Fri, 25 Nov 2022 01:23:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQq-0005nI-BQ; Thu, 24 Nov 2022 20:23:08 -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 1oyNQp-0005mF-6G for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQo-0004Tc-TS for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQo-0000P4-Q9 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 05/32] gnu: Add tree-sitter-cli. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:06 +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.16693393491317 (code B ref 49946); Fri, 25 Nov 2022 01:23:06 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:29 +0000 Received: from localhost ([127.0.0.1]:60805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQC-0000L0-DX for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500 Received: from mout.gmx.net ([212.227.17.21]:46285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ5-0000Hs-CC for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:22 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MYeMt-1pU5Z60syJ-00VkHX; Fri, 25 Nov 2022 02:22:15 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:15 +0000 Message-Id: <20221125012142.22579-6-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:qoBq7buxWXVdHqvLlWZM8r/xXeCzIj+r3df4fB75cLkdNhbVEQ1 9DGXDm2NqqE+yZErpI+hB9t+nehat1bB+F7DN7mlyGbUPewsL7+aRNdMv9hXwuMpDsvIb48 Bhs2u/VP2eUTcf8finlwajZFjf9ASvHfb8ZKS8ANHUcw1/ZqPpVaPQMMcTdIuHo+3U0NSaf RDBoXo1qnt+DqlujzXMiQ== UI-OutboundReport: notjunk:1;M01:P0:/F9I8hV/+eI=;IUD0FUj28z5OyhC7s6FXNkhO591 Jbgsybm2SDngbFffrhA7ZTqXi14Z5iWWsxNxNqiuMvwyr9SRao1AHQImUYWTuOBzamjpk7kaD J0huQs10S2jGXJv5VSmIKxBMdFB2BfgbT0Ki1UEu3g4tkzwaV8yd7Iu222phQxiWk11aVLrBZ DKf8CzsIKO/V/PZ3+sOaajGDapZ3DNX7asfVP1fhDFBBXHg1J4Y4k0EoKX87ZPB1ytEk3vSCq csXzPnQzLs63633BPBLlCkglQf1u3F3uRJoi/+/ly6ml+1DPP4sd4fSOkO6QUsTyFHgt3e40V ynai6iYLePEYzSdUZQDuanWScKlOcXjTNRRQeYSdl1Z76BlX2+pr7C7UOewaLSZ4521kB9GZh 5xLNSWS60NAesdowRpSQcl6VDtcPjvKVEr4ZuxZL2nEBPMyTZEYlFMKEbOoGmEOspTM+a5hX3 4CBRq5tGSV6Ta8J2GTFxhgIuPCmzXi5IPQCOC0T2A/hTrgFk8CQjxnjxo+kb64/I7LTG4FzQr ktIvoIT4vIV8/1dmy+zMe7smKzjxbj5/En6O8P7JSxdbsy/J2PbLCMZv0TTFYs/pPaBnK08FH yK5dYn3kcO4FYJcLmXuJnothELp4bYyqxqnl+zdy5zwsy5eEOLQL3AqXqE4b4pGElRx5lHUE8 Droeo/IwVF7VY3mTbRJ7UwOQmSnwRxoWGhPoYzb+4Ksq0F/iPYltPpMTzdR/PJ5d2yKXhcb9p NOsl7POxBjCsedcs3PU3ImkNdanXqyflNynoZHlCg5y4a+QJAHTZdN5egCLml7j0kGscc75DT 5x5en/3mJ6zk4W+JnPRPsrpdz2U2IayNtfoIF6GEMXJRYcaJklqlY4uaWqG67PbBDmr14HzBF yPMU5YjaOH0lGIMvGoi8WucWujXScyRm7ze6Z3nxXirGjVVtsxDzvtKigPo7ZHlwh9wi48P/o EXPwF14I5nuYTTaKx8oR4ZNvPps= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-cli): New variable. --- gnu/packages/tree-sitter.scm | 80 ++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 8ef4e87e41..30bf17b79b 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,80 @@ (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-dirs" ,rust-dirs-3) + ("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))) From patchwork Fri Nov 25 01:57:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44847 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 4FADE27BBED; Fri, 25 Nov 2022 10:15:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 4931C27BBE9 for ; Fri, 25 Nov 2022 10:15:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyVjc-00069e-Gq; Fri, 25 Nov 2022 05:15:04 -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 1oyVja-00069W-SC for guix-patches@gnu.org; Fri, 25 Nov 2022 05:15:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyVja-0006zC-JZ for guix-patches@gnu.org; Fri, 25 Nov 2022 05:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyVja-0004Ow-Cl for guix-patches@gnu.org; Fri, 25 Nov 2022 05:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 06/32] build-system: Add tree-sitter-build-system. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 10:15: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.166937125216841 (code B ref 49946); Fri, 25 Nov 2022 10:15:02 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 10:14:12 +0000 Received: from localhost ([127.0.0.1]:33596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyVik-0004NY-VV for submit@debbugs.gnu.org; Fri, 25 Nov 2022 05:14:11 -0500 Received: from mout.gmx.net ([212.227.15.15]:58887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyVii-0004NJ-3w for 49946@debbugs.gnu.org; Fri, 25 Nov 2022 05:14:09 -0500 Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MF3DW-1pDw380OBk-00FTYh; Fri, 25 Nov 2022 11:14:02 +0100 References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> <20221125012142.22579-7-pierre.langlois@gmx.com> User-agent: mu4e 1.8.11; emacs 28.2 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:57:21 +0000 In-reply-to: <20221125012142.22579-7-pierre.langlois@gmx.com> Message-ID: <87r0xrcpei.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:E4H3QSjbkqpNsCbOBY8GIFnPKi+n6f/T/e/+eMRMc9flTtqyjNM walxEI7NVuSeLV6N78p8mQLNnxrPGQCaIHcbn3rsCsF/EbiUUA1gNq+uEjmCTdWuRCPa6XV 44P/cb5Uhkg2vfOTsjudp36Dz/VANRAZc9QQS/xRoCpBvo1rMxUTHsKTUc+3cADBDQPxyRJ Gzf+O5DM8HBlptb/WCBCQ== UI-OutboundReport: notjunk:1;M01:P0:XvJ4sFxpvMc=;9Av/coRHkWP07fmI0F/yGNwBeO6 tFp1BXmujFit2rmPNY7Sc1S/r+vmcNPomuYZhe38emYZ0qv5Lag6NxjRieVbnhETnlenc+3yt PuPIIvpzKDSgblUiCvFWhtdRbmtEPy1qJctzssTScnn0COSKl6hIyEfbS08mXmbv/taVv0oEi 7ijZWIRb2SCSCXHvyQwIVvmMZfzoTIIU0RWe71bePd7h4PxlyvDsxxGNblgeolZdpEMSwOdro tDIm3ou2wuN6utzMfkyqioJd0/dcAHVwd8AiTmGz9I/lmUi+7ZMtjlIWtbX1r+JZlHVq3JZ0M NcgLFM0Sn9ia40fsk1p6/ll1QeYBsbDm9n12jnLcX81nUPJBK6U4P5FG9iflSSyUfwWIdF9f6 T7pndZjMJ8p9zEO17d9igEC4rrxaWGbNqiwWDbvp4suayEhkbl0xHDGErd7X1CQX5VbmiqKdh hEUFg6OTudN3TpJ0MUg545PAAwEViQ7wA979f+PR3TM4GwJYskUOfbMDlgRMm+QEKDE7374cM G5XdfzcB7zek/VJ4v4DubjhpzClNM/tTmD//PUbhn/mJ7SWRnR6vweVCS5NGKwhR+MDKMfQwV oD6zfmZTHMcrahsaM3MWmKibQDhI4NaDaIYYcJyvfQeNrgBaG1Ne6FPrwn++x6M8DNhCWL9hw pgS8+W1AR4qO57PyHQjjjXNdB9aF0F+QPAhuxTiy8aJnlzLnGbFfmrEqWAHBFmMZ0uKHTjPGd MGSAtRF3KshywQ7cYIUfjynW9QgUvPpmnKAe6rLSRg+Msjou+/+muhgQI+mRV4kaV63veoZT3 ChcIIFxyuAW2VsrS+D1ORkdcvRyeD7IbUsYrLEu4DWOhC8OJs7Lg6L6p6aJw5dRqNlQL6aQUG RJKlwn+VaGCC2myBpv+SzTV4sHtFeyatXqjN5Ga3Xx2vi3krZ9SYWjeGqaxj4qJ3SqT3eSl2U S3bUX7ueC2aKHwvWsX5D5m3zk2U= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches It appears this email is making it through, so here it is as an attachment: From 4a3c1fff8460a03bfb7c1aada9863205cd6f22fd Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 29 Mar 2022 20:13:34 +0100 Subject: [PATCH v7 06/32] build-system: Add tree-sitter-build-system. * guix/build-system/tree-sitter.scm: New module. * guix/build/tree-sitter-build-system.scm: Likewise. * Makefile.am (MODULES): Add them. * doc/guix.texi: Document it. --- Makefile.am | 2 + doc/guix.texi | 21 ++- guix/build-system/tree-sitter.scm | 190 ++++++++++++++++++++++++ guix/build/tree-sitter-build-system.scm | 153 +++++++++++++++++++ 4 files changed, 365 insertions(+), 1 deletion(-) create mode 100644 guix/build-system/tree-sitter.scm create mode 100644 guix/build/tree-sitter-build-system.scm diff --git a/Makefile.am b/Makefile.am index c3af23b68e..a16c4fcd7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -178,6 +178,7 @@ MODULES = \ guix/build-system/ruby.scm \ guix/build-system/scons.scm \ guix/build-system/texlive.scm \ + guix/build-system/tree-sitter.scm \ guix/build-system/trivial.scm \ guix/ftp-client.scm \ guix/http-client.scm \ @@ -234,6 +235,7 @@ MODULES = \ guix/build/ruby-build-system.scm \ guix/build/scons-build-system.scm \ guix/build/texlive-build-system.scm \ + guix/build/tree-sitter-build-system.scm \ guix/build/waf-build-system.scm \ guix/build/haskell-build-system.scm \ guix/build/julia-build-system.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index e547d469f4..4e997f7176 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -79,7 +79,7 @@ Copyright @copyright{} 2020 Jack Hill@* Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020, 2021 Brice Waegeneire@* Copyright @copyright{} 2020 R Veera Kumar@* -Copyright @copyright{} 2020, 2021 Pierre Langlois@* +Copyright @copyright{} 2020, 2021, 2022 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* @@ -9732,6 +9732,25 @@ be specified with the @code{#:node} parameter which defaults to @code{node}. @end defvr +@defvr {Scheme Variable} tree-sitter-build-system + +This variable is exported by @code{(guix build-system tree-sitter)}. It +implements procedures to compile grammars for the +@url{https://tree-sitter.github.io/tree-sitter/, Tree-sitter} parsing +library. It essentially runs @code{tree-sitter generate} to translate +@code{grammar.js} grammars to JSON and then to C. Which it then +compiles to native code. + +Tree-sitter packages may support multiple grammars, so this build system +supports a @code{#:grammar-directories} keyword to specify a list of +locations where a @code{grammar.js} file may be found. + +Grammars sometimes depend on each other, such as C++ depending on C and +TypeScript depending on JavaScript. You may use inputs to declare such +dependencies. + +@end defvr + Lastly, for packages that do not need anything as sophisticated, a ``trivial'' build system is provided. It is trivial in the sense that it provides basically no support: it does not pull any implicit inputs, diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sitter.scm new file mode 100644 index 0000000000..aeb96e3ef5 --- /dev/null +++ b/guix/build-system/tree-sitter.scm @@ -0,0 +1,190 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Pierre Langlois +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system tree-sitter) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix monads) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (guix build-system node) + #:use-module (ice-9 match) + #:export (%tree-sitter-build-system-modules + tree-sitter-build + tree-sitter-build-system)) + +(define %tree-sitter-build-system-modules + ;; Build-side modules imported by default. + `((guix build tree-sitter-build-system) + ,@%node-build-system-modules)) + +(define* (lower name + #:key source inputs native-inputs outputs system target + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME from the given arguments." + (define private-keywords + `(#:inputs #:native-inputs #:outputs ,@(if target + '() + '(#:target)))) + (define node + (module-ref (resolve-interface '(gnu packages node)) + 'node-lts)) + (define tree-sitter + (module-ref (resolve-interface '(gnu packages tree-sitter)) + 'tree-sitter)) + (define tree-sitter-cli + (module-ref (resolve-interface '(gnu packages tree-sitter)) + 'tree-sitter-cli)) + ;; Grammars depend on each other via JS modules, which we package into a + ;; dedicated js output. + (define grammar-inputs + (map (match-lambda + ((name package) + `(,name ,package "js"))) + inputs)) + (bag + (name name) + (system system) (target target) + (build-inputs `(,@(if source + `(("source" ,source)) + '()) + ("node" ,node) + ("tree-sitter-cli" ,tree-sitter-cli) + ,@native-inputs + ,@(if target '() grammar-inputs) + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(if target + (standard-cross-packages target 'host) + '()) + ,@(standard-packages))) + (host-inputs `(("tree-sitter" ,tree-sitter) + ,@(if target grammar-inputs '()))) + ;; Keep the standard inputs of 'gnu-buid-system'. + (target-inputs (if target + (standard-cross-packages target 'target) + '())) + ;; XXX: this is a hack to get around issue #41569. + (outputs (match outputs + (("out") (cons "js" outputs)) + (_ outputs))) + (build (if target tree-sitter-cross-build tree-sitter-build)) + (arguments (strip-keyword-arguments private-keywords arguments)))) + +(define* (tree-sitter-build name inputs + #:key + source + (phases '%standard-phases) + (grammar-directories '(".")) + (tests? #t) + (outputs '("out" "js")) + (search-paths '()) + (system (%current-system)) + (guile #f) + (imported-modules %tree-sitter-build-system-modules) + (modules '((guix build utils) + (guix build tree-sitter-build-system)))) + (define builder + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) + (tree-sitter-build #:name #$name + #:source #+source + #:system #$system + #:phases #$phases + #:tests? #$tests? + #:grammar-directories '#$grammar-directories + #:outputs #$(outputs->gexp outputs) + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + 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))) + +(define* (tree-sitter-cross-build name + #:key + target + build-inputs target-inputs host-inputs + guile source + (phases '%standard-phases) + (grammar-directories '(".")) + (tests? #t) + (outputs '("out" "js")) + (search-paths '()) + (native-search-paths '()) + (system (%current-system)) + (build (nix-system->gnu-triplet system)) + (imported-modules %tree-sitter-build-system-modules) + (modules '((guix build utils) + (guix build tree-sitter-build-system)))) + (define builder + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) + + (define %build-host-inputs + #+(input-tuples->gexp build-inputs)) + + (define %build-target-inputs + (append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs))) + + (define %build-inputs + (append %build-host-inputs %build-target-inputs)) + + (tree-sitter-build #:name #$name + #:source #+source + #:system #$system + #:build #$build + #:target #$target + #:phases #$phases + #:tests? #$tests? + #:grammar-directories '#$grammar-directories + #:outputs #$(outputs->gexp outputs) + #:inputs %build-target-inputs + #:native-inputs %build-host-inputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:native-search-paths '#$(sexp->gexp + (map + 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))) + +(define tree-sitter-build-system + (build-system + (name 'tree-sitter) + (description "The Tree-sitter grammar build system") + (lower lower))) + +;;; tree-sitter.scm ends here diff --git a/guix/build/tree-sitter-build-system.scm b/guix/build/tree-sitter-build-system.scm new file mode 100644 index 0000000000..574b0f2a1c --- /dev/null +++ b/guix/build/tree-sitter-build-system.scm @@ -0,0 +1,153 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Pierre Langlois +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build tree-sitter-build-system) + #:use-module ((guix build node-build-system) #:prefix node:) + #:use-module (guix build json) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (ice-9 regex) + #:use-module (srfi srfi-1) + #:export (%standard-phases + tree-sitter-build)) + +;; Commentary: +;; +;; Build procedures for tree-sitter grammar packages. This is the +;; builder-side code, which builds on top fo the node build-system. +;; +;; Tree-sitter grammars are written in JavaScript and compiled to a native +;; shared object. The `tree-sitter generate' command invokes `node' in order +;; to evaluate the grammar.js into a grammar.json file, which is then +;; translated into C code. We then compile the C code ourselves. Packages +;; also sometimes add extra manually written C/C++ code. +;; +;; In order to support grammars depending on each other, such as C and C++, +;; JavaScript and TypeScript, this build-system installs the source of the +;; node module in a dedicated "js" output. +;; +;; Code: + +(define* (patch-dependencies #:key inputs #:allow-other-keys) + "Rewrite dependencies in 'package.json'. We remove all runtime dependencies +and replace development dependencies with tree-sitter grammar node modules." + + (define (rewrite package.json) + (map (match-lambda + (("dependencies" @ . _) + '("dependencies" @)) + (("devDependencies" @ . _) + `("devDependencies" @ + ,@(filter-map (match-lambda + ((key . directory) + (let ((node-module + (string-append directory + "/lib/node_modules/" + key))) + (and (directory-exists? node-module) + `(,key . ,node-module))))) + (alist-delete "node" inputs)))) + (other other)) + package.json)) + + (node:with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . package.json) + (cons '@ (rewrite package.json)))))) + +;; FIXME: The node build-system's configure phase does not support +;; cross-compiling so we re-define it. +(define* (configure #:key native-inputs inputs #:allow-other-keys) + (invoke (search-input-file (or native-inputs inputs) "/bin/npm") + "--offline" "--ignore-scripts" "install")) + +(define* (build #:key grammar-directories #:allow-other-keys) + (for-each (lambda (dir) + (with-directory-excursion dir + ;; Avoid generating binding code for other languages, we do + ;; not support this use-case yet and it relies on running + ;; `node-gyp' to build native addons. + (invoke "tree-sitter" "generate" "--no-bindings"))) + grammar-directories)) + +(define* (check #:key grammar-directories tests? #:allow-other-keys) + (when tests? + (for-each (lambda (dir) + (with-directory-excursion dir + (invoke "tree-sitter" "test"))) + grammar-directories))) + +(define* (install #:key target grammar-directories outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") + "/lib/tree-sitter"))) + (mkdir-p lib) + (define (compile-language dir) + (with-directory-excursion dir + (let ((lang (assoc-ref (call-with-input-file "src/grammar.json" + read-json) + "name")) + (source-file (lambda (path) + (if (file-exists? path) + path + #f)))) + (apply invoke + `(,(if target + (string-append target "-g++") + "g++") + "-shared" + "-fPIC" + "-fno-exceptions" + "-O2" + "-g" + "-o" ,(string-append lib "/" lang ".so") + ;; An additional `scanner.{c,cc}' file is sometimes + ;; provided. + ,@(cond + ((source-file "src/scanner.c") + => (lambda (file) (list "-xc" "-std=c99" file))) + ((source-file "src/scanner.cc") + => (lambda (file) (list file))) + (else '())) + "-xc" "src/parser.c"))))) + (for-each compile-language grammar-directories))) + +(define* (install-js #:key native-inputs inputs outputs #:allow-other-keys) + (invoke (search-input-file (or native-inputs inputs) "/bin/npm") + "--prefix" (assoc-ref outputs "js") + "--global" + "--offline" + "--loglevel" "info" + "--production" + ;; Skip scripts to prevent building bindings via GYP. + "--ignore-scripts" + "install" "../package.tgz")) + +(define %standard-phases + (modify-phases node:%standard-phases + (replace 'patch-dependencies patch-dependencies) + (replace 'configure configure) + (replace 'build build) + (replace 'check check) + (replace 'install install) + (add-after 'install 'install-js install-js))) + +(define* (tree-sitter-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + (apply node:node-build #:inputs inputs #:phases phases args)) + +;;; tree-sitter-build-system.scm ends here -- 2.38.1 From patchwork Fri Nov 25 01:21:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44820 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 65FB527BBEC; Fri, 25 Nov 2022 01:24:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 466A127BBE9 for ; Fri, 25 Nov 2022 01:24:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQp-0005mE-4P; Thu, 24 Nov 2022 20:23:07 -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 1oyNQo-0005lg-9G for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQo-0004TG-0n for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQn-0000On-TO for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 07/32] gnu: Add tree-sitter-c. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:05 +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.16693393481298 (code B ref 49946); Fri, 25 Nov 2022 01:23:05 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:28 +0000 Received: from localhost ([127.0.0.1]:60800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQB-0000Kf-Id for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:28 -0500 Received: from mout.gmx.net ([212.227.17.21]:53837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ5-0000Ht-J8 for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:22 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Ma24y-1pUMgF3MsW-00W1Wq; Fri, 25 Nov 2022 02:22:15 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:17 +0000 Message-Id: <20221125012142.22579-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:YTmjXcfBOD5hKsLZWQ41th0dIBMkDBJ8yroL7TCbkim0PhN9L+b FjqaC9tG2G86VaneE/USCF7vvNxAB4kiwiQj9Y/PaRmM6auYgmKzZNJgWkwaZc8+TpQA2bQ 60+4KfYZ4YhMpV+olSoak7pYPzZIk/tl36TI75aQo33l1HFRVdNSl4/IdaLqHyEalsjk3cV 88Nt1F/jeDmu8nb9+3OFQ== UI-OutboundReport: notjunk:1;M01:P0:MhVCACDWQXY=;8HaIE3znW5dBSZwhG9wWpISqarp IfIe3Th02OeJi0HT9osBYpyz/b5Mh4vLutbIn2Ilmbxzmx7TtSYvI4Ph+/rCmiO2NvyUlKGj3 6QfKUIjquKVQipq4zkMPCGVXCNlbeYTE9FOjONOfb7bOTvmsumsJZ+O9YAFXfhSkKFijC1hS+ 5KiTPsUpOa4xMa2ddw0pJt3mbF4pn/GYvQ2L3rUiYxZT/8ydbEwqqmfgW+zSOkdYFMl6lxnGZ Bttb1yQ4jv+s/uOnBg+QflncmLSqmImyZaECcTOFhco2HB/PVCbihHLlbReLXuZIjmBKPskYs IRSr8j6HMEI6woV5hbT22DewA8A3HEewWrvOFWq6FMjif3fFI8j4QWMqC5IHDxMVu5CzGzMdm PEmyzzpG1W3vMS8TwSUKjhuP7jUrjly3wiWP4zsYpxAya2qE5QGoxDZtNfZIGFcdg4qLczu5t DBEAEvr2uJZ6VJj7JsU155CY8I9yDWD03XlFXdMPTf9CdGFbComcKZ4H0qY+mnnq3t9Pue+yb oNt1vJQWx6/nAUYrgUd78c3lWJ+9/e2y+jRcKeDi11KiV2K/oh1O1juzZ3SHesqPPpiVm6+x1 g2piG57Pssxwa2UXrp44f6qj0G1vMtFsxghhCmYZltr4nkceGGsgowLRLwLnl0WtlBMTSABhJ 9JbCwOJxy58LkaLHRq7AABDWUsbTP9/nejj6BoR36WMYLxOP7jhyzeqrsELNuNiXagHpopM+X CZ1QIqxJGZW43TZHfgCz9PecNdedGkb4ZhSyWZT+04Zh6KlORzsJFgyz4s51Eab4Tj1rk7T4h tPZCm9wvmWTDxuyb2HH6nfZcMD/ZxY3D+bf/tg6SC1672BGLsG2AyVH73LaVwpT/vkkgDBUv9 afuZRxxJibAWZJ/WBLXY8dk3Nh7nLcmFZygJ9817pkFu62WIUpdeezT1iGCUN4lKU7sSD0Sa8 n+qWcR6D+hzOOw8UHmCZj6qHtzg= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-c): New variable. --- gnu/packages/tree-sitter.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 30bf17b79b..4f75b0251a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -22,6 +22,7 @@ (define-module (gnu packages tree-sitter) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) + #:use-module (guix build-system tree-sitter) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) @@ -156,3 +157,35 @@ (define-public tree-sitter-cli This package includes the @command{tree-sitter} command-line tool.") (license license:expat))) + +(define tree-sitter-delete-generated-files + '(begin + (delete-file "binding.gyp") + (delete-file-recursively "bindings") + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter") + #t)) + +(define-public tree-sitter-c + (package + (name "tree-sitter-c") + (version "0.20.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-c") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-c") + (synopsis "Tree-sitter C grammar") + (description + "This package provides a C grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44817 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 93E1527BBED; Fri, 25 Nov 2022 01:24:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 2395D27BBE9 for ; Fri, 25 Nov 2022 01:24:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQq-0005n3-4P; Thu, 24 Nov 2022 20:23:08 -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 1oyNQo-0005m5-Oh for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQo-0004TM-Gc for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQo-0000Ox-CJ for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 08/32] gnu: Add tree-sitter-cpp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:06 +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.16693393481305 (code B ref 49946); Fri, 25 Nov 2022 01:23:06 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:28 +0000 Received: from localhost ([127.0.0.1]:60802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQC-0000Ks-2V for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:28 -0500 Received: from mout.gmx.net ([212.227.17.20]:35365) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ5-0000Hu-QU for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:22 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mwfac-1oo6pm0P1u-00yBGg; Fri, 25 Nov 2022 02:22:16 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:18 +0000 Message-Id: <20221125012142.22579-9-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:q9+zV2G4nXI1ER3U9VHN4mTbVlGRCjChS6JIUORsnqgbDeVQ8/q si5zMYCtncVNzhxuokEIKLNmtuVHRTJ5mKjxD8JADvrBxzU74PRa1rbDOdf3aNMbOBhZpDi 259dkTQqw0qkoSxl4EDxFyN5zm6WLf+jIL6BvcE//0/zoPyyaztdHUigNqFCca+j9elM0JA I0j/BGdS/Zk4c5bHPfaEw== UI-OutboundReport: notjunk:1;M01:P0:nc7Zd2laMNk=;2TzC9nHvdbYMWtI7vSjeh7kL3Kv Q0rFB+TYp09h+xyz57Ib4cAdWQ2EvXgiDI6bydlO+qcmCn0QkRxqdtwwRYU0uh2s9wR5beuLQ whg9T2MUXCXvZs3dMKicTIziDJXyHQT9Zpm83gaaU5zjod5Of2aI1CpsnIc1kuyMYHbJs7KeB fbz0T3TTf64KZQSRLllShYctn3NjGsyudYE0t72jsM29MvWWhevdk93fwCekjP/uzGnhnwSmC X8V/6x47qwYJz2ZWjslkWKxyoEZitwJnGnlMY7ueBxVtypu43iOeHkPvnvfYx5eStJLH3HFmF nlKHuk/e5evAE9DX6Y7HOPbv7zMt+T3u6Pq2670mLxYIeAyV8Ke8zHzObwIwkSwSNlPG9Eru1 DOALThIh+009//olhyApaiaYIZmlItmgv0y/frpjIWuBLE264g5tu2F6p+kbvwl0fd7kZyv9Y ek3FqIgMfD36OuC/A9/OU748YjuUUsKPFjlHHyCXzWahs9VcDH8rjAeJskeb/OtCFJ+gTSP0Y Jpf//XBIsVF8GJQoyrNWf0OslrMws8ZqLLiiwlRABjZb8iLBMZe9noiMvZeQ4YlPBY6r5/k8H UM7BErg6IEIJkNPr+kfTk3mvkvtyRRlk3ngkG7jT0YMl1bUgYmkS/ygwG01h2LXhbRGaR/scF ggzcB0rDqJsvPrdGPotBmbOanR5yKIwNidgw+CNsYewuRCyRgKv6nsD575LTOiWaTHd+i96S3 BB7cELHoI5oE5+jeXlTEYIHq/k1qytR5fueRQZOpokP9Cygd0gtvdXJBW4ClrfTI+4GXQd2KU OMrWbWJ0mmXQm5SQXWf5ykR7iGL5Y6diOT4Hf3jfK4iUHeq4Y6YbD+N12B49PPV3ZInO0zrxS n8vNmPVFIYYS7FFCn/riERvW2wgiSatE/F1C+8IRK4V3n/uO9ZMb8eocxF52gZSY/MfsJowyB 9FC0DU/2BGex5BqaavTaWEOi3ZE= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-cpp): New variable. --- gnu/packages/tree-sitter.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 4f75b0251a..63dc990475 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -189,3 +189,28 @@ (define-public tree-sitter-c (description "This package provides a C grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-cpp + (let ((commit "5ead1e26c6ab71919db0f1880c46a278a93bc5ea") + (revision "1")) + (package + (name "tree-sitter-cpp") + (version (git-version "0.20.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-cpp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1572qhfw1jjkm1q6c110lnnj2n384a97fgn645c5q9ikciv8kac7")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (inputs (list tree-sitter-c)) + (home-page "https://github.com/tree-sitter/tree-sitter-cpp") + (synopsis "Tree-sitter C++ grammar") + (description + "This package provides a C++ grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Nov 25 01:21:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44828 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 CA23A27BBED; Fri, 25 Nov 2022 01:25:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 66C5027BBE9 for ; Fri, 25 Nov 2022 01:25:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQv-0005tP-Na; Thu, 24 Nov 2022 20:23:13 -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 1oyNQq-0005nM-Dy for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQq-0004UN-4s for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQq-0000PQ-0y for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 09/32] gnu: Add tree-sitter-bash. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:07 +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.16693393511351 (code B ref 49946); Fri, 25 Nov 2022 01:23:07 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:31 +0000 Received: from localhost ([127.0.0.1]:60814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQE-0000Ld-AR for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:30 -0500 Received: from mout.gmx.net ([212.227.17.22]:32893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ6-0000Hw-4Z for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N63VY-1owOJ61cIC-016Sk0; Fri, 25 Nov 2022 02:22:16 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:19 +0000 Message-Id: <20221125012142.22579-10-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Aom8K/NrNs8SmBDw4rYf5Yy29KnAzdrEdk7bkr/19OFK3m6X8f0 y633YIsuD7FVklZy3QtPluXvBvv2azCpKKYgMaEQQiNGtG4E6IGSK7yGdogxgZCnY8doNHv 1YIFe6pdM4JpiDCCXaWXjVb+sRuL6uM0y2Mt4PAy6c+EiNG6RCobSIeJAowt+0fXf2/Ttx4 gl/xsZsb0tIP5iH8uzZTw== UI-OutboundReport: notjunk:1;M01:P0:uAJ38Q4puXM=;IqC0AWkXctcfH6YpRzl9wePXxZ+ TaaLgSJW2MAgrI+PJkWa12Cw9iUpw8OHLMzXktPH9iz7LGc8YuyUJOq7IC2SDyFDeF9UZ130Y 8GzR25/dtIS5yrlKtu2oFJYOCFVzUPbbAIdiWJXankWLDFX9RIhshS2z3tSsRR1vu0RFWShTC JE5xDCk7810qSK7ORrae6wvCFfzjIHbzrebP1QRaKIzRVFg5g0LticXQEY+nRVhvai+1WPDIe 5dVb/tAqzTWclK0QliYMr877cPxLZChQYGFgr2vNjcm3sBUO/JBwM7u5GYKyJpGZImvBzZnnU Mr5Bdp/ZdoYMzZLlC9cuLxx2Wg8VAKRehz0AuaMwVyxi7/8Cdt+aPP/p8xJTOZY2iFwzMUXrX nT0NulT9AAiBVYWSwEUcoqXrSeqjTI7u/hOROzKS2R9j5nGfhJJubeAr/1cSjRERhwerc6+TA ieDCqOykFfXzsduKMBKw2IB5NHCtoPOZiuqLI55tmwvCcYDENLOj4itzwflFy8jqSDABrDauq C+fadtiyx92DxU3ckD1Z7b7Y8VyYIzkx2hBxB2925iDePmBcZeBS5GC4BIGioO/7Hlp+zgkBd oY5BNE0q68Cj6Ie0kXbhbyLRbCh7Fuhfj+zVFmX0RjLf8viC3ajlVlgfODdgmslUBv/I60AHW XEfqtFAFBwTvgz0gkRqkmOIIm/eAXKNK88kzmvlWQLlcjQFo4Syq0PBVbUKVhxh+cirrq/rmf 5LAO6xEtCY4VoW5ie/lVY7T0uZ1Tao/zNiXv9cmQ8dZ6g26ifEAnILxCYBA35AnRaLGzKUVb0 80gRHD5YED+mbGZ9m21PANWNVg/4Yhc2c1hBw8nCMVkBCk4bW/hIlAPvKU7xT5UU/LhsU4qe8 Hf2VrtAmHb6nCqt0zJ5/5EgU4mflHQhAtOx+5l0j7c6Pgc7R/sQ6+euh8dF9NsoJbzl8Edtpc 7RLpjMLRjitYIk9u6/w3u/VNx84= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 63dc990475..f583dba24d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -214,3 +214,25 @@ (define-public tree-sitter-cpp (description "This package provides a C++ grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-bash + (package + (name "tree-sitter-bash") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-bash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-bash") + (synopsis "Tree-sitter Bash grammar") + (description + "This package provides a Bash grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44822 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 1A6EE27BBEC; Fri, 25 Nov 2022 01:24:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 7371A27BBE9 for ; Fri, 25 Nov 2022 01:24:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQr-0005nw-Jd; Thu, 24 Nov 2022 20:23:09 -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 1oyNQp-0005mV-Kl for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQp-0004Tn-9e for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQp-0000PC-6J for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 10/32] gnu: Add tree-sitter-css. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:07 +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.16693393491325 (code B ref 49946); Fri, 25 Nov 2022 01:23:07 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:29 +0000 Received: from localhost ([127.0.0.1]:60808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQD-0000LC-3E for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500 Received: from mout.gmx.net ([212.227.17.20]:56183) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ6-0000Hx-FV for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MHXBp-1pBrxZ2nAH-00DWdp; Fri, 25 Nov 2022 02:22:16 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:20 +0000 Message-Id: <20221125012142.22579-11-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:MMtvAltoHxJdodTZARB4CfBMfplTdcqbHE6jLEzMmLLIFEImdUR WOvwUrL6US+CsiAVj2uo23fX4PvSFelQnb+vB7aMGnTcYcqATBuZU9+8ipvn6jvQNkHRKxK 7ipQjU38Ax9AibYCbeZ1izwlZyxIzyI80J3X9wHi6OHa8Pi3EC+sG5WwxQhud13D1U1tvU7 aaTa4eWRop0iKcDkRteeA== UI-OutboundReport: notjunk:1;M01:P0:zV6q4wkBN7E=;5oTwuSUjtzU/tYgB/7yd93S0fBK mzZh/tUs+YgQzibFJilkGooQiO67zjw1kH0QmoAd/jjYePAAI1c2E6HBlk308HVxhKvwV/N+s zRnra8Bx2V0s7Z8sj4m+OewP1JHMxsyzuhN0B2/zx+eKWRrk6G0Uq6OBMPh3mMuCx52MsxSMd buFtcsnf9qKPxmRREvqWcpB3sNmHU61Y5x3jTfVdQ6kE06kjiBEQsqjZZAXxdLqZ61hkeIO4r 7ZBcuvDyThWRMthLB3kdm1q4gPrIdxPHdOPMuB/QkyXDCE4NuWyL9THwS99Ptmz0hjDU/5nma oFYSeTwOEkw0xM9ILTLE0NNEnG1ZrodsK2ed80HSOaQDOR1w3pSCdeyVtOdDRtHjub7Fqahjf x8omU12OAlD2xswAXE3199n4RQcq7pXNeXcmFupcCP3oRQLntHPascDwhZlLrrQGG6n7BW+jS ke3TDYpLnN1B7d1xf1EdZcL9uU+sR8A4eJGRe3yudOgiC306Sb0WZ9tPU61+oIEjOnWfPJba3 vzIrHR1EY+3ZCaiAs4PN3AX8u8epaDwABNsfi0eNdjXZZt/KR2d+452HG0C01I7IeLBVgjEsK zOqiGjC5VCsPi1hnElxcAoVAHEAh88CRzDpyNV1dOIxeAYt5yiY+rEbnUhaUOheEbStlGfn9h HiCbXOB+w5bIR9tTxrLYk2IIbto6naKbcRU/CPQbxf9UsqJOh9j4nf/7GtsTEQ9rMX/PAkGpB jnWjEEEhQIcKFrhd5pQU9pnjFPh5Jm0UA1UwWdw96oAB65vscdfdI9u43YapMbMSoTzWUT/Xg qZCGYfB2iz+gFRwrvqKNnDureutLoZoHsQn/x0YiSyNvRftiOCWlw/MWSv4+NjIQze2SBD4uU 6J8viZAxbs32QbWApc7Q3aS7bZHZG6hKKdvW3siNtPUVh6525kciS/IA+0oJh6vNfuhbh/RcC FUv7qM4hjOclrgAUrpeycdOVyVE= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-css): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index f583dba24d..e3ec418419 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -236,3 +236,25 @@ (define-public tree-sitter-bash (description "This package provides a Bash grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-css + (package + (name "tree-sitter-css") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-css") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "014jrlgi7zfza9g38hsr4vlbi8964i5p7iglaih6qmzaiml7bja2")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-css") + (synopsis "Tree-sitter CSS grammar") + (description + "This package provides a CSS grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44807 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 7B3BD27BBED; Fri, 25 Nov 2022 01:23:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 054D127BBE9 for ; Fri, 25 Nov 2022 01:23:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQs-0005pB-S5; Thu, 24 Nov 2022 20:23:10 -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 1oyNQq-0005mv-0O for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQp-0004U2-Na for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQp-0000PJ-Jw for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 11/32] gnu: Add tree-sitter-c-sharp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:07 +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.16693393501345 (code B ref 49946); Fri, 25 Nov 2022 01:23:07 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:30 +0000 Received: from localhost ([127.0.0.1]:60812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQD-0000LK-Il for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:30 -0500 Received: from mout.gmx.net ([212.227.17.21]:36075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ6-0000Hy-O3 for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:23 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mt757-1ojRzt3znF-00tUAP; Fri, 25 Nov 2022 02:22:17 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:21 +0000 Message-Id: <20221125012142.22579-12-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:IjOpre4pGoIed0D8p+nQV/zwI79Q4m1hgiDL4uzyBzdRGxPPG6U Rrve6b+VuX9zmvT6sIiLNGbTHKQdADaRSJBN1VyGTfpic66TzfuZXBbCRQsrkgX+ighWC4r LbVCNon3aqlqUaaWhQlcJq2bgcTOzmkJIModrTF3+N4H29Yc3byAFXwZnvuponEq6UehkPy 9e2YXRnwqlaJzo2rtTdwQ== UI-OutboundReport: notjunk:1;M01:P0:BuvqiKnp5bo=;53JlNU/9NpDxPsNIx+R4DbOwwSu +8Chx/CLKAC16Az3C6yyGzN3NKlKE5XF8coRyUpZQSchAHxCrQJL+Bl7LABKjhZOcaVP6XiL3 qg8LVhS3o8V+QUDxtfE021/HPnOL1EjSikshGjmwPnq0dYdy1gDSs8n3Mq+NH7Jjg9S+apbSZ wXRYPu5o4T7kcL9gTUz0/G2avICRt7ExZSKGMFzta9NzduI5nd9k/LQ0O5XDFsI7n5QtZJQwx Qd1z8M7je2ryzz5NURz9RPUjj1cQIwWwwP5ghh5dURrdG/D4RtUmvvtDNlQF4MHV7xhcgHEVo SWUl3W8RKIT4xZW61pc3FmW34pJmT1j8+AYQgWogOl7DiKR2wvHVz4wAnqmrVx18yT6gsuLHN uLFFMa3X/E6SPbhkwihcah9Ko3kpBHP4ugGaAijIpgyn09qx2If2RyP5E19jFdf6k/Aqa1rW6 /k/6oHTNtkmVS4cg0fNLw8IsmV99Gk7qfK1fjTFHEmruNzU54GuackSMBMaeNZfgB38aMiOx0 3oF9kYldKv7IisTzjskOY157e/q9+o+3yQQqZvFAxhonbYMpUtTuOPezHAH4Vt53FrZNqCgXW DDvqnG/IvuqEa1NtxAh7O7i+J4s5JglPDMS/2sn57pcf5ok0z9EcfrQeH7vRZZ1dQ4MbBUthb vtV3rtkF1BQMzAULCfnA6p4ZEBxKxTSL6IES0D0CWRcmTd1d4+58ZDZDBfRWXkffx7wHP2FQP zjayQajIZ3tx8k0FKIPJMwv9Eoouert/aBWm4U92/HK3sc8tezH67FSjIhzE3V+LkKXnn6stE 8TaS5RWdgUXwY3R7aWf1IBaCjE3xB132r8Bw0x8JaZx0k1s6IgQRUKFmwZ/1X3lTAPRF0YEV8 /qYP8fBgnEGYVyWPV5MEW/TvFDymh4vyQD+WKw6IYxrQAiWdXjhVSikICl06elirRherTkoFJ eWqo5nO7CehwoCB34w1LR4S9fi8= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e3ec418419..0f65e50440 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -215,6 +215,28 @@ (define-public tree-sitter-cpp "This package provides a C++ grammar for the Tree-sitter library.") (license license:expat)))) +(define-public tree-sitter-c-sharp + (package + (name "tree-sitter-c-sharp") + (version "0.19.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-c-sharp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-c-sharp") + (synopsis "Tree-sitter C# grammar") + (description + "This package provides a C# grammar for the Tree-sitter library.") + (license license:expat))) + (define-public tree-sitter-bash (package (name "tree-sitter-bash") From patchwork Fri Nov 25 01:21:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44821 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 CF49B27BBEC; Fri, 25 Nov 2022 01:24:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 728AA27BBE9 for ; Fri, 25 Nov 2022 01:24:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQt-0005rI-Qn; Thu, 24 Nov 2022 20:23:11 -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 1oyNQq-0005nU-QO for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQq-0004US-Gv for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQq-0000PY-DY for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 12/32] gnu: Add tree-sitter-elixir. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:08 +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.16693393811402 (code B ref 49946); Fri, 25 Nov 2022 01:23:08 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:01 +0000 Received: from localhost ([127.0.0.1]:60816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQi-0000MX-T4 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:01 -0500 Received: from mout.gmx.net ([212.227.17.20]:56135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ7-0000Hz-1A for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MJE27-1pJ3zu0xxL-00KheB; Fri, 25 Nov 2022 02:22:17 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:22 +0000 Message-Id: <20221125012142.22579-13-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:FKm2Akp1M773dgloOpMA3YIlVY0Wz/F4HsPNMrFou7eW2ed1uon jRGb3CUfLWBzTR5d1WJBhf/k/YCRxLz3U6GZ6EJWXZf+U6zt3xSIwjCrgjYSdlge16DcqkI 0w9wWDYY7uprs4SHc9gjPVKQeTkvPvvjfEUSajm+pIFstPfy0SqFza12I9dQ486obB4O76N 6f3GPa89gDhP1NEx51pHg== UI-OutboundReport: notjunk:1;M01:P0:avzB6Uemsgo=;yLJLjrqxwOwRwcFyjyRPyjcz2/z hglQYJWO3QPnMdDzq/ZX4zg8c43Xp1jbWjQkHh4zMzRRvveEtCf82q9jiuJ/nKtX4tT42HYxK g9DvOyLJhBHUnYHe02Hk+ZeT4ydmsKLaqMoeaAlU3Y5f7Zqe6XzJi7rxunVTcOIgy2zgclnTj Yg48LuWJOqaEzY8j5b2YyVNSH/zkOZwRG0LomA6PVorGHgVHWoHSHrNkIHQ/UZM2Wl/nrwPEW TEl9qiSZePVi0NC5ZtDreT9wja2FdF1hS1sRkDChdJUileF3DoMdXfwt3jp0y8EuCbnVGYXA4 aBbafjFDIIOzy843iPciwmFVUyHsYcoNS7ctsVirkgo9kCyiEijBrqRmzPL+S+stofVMdaI7n OSu+h5o9KkIvxn5Oo/NhWCUuQH3/zHSSypPT6Wtzi1BUxdl2rpp6M6S9DdkuptvkDiACXL42l 9Ij+KTjbxtSGHfwQJdCNpzlANV/OjiHSbixar60KwU43cA3+o+E5+iAwHjicN44EVnEjWH+KY N43IQMriSEPNS7Jnnh/0oAZHgkrry2/NLs/hdyw/WDpx0xbS8UQigW4DHhDYfn5W2SBCIWxev J5lQY/es++J9u3yGm4T+mSHNOffLr4+Sr5i14ik6aSkgFYrAoaTursbb6fUX8KGa0W69kX/ij eth7nnkniSY+j0jgLNmvMcUK2j90zejndGHh69lhjimF0ppMgwq/7oljRwgEQp/xsnnf7X/Q0 6UjZJafD2yvIKE3UHi+aOMlAUraIuhU/2kvwRpgsa9OWnCZ8Z58SCP7iHgDFoQ3fNy62aBINr UifjBfMgIkX3ykRcR0ax8O/5CQct3acmuqgx8bga0PQJc2XkNe50DCW3JcirQAP9ySjLOobRd 03+SY2FODFqyNIZ54yAG2rhGJTaBEwRJra872Vpl8E0RGasGn2Yn2G8Q+pMXOHIvIpXDeZpkK qhGsN3HjIWr4c06wS2JReF26B5c= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-elixir): New variable. --- gnu/packages/tree-sitter.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 0f65e50440..3ffb91a1a7 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -280,3 +280,29 @@ (define-public tree-sitter-css (description "This package provides a CSS grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-elixir + (let ((commit "de20391afe5cb03ef1e8a8e43167e7b58cc52869") + (revision "1")) + (package + (name "tree-sitter-elixir") + (version (git-version "0.19.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elixir-lang/tree-sitter-elixir") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://elixir-lang.org/tree-sitter-elixir/") + (synopsis "Tree-sitter Elixir grammar") + (description + "This package provides a Elixir grammar for the Tree-sitter library.") + (license (list license:asl2.0 + ;; Files in tests/corpus are under MIT license. + license:expat))))) From patchwork Fri Nov 25 01:21:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44806 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 B61BA27BBED; Fri, 25 Nov 2022 01:23:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 3A32A27BBE9 for ; Fri, 25 Nov 2022 01:23:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQt-0005pg-2z; Thu, 24 Nov 2022 20:23:11 -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 1oyNQr-0005ni-8f for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQq-0004Ug-TA for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQq-0000Pf-PF for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 13/32] gnu: Add tree-sitter-elm. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:08 +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.16693393811427 (code B ref 49946); Fri, 25 Nov 2022 01:23:08 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:01 +0000 Received: from localhost ([127.0.0.1]:60818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQj-0000MZ-8x for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:01 -0500 Received: from mout.gmx.net ([212.227.17.21]:47677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ7-0000I1-9G for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M2O6Y-1p2DyB2Bzi-003riU; Fri, 25 Nov 2022 02:22:17 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:23 +0000 Message-Id: <20221125012142.22579-14-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:CeMKWCUhdDpwVRy2a4jzMiF4d65KIGvgI0TCmU/h2pq9g2F0Ifp 2oRdWZ/0UsIuvjkEyHpsaMqH9jN4yDRAmuF/It6MbYsvTWPQ08dKClAP4sQay663fIrvrX6 g0G+CqJrR/o8iHrYNdsg2WIfDS6sKdwgZloZ8yq/EXV9p1XMog+A4U4K3jfTki086rOQTs+ UnNipFWWmGbQuU1sCPamg== UI-OutboundReport: notjunk:1;M01:P0:dt1zNQvVQOQ=;UflSZJfwdTW0AuypmV/Jest5Qyt CcqWRWpM3Y4lZxkDG+UhhYgPjrYuGRBw9pDfJzZTpDzLRVg0Yy5DzxA3usmq8/6Pfpr1/PTkI u61+DBYyEXI7l0DJ2G8Vv9gpq2ftvHN3z82Y3OGZYL1I+O676P2AdkhT2pQWGVbaFV+sb5yD0 w1WmhFcr1IkDscwYkEwSHYSLpW6QrBrgc1dd6qPZecKLmbKoeHDjJtCByTlD9Soy7mfqoJDKI DXhqqJ03yAJf2DPxDG4omijpsggMVG1/Dx49H1d95tTx5JL2kp/dBTG/O54OhT3rr0ixt5dEP xzkU1FkUnOPdc+w463oqA8DRIneXAfFgBh3TRR8MR/rjv0AShUGDW7fspKvMsMhvn2zEsyEq2 t+m7w+WIfJQIYEwGwalVWa4zzZOpb6kn0E0PLbCAUBV/+mrwp6S1SMiJPB8kwNPlFMeU3IzYK lVIrIs0kNOZwGMl1QAbFSzPnmC7fpY3AAqwbqM2f9Ko02PHzU9KHOc3BrnTeAAz/QamQGuI3q jNkiB6QWrwIwUKL34jquQrpZ8g+guQRn5jnN53pzEcbPm/MoF0n2tALWrlTy5CqDDtRxmuuXT hRxVzAVWSLenGmkoECuB12cHMTjnTiTOqFPJWtsX7rbuaWInsuktvrgFXaZkYiZvClyHE9qkm ZvkrQYDDWvqOaXi+Xjj6OFPzkmeqF2ht9YGnwPaSk15g8KeA/WTzUyRDqltzKsmbyrFfAuEQ9 1yOA09hOj3VtT6XnZLnxKj5G25SXnYaq3KfIDXk1gQxFhIITQypKMki5ypY/+JCpmhUOg2fnZ xj4rriFxBxA946eZsmnufm7p5TTvMpjRw7zKn939vvwZt2Rk4KBouoXVdTStSIsYsKO77YxQT HWIIFqspHxF5npkqWxBVIORBjfEs08Sp9Yolu3ucltNVcaDvSZzaOCjyqkopLjO5AgRsWE08V /WJkgyQquZ3a5GATcSR1mjeb1e0= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-elm): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 3ffb91a1a7..11548f526b 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -306,3 +306,25 @@ (define-public tree-sitter-elixir (license (list license:asl2.0 ;; Files in tests/corpus are under MIT license. license:expat))))) + +(define-public tree-sitter-elm + (package + (name "tree-sitter-elm") + (version "5.6.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elm-tooling/tree-sitter-elm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b5jpj8bnil1ylisyc4w48j8a30dyf3zylhidj73mlrb8rf7xm2s")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://elm-tooling.github.io/tree-sitter-elm/") + (synopsis "Tree-sitter Elm grammar") + (description + "This package provides an Elm grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44810 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 4DCD427BBE9; Fri, 25 Nov 2022 01:23:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 2289527BBED for ; Fri, 25 Nov 2022 01:23:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQt-0005qz-Er; Thu, 24 Nov 2022 20:23:11 -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 1oyNQr-0005oM-R9 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQr-0004Uu-D6 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQr-0000Pm-A9 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 14/32] gnu: Add tree-sitter-go. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:09 +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.16693393821436 (code B ref 49946); Fri, 25 Nov 2022 01:23:09 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:02 +0000 Received: from localhost ([127.0.0.1]:60820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQj-0000Mx-LO for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:01 -0500 Received: from mout.gmx.net ([212.227.17.20]:59775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ7-0000I2-Jb for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MsHru-1ojj753UIE-00tlPq; Fri, 25 Nov 2022 02:22:17 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:24 +0000 Message-Id: <20221125012142.22579-15-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:TmH+oRybUGJUadoKlbwLr9TmRjXMMx4lk0dTymcAjpazuEa0B7S +N2/EoZxeXYc4VgYYIi979xELlNUyoywKcbN02F5Bw1Fhz0InPEoK47MPpn5gVibXkhESDg acXwFzmeZ//2UljxyIp5fdHVVY3G86LJTHk06b8bNWDeyemKGxSxz8ad88y9ahcKnLh5mSp RxaQmnjUyGZ9bh5ozPtMA== UI-OutboundReport: notjunk:1;M01:P0:9RuixkdoVlI=;+Jb0Y64bYL0xodqZzboOOJbhgIc bOd7DVx1pkhRIcouVaBzBfezlOU9L1VSgSB1GTpP1PCEIzdCGsGarqAzoU2RVs6rqGQrLgSv9 Ay3PuNOkgr3tDJf8TVsx0HHxQmucl3C6hXivShDcouNnVFR725/6CBwA7gcTMf3E6v99UZhVJ tHE0g98Xq5PzBnIxGc2JoYQcV0HVqNK3BlG9ThUjop+PKdF4BMNS+QT0niSWw0YpO9kIkUwLm p5sLOR4Py0rchMTwjFKm+ej17o2SMdPZ2JvyadJhqbxaXXdnQQ7QWRVuL+q7/kBbhe6OEfW6N CYlYUXIxgiklcoL+esHc6fJ4C5ABAsl9MUdzBhl0B9DJ9EUeh3zjqQnDn0LbWeVfIaEvaa/6k SY4ZMiE2jRNuoOYOm0G5wWybw3j9rDcTYVMgxwV5DqAr0x/9oZj8pZEje4UDlCDx6izT7RaMI R6/BY9JZnH8wHNXavpTH1tpglAdu6igcvaXjj6RlehC1do/mKs5W1Rcv6ZLsbbCiNUJfHkYs0 6qlk9EMcbotnSi9W7sNQeUdI2H17/lD2aTdYY57p3qpdEbiz+24IFDXPKp1DClNYBFlwbFeSf gFT5znUfA7wn/vDQ3VTdUCkpUpzxnuWAY39kPYMNNiN2ciOiMkxl2XCqGtde3QeMOvTLfl4AS 7AVbOlQsGueE6SNhzbNht0b/MPo6eYMXa3s5yiZEf7wclrfXwHGApLNtrGH7QeERnI86GSu2r 7s5lpTB4b/XGpHvsOYSLJcXfjHr0rv791Fca7q6KvqlNCL8fSbOKUyM9LoqbhD2PbnXb7DLKo JvJlXAljg+rv3984MOlyqb8TDQWiVBJOs+EyLdPotjayRmg5BBO5G4eD9uNpD2+4rfAGy39/Y nAibKbqXFg92Rn6etlvQv3B9BIh52yQj0xbRoYTesak773LXs+/8m930XMkmGdgxeqm/rGumh Ij4qVGpUrIz2lHICxHn0LJ/DDwI= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-go): New variable. --- gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 11548f526b..61d6eba777 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -328,3 +328,27 @@ (define-public tree-sitter-elm (description "This package provides an Elm grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-go + (let ((commit "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611") + (revision "1")) + (package + (name "tree-sitter-go") + (version (git-version "0.19.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-go") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qymkdi4qcnj8ywmsanb6pdl9zd71cbm6kzl87zk241h7dhkkkvz")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-go") + (synopsis "Tree-sitter Go grammar") + (description + "This package provides a Golang grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Nov 25 01:21:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44808 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 EB8E427BBEE; Fri, 25 Nov 2022 01:23:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AF12927BBE9 for ; Fri, 25 Nov 2022 01:23:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQt-0005qw-DN; Thu, 24 Nov 2022 20:23:11 -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 1oyNQs-0005op-4T for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQr-0004V9-Qt for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQr-0000Pu-NF for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 15/32] gnu: Add tree-sitter-haskell. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:09 +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.16693393821450 (code B ref 49946); Fri, 25 Nov 2022 01:23:09 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:02 +0000 Received: from localhost ([127.0.0.1]:60822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQj-0000N7-Vx for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:02 -0500 Received: from mout.gmx.net ([212.227.17.22]:35357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ7-0000I3-SK for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MvbG2-1oidie0V1C-00sexG; Fri, 25 Nov 2022 02:22:18 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:25 +0000 Message-Id: <20221125012142.22579-16-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:kWBa5rm8Pk+fKxIQUxdLDWKz+2wdy3ELmvt4a7QeY9k5104OnLC vyXKlSQMkreF+1LZjRtNw6uOE6lwCVO6g6v+MaiKURf6a3OBxYyp1V3JhYgws4IZKnyk8CM Wxc7+nHX0nBtZz75e2QvOaUHxg6rjO3fAu8SvN3tOuxtM03S9eOaMZSh8C8Hsblj269KERu C+a4aTlpQr2YjYVEwIgMA== UI-OutboundReport: notjunk:1;M01:P0:XHkyrqIm0BA=;rzst7q6ZD0Yz8dEGUWfvvKDtU5t DqBQWYKW/LTMktdj3zIN0WmdwtUPq2KQJcMyqzeFgLdRNsquJlCf8p4KQMpD8P1KvGo7xIjOC 1XEqTv2KLbXqT5ppo7MFlpphg0JWttyKAotYk2ZqDu+fkIjDjRR2HT1neiwJ0j3vCQOQOLJgD Dqsz252N9zwLileUxyDtTyHAJRnIaobFRW23ZLOP3SzEeMtGzEDCeDS9Pf7mq348ikoypUbB3 s9FkvlihrOJIUp0GfSA9EGEtWbZ67jiULt4f5phQMe51fyUUdIrVCPh3uc2obJQaWPf/98vsN 0Z9pM5rZ4XxpSz6mWs6qVCKNfqW26PVUT0M2+CzXGv9LR6U8Hahbt1hWlShKUCP43MnEVgsFR Cxl1pWxXQm+WuUEdDPWb4Z1+T3wUw1Vj/JlLPVPbKKJotXseJdTXQ4FJt33agPsTIami3mClq o7kOaz8ZOdHTaCfQb5E/bulMViNj+4Va+hyVzmXClAI9trfBYHaXiia6+aos1TpwvZdouwIVj ISVE0Ccsokue3Z+3Hl0qPqJFsrARt5n7DhQ9RbEgTM8TFR/QPIDMIX+zd7xK09brnRM9eGU2V RBM+5b8++BoSHZzRa0ZRqSnTlOx7FnYSyWt9NqIsT7/2WXKQIg1JwTwXeC5cPgdN+fm52vA2i RHfa2lGCHsVgARlgUM4Sgo3EPH8QH09Sj1wceqenn6RfChqgARXpEBISNWGVm6XMmUEVK3QZ+ 0iW1+QWUyvE3NbXV7Ak3j6Vef7mwpbggmnPTcvLiiYL7XgbpvYCOROZYKpVgbJ4MZ0dthtJJi KGhDfF8IhI6w1dzBBBD/nKSWzfSL0vEUS66pPuV6ddJSf+WIjfOqz7m9Q+1lj10pDQiRZGPOe eHBIlx/ZsBoNn+tzDH8GmTSYQrNe+1JFThklDElZ+1jCCSEtHuKeVyKSch98F/vqjC1a+eSKQ OlsUsGIiBtn39egCgeM/Z2NrLEY= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-haskell): New variable. --- gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 61d6eba777..668788e582 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -352,3 +352,27 @@ (define-public tree-sitter-go (description "This package provides a Golang grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-haskell + (let ((commit "e30bdfd53eb28c73f26a68b77d436fd2140af167") + (revision "1")) + (package + (name "tree-sitter-haskell") + (version (git-version "0.14.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-haskell") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ylgs6lv1dyh3wxf756fii070r32hzbgddrfjbi2v369vmvg337p")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-haskell") + (synopsis "Tree-sitter Haskell grammar") + (description + "This package provides a Haskell grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Nov 25 01:21:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44809 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 2F6F427BBF0; Fri, 25 Nov 2022 01:23:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AA96D27BBE9 for ; Fri, 25 Nov 2022 01:23:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQy-0005uT-1R; Thu, 24 Nov 2022 20:23:16 -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 1oyNQs-0005p0-GC for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQs-0004VR-7r for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQs-0000Q1-3T for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 16/32] gnu: Add tree-sitter-html. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23: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.16693393821459 (code B ref 49946); Fri, 25 Nov 2022 01:23:10 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:02 +0000 Received: from localhost ([127.0.0.1]:60825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQk-0000NL-Al for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:02 -0500 Received: from mout.gmx.net ([212.227.17.21]:60663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ8-0000I4-5K for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MsYqp-1ok0ED1iH5-00u2Ol; Fri, 25 Nov 2022 02:22:18 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:26 +0000 Message-Id: <20221125012142.22579-17-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:vyseECFQ8ciRm8+5ZqOYLONBwoWqhAVrownEZvLVkOUDwzm7PBq L0HdjW8loYPCAawF8GZXoS0YxEf5KVC3/9p3M+Ax/rW4YXhsd9XWSDwc309pK9N6tMaBTcE IR9CGQzatsrytvxWlPREUCcW0+fJ9r+44oS+cj8Xn1xMW9ToRchMjI2vJMCLqRww2cY0F7X 9A/15kHsdtYSlyBpTiJKA== UI-OutboundReport: notjunk:1;M01:P0:pnM6SN1kOYQ=;Ps7dqKCpUL1Wv7CxW+RI+mjHIZP rNNM1askNmvIEJlO0GZ0hp3m/n+RTJnHsYvKJ9a1vnXG5Ben6pAotfCGW1bV+RMoA7TNiiBOz LZ5Bt4VpuLkiWTNNyPbBZpzFS7mC07YY66iUt4ntDxr4zmYMeeFaYyMJmfO7OwGGhrQfVNyC4 lkXrApzAYEAiafoF13VfXsShBSfVxGkaB78vNj1AeIIhkPJxDuu0MeKuIIZlwKtermZLwDquJ JJfWOZr0QPfuzSphozb8rUSkeLURJg+dTDHqBQAHWV8RlXROs6Uc4wk0VaCJnOuHBs4Nv/qq2 JMk0qMH+ki+GUiuUn2dd4cjztCnMWwEDJUq9WD4V2G7mNU+VguL3s/RlFcocPbzaLy4oAnWAH BzXktzFvdLkwamuBzaMZj5sGK5kUwt0T3JCsjsM5C6GLQaoH3fMrOaRn8/j2pK/NcSA1fwV4k bpXIKOMvcCi+CEg8/Lh6fhmG2W4UYn3WqXL2Ritx428ekkq3ASB/qqv8BXZyqUejRxwR8wK+8 tvQ7GiQiWGDLkGtM6DB+5OHRSSpcbLEav6TXLgzqk6vYmU97rsi+phT0/ORUThJnUSakhi64l 8O3Q9PDEvfpmybNEMxFh7IGsimSWSPaJPSSyFMpDTGT4DCYTrV+Fl1Z7zx7eBxmqMtDHHLc7O y9c+CM/cfIcDM625bmL5cHod5jMN8IpQ6CWe3ToExGFwrgjEunnMYnPaeRKN/TiBoW0qAdN4E FDv8tStNEHrBsCto9MkrDbS4CcmnwwuuROiJplmKT8fZsLVFQQG7xADV/VLP/XDjGMLty7rEK OGgSBrLbO8ygR5k7T4ITj3oSdux6LyBxQt2i6a6jUcNZscNd9q3rO3fxMmBAbyoFeRGfsxmpi RmwjdhcSEHjpgwldZNYKZF1BtAci9WQDZCn9/J07RBt0TqMMtsvbYU4QFtjLShT8+QcSYm9lq FdqkDMgUslYZbrvjAlA07iyb9S8= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-html): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 668788e582..f8edddccc5 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -376,3 +376,25 @@ (define-public tree-sitter-haskell (description "This package provides a Haskell grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-html + (package + (name "tree-sitter-html") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-html") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-html") + (synopsis "Tree-sitter HTML grammar") + (description + "This package provides a HTML grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44827 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 74BB427BBEC; Fri, 25 Nov 2022 01:25:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 D4F8427BBE9 for ; Fri, 25 Nov 2022 01:25:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQv-0005sx-60; Thu, 24 Nov 2022 20:23:13 -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 1oyNQt-0005r1-G9 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQt-0004W4-5h for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQt-0000QH-0k for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 17/32] gnu: Add tree-sitter-java. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23: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.16693393831483 (code B ref 49946); Fri, 25 Nov 2022 01:23:10 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:03 +0000 Received: from localhost ([127.0.0.1]:60830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQl-0000Ni-8j for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:03 -0500 Received: from mout.gmx.net ([212.227.17.21]:56077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ8-0000I6-Dd for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MxUnp-1onpid2xrd-00xu1F; Fri, 25 Nov 2022 02:22:18 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:27 +0000 Message-Id: <20221125012142.22579-18-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:dQ/U66bv2O0TbIKMeUzQSsrqpvgGzyJx6G4sP8fk+QgtHXQChnn glqz6+DR178eNi2NV6YBr+QFP7F82+zyPQN9odwNbJIFkcToBG0U7xKOaBd+8PZw9WlrE53 6CTWss5Hw4/mWT5593hjtM552XPDK2KGnWuzKcGzl/gp4mLalvkD7fIBfhRCBrg92VN9ikm sfwxGb5TcLs0C5n9PhKgA== UI-OutboundReport: notjunk:1;M01:P0:5tcpIF6xfic=;pfTxWanquqazy3HX7g5KBaDutjl 7nJic51ERBh1B/ld+dVC9teEh8BRWoJ/W3QFf5X+uidUtGBhR9bbz57gE7GReKgFl2rq+oJqy 5tsTZHsdCv5i/w+d6LBpQONI6ee7ABHYgyeic1Wdl+dAojN6kmYvNnueivbSSRjn5Fxui10Ny D63qerRpEPnf2XoofCM29kSZsxJAUHw2jlDnz1cwjFhHHOtTHIuHHom5oT/N/VsI1VzptFjMW Gmhld5QC4FhBGGwNDwXk8k98QfP0FcqNaB+dA5Pjr/ZZ8EH5Dj8TfDKzRNPnCJjzR5MeJeS8l VKQJc/pZUOzTZliYR8ii466JLqYtetfl+D+tFGR15O1uE1SiEzr2/6A1srGrCwgMye/Ka6x2A AL3tCGVWlWrD7sfWEiKlbtsjF+a3N2XoGzCvy3FtmRknTBqYl/H5W12deY1b3NMlzt92KGFya 5EUt12SQsSGTooLeHoXNSConajn87S0ZLB+sG/pRUOAj4tk0ljdQP9+TaZzp3wsqvkzjSL0RS pDaq98FRHQoQzYkrYZFWuPzEpEDPVA4wrKxAX2ba5K6clPIVnaMKz4dNlu6r/gWZ6/PZgaGnD djaUsGm8yBTCQnbK1vsu0WmoFzmG4+pzfKpDo9vHoXICQeh6w5KFIFoa9af/uvIEimhTuduOL Lsv7O+DlVS+lL+SPDmN1xUiZ6RVfrxbx7d//q0NhJ2/WzNYT/Sg+SiomNOk2hMndKS4ne6Wo1 ZLGsJ6Q8/Jo4i8YX2x//YR1brgfR9oCFRet+51CLRZJgXdLmj9P2jert/eoeSz7bNGl8Hgp8m L6WM8/cmr07t5X6BVKx6qBaZE2ncbsKrWfHKTKH/UtGiiLRHyfxsL6cxCA+Ov3BeNBd06d9F5 76F53oSPOecjty2/R1W4/kvSswzpKSv9O0BI91qB0tafh3cER46AqDkCoEuFv5Y/Y58l9JEVx 8AJKVR1tQ/sOod1ie5o3JLTOnGQ= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-java): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index f8edddccc5..1782fa8e19 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -398,3 +398,25 @@ (define-public tree-sitter-html (description "This package provides a HTML grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-java + (package + (name "tree-sitter-java") + (version "0.20.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-java") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-java") + (synopsis "Tree-sitter Java grammar") + (description + "This package provides a Java grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44815 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 EE0D327BBED; Fri, 25 Nov 2022 01:24:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 75B1727BBE9 for ; Fri, 25 Nov 2022 01:24:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQw-0005tn-3S; Thu, 24 Nov 2022 20:23:14 -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 1oyNQs-0005pN-Vl for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQs-0004Vh-Mx for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQs-0000Q9-Ge for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 18/32] gnu: Add tree-sitter-javascript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23: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.16693393831473 (code B ref 49946); Fri, 25 Nov 2022 01:23:10 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:03 +0000 Received: from localhost ([127.0.0.1]:60827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQk-0000NU-N9 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:03 -0500 Received: from mout.gmx.net ([212.227.17.21]:49649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ8-0000I8-Ni for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:25 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M4s0t-1p0JEC00T1-001vmF; Fri, 25 Nov 2022 02:22:19 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:28 +0000 Message-Id: <20221125012142.22579-19-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Y8qFSkBPSbaNAlSFwb/yeU6xREZKXQVHS9bvO+hZ66YK5u8bz3x XxjqlWwmjKMUUpcgALSn/dwAoKBU/S1MpMesjHxt6PnUlaBi9k0vOaTz7ZBfXpdjdDPIfSh zmyzSeAgPsnVfoEsDSTfhmhG3iF/TZ8BgBllfRRH1nJcsNOnb/VTNweDF9rTpwkSkIRiq2l Czrbd+30hPfxBaIraH25A== UI-OutboundReport: notjunk:1;M01:P0:RJptrnBiImQ=;N7Y6u3obuxojtwNxYcalWp3uKzM r23P90FAEFzMW0IL77qbdiRvmJ/e1pUjvpENdukInhI3LgIjZSr74OPLh4rj0nuEJulLyBkZY bIQwpqVags1i/dw6lIdoU9CwXufGoS86Rs2RG8XBgFUouFvYlbmaL6ZE9W50Q0MosRnIExnXm 4nqpKbUzVbbiaVrfwddp2p/6HkrBs2LXg9ArzSQXasUR9nGHUM3iqHhnDO1VBF1hK4YKsvjaZ G8ocdDx4dZxeyluLLbImO4UmfkfUnqvBUT2gmmn5YvcKkD1p8BqPIBlBOhbPlHI+nlan3L1WH oPdrXuEGC3lYV+mfwsD2oMIFbkGIH9Z51tCyl3VOVGoC+YkiI02YjL0oCFuVr54HjTrKAFof9 0G8lulD9cJRvyIQrKFkgG2KbdrbScMpKiOd+QXUkzw7ftrV/XpwcCd5HMciLnRBgoMzzmwmFd mcSbz0aKZlCGnbBg/DZt3QAFW6dVMKdcbJ7kA5Yv55bV/1YzENzTUoQvX7kfhEOU9u2goTaBy 23TDiLNDj546s4Tz4G+pR7sTH08lmLn3ROClmQALK7YHclqZ7K1shgEsWUKQTHN+vMkHK5URz ezcFXTAw/c8RznQZ0iuD8pwc9O0YBg+fNujJHNb70hpBWOFFmXKv1gslUl8CVwGYLc3oLexC2 F9oUDbhWBXWLCKcF1xnzFLbueczkC/0HwA7Hcq5OgqfhraXjsSM/WXmqjOjuF2o9os3wCZztw TNYuuFRf9jBfDTotMr/pG0MfO/v6dIf94Ryih8sjNIGqUmgd9o6bQmkypw2h4hvQZncv2eeF0 ToWuy2UT59RGhbtoLdvelPXeJbhhtKVwSIQfPvjsnJFVs3PAsgw+gLpHoFlQaXcjuivBeLF5r 1Sv+ptP65cvlioi3LP2yl8rLTnlbNX52H2A6933mwk53RWLBvgGjNgl2iO7MIrl+CRz/YuZ/1 nu+tMg== 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-javascript): New variable. --- gnu/packages/tree-sitter.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 1782fa8e19..99fdd2de2c 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -420,3 +420,26 @@ (define-public tree-sitter-java (description "This package provides a Java grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-javascript + (package + (name "tree-sitter-javascript") + (version "0.20.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-javascript") + (commit (string-append "rust-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-javascript") + (synopsis "Tree-sitter Javascript grammar") + (description + "This package provides Javascript and JSX grammars for the Tree-sitter +library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44823 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 7CED727BBF0; Fri, 25 Nov 2022 01:25:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 F16E427BBE9 for ; Fri, 25 Nov 2022 01:25:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQu-0005sK-Ry; Thu, 24 Nov 2022 20:23:12 -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 1oyNQt-0005rV-VO for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQt-0004Wt-NC for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQt-0000QU-JV for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 19/32] gnu: Add tree-sitter-json. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:11 +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.16693393841496 (code B ref 49946); Fri, 25 Nov 2022 01:23:11 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:04 +0000 Received: from localhost ([127.0.0.1]:60832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQl-0000Ns-Pf for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:04 -0500 Received: from mout.gmx.net ([212.227.17.21]:53485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ9-0000IA-07 for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:26 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MryTF-1oduec192T-00nxqz; Fri, 25 Nov 2022 02:22:19 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:29 +0000 Message-Id: <20221125012142.22579-20-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:so0ERfkJQTKpMW6UPkaAlwIPcG57d543PUe0/7g3R+EZfQH94e5 CTd6GAc9VvI9+KosHC90TYQeg2A3/HpkYFljYEaWHM9La0SEPHSwOaPA9CX+iintK+DO4TU 78M7TUMmuQPjMgo0YCzcECa+QinGv6om4mYfGe2t1OpMxKCarxJNDjAWUFOwrZW2dnLTiCI eMA9hQ+6cc/0VSunaRH5g== UI-OutboundReport: notjunk:1;M01:P0:Uw172T1TayQ=;AQz7HdrsL02HXfS4do8L1mxJPCl TW+mhGdDLnnPUPjDIC/lqUTVugO+lfHrGd76IEV2ohzHE4Tk7gQhVpqOiVfiHe61NLjSzAcWw U6kBcxdGi1Js7eHG2I9suQcQyZoUzwOvUArmztfbyRocyDFshtd47HZ4SJ3BAFi6FWn81OhTT W6uPhvD33OtgFhRrl9NRGRvEopFVt+JxhFAiZpEO7FGUtMW9/gxdih2xM92A4bKBXImvwM+od YFDGkPm5NOZseKW435V3qjyVXzedxPzMgQyNgYS4u0xjz4YV4HlhC5ylwgo0e4XwDNiYIKR1T Y7vUU415rpNLNgSLBwRxMztchfEdc1Rn6Ldh/dJugVoXf5wO+kcFMayjuYYMm+IkTFre5Hqyb jzMJm6L/00yuGF3wdMvEyq9kzuxapftz7QutFeRgyjvBa3PAxrS9PM7QUuKOR6h2uN2POMpNx dN/6sCpB6CX3ZlJ1XQnP2ZV1PWNuE11JNCidmqWrMCJUwQHK38EtOSrnDzCr9m2uDrUxh13YX RqrO4xAIB11WCeqHrTg169X/HSeeuEf/m0zV2WyPRWiUqk6wS7ftVmSgfDXBbJtnQMBlsIurG DWmxQyBPVaGxSLHduHVQUiKBMVOTIutMBw4MPE/IjN6gUw1Qvx8QR6pnBDzDuPP2pRofHkfZa iHATlhoneeVbVH9fwgUCqVsGrUO5ogr5fWTr8tww5PBQuWrzEIY9aGOTsHCCe48CHKk0bgDDC EdD6ggrcAvC9m96HTb8jLfxyenVzNNuc+NHRcdtK619dC85qc/42dKg72s1dRW/sRWDhIDKTL nAHRYUiJ1/HIOe8XO5dgvT111NTIzuvn0NhTUeSvnVcthoTE3C3GOb2Z+5C7IB8bGH66mGhDA TJq/xG2Tzlved7Cte2lkNrC61GwJhezWw8sGvlRDlbS9TkgBj2vp2mHsqFYUuRpbu9E98IO6d g5GHAjYQQr858CHfXd5+dCpsoyk= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-json): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 99fdd2de2c..df9c8f7f4c 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -443,3 +443,25 @@ (define-public tree-sitter-javascript "This package provides Javascript and JSX grammars for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-json + (package + (name "tree-sitter-json") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-json") + (synopsis "Tree-sitter JSON grammar") + (description + "This package provides a JSON grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21: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: 44829 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 9AD8627BBEC; Fri, 25 Nov 2022 01:28:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 4903027BBE9 for ; Fri, 25 Nov 2022 01:28:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNVi-0001h0-4b; Thu, 24 Nov 2022 20:28:10 -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 1oyNVc-0001ee-Hl for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNVa-0000wS-RD for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNVa-0000ci-Hd for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 20/32] gnu: Add tree-sitter-julia. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:28: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.16693396492300 (code B ref 49946); Fri, 25 Nov 2022 01:28:02 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:29 +0000 Received: from localhost ([127.0.0.1]:60916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV2-0000au-H9 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:28 -0500 Received: from mout.gmx.net ([212.227.17.22]:36079) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV0-0000aE-S0 for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M42nY-1oyNQ406j2-0000He; Fri, 25 Nov 2022 02:22:20 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:30 +0000 Message-Id: <20221125012142.22579-21-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+c4YDZhifCBwX1ccYiMLPKksX16X2g/FlcAO6l0Rcu4kvVRZ9xz 1z+LVrAJGmL2WRyd9PznQlEecO5+BETMGAaML/7KnuoZBhBu42RpbnxdMUqh24MCxrdR65X OasJ4GmmQFT8RGfX0Ffhg1X2pBCXGzMzIFArBNncAG+6hM0/s5wzi5oo1z6FIeviwUwWNHb 9I3Qp1IltOd/GsdQiTynw== UI-OutboundReport: notjunk:1;M01:P0:Fr6V25pJjtU=;f0LsATWpAk7NXumWpWDxErESxwA DPl6JIIrKqMS5N75bBe/5kS0rMqPZPxh6U7FytPXSAX5Oqod7mhPyBel1kIfoPnx+KToFlJ+k uFWzfPHr8JMB2uePzoAFeup0FByMflhe/c43mnBZH1gVkvNW+9ZQKJ0yH8Z2Z8lHncAWDeQbx 6uQ0+/RHBFijjA5OwqJxRORTaU2BjO0zlBm5NFW24t/IXcob5jFc4SsOqVHaSn8hPMQOLCxA0 Onuo8QyTZ3pQmyVuumAezKd9lKbPrZ5OHRXMKfXe1Pgdtk1JhxI73VwysPmQel0ggyNe9+eXL 16ZwjPiKT0b7DAq/VtUC9FUjr8gg4x2Mw1WX1pFFTPG+riz2h1WijXU514fkgKMtwE2jvgrdM lqz17dLu2c7AC/FZs2c8IsHDXgAlbKtoVokaGOnQyQzTM2h2Zwv0mqoTYRHs4TABAwXaZpVIy bEM198AnPS1A7S7UwgSps+z/Mh7I8RQX5vn4A5N+YRKy0fp22DpMz9Wqjshnh7rWD1ON7rWap fFfp96sEA5CzkV6btJRQ3bWPc8jcfKnk3aesyXU5VPldVeWxb3qA9QyYLyKnWhgLsApmdHiyw vNQx7axbjbu5hV8Tox8uKxArb8q7PlG1K3qUXg2OE0LfQD3L+8CSTugHkCr1PFxTxM9LvtZpy 4UYUbvlQ+JXPKDVdGJdQMyfiOZUFnZjDiG7p8uqFolnnOGrpHmuhVUlf4m947J7981DA45E/M EyF0YyBgGhn6QRMSiwTHw+aSLPc5KrN5qu0xhCtyuqRHYiMx66FKj9yECUPCJRCus4Whfa36y IXcFcnAjXJQNJAla6M3PWr2/lg150+phjaUa8kcfans2kZlpIJHyhRXbKMy9rXb5G4OHXUXOX Tthv50oqppKHYAYkpsjSFhIXnZw+W6H/Lxdq8HqqnpRXGSyYIgJPGloW9JyngIC/NTrHmwyyV aeslreJMEfPFmc3mFDrro4sYyMfKvQvm+zqXZVbnaDxQbw08+NLVyd8EHx/lW6RXQqzG/vJhI AsMaQ0QGRZoahYy7cVqeGumqv7XhM5SjObal6G6 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index df9c8f7f4c..0f9f9097a6 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -465,3 +465,25 @@ (define-public tree-sitter-json (description "This package provides a JSON grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-julia + (package + (name "tree-sitter-julia") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-julia") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-julia") + (synopsis "Tree-sitter Julia grammar") + (description + "This package provides a Julia grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44818 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 C9B2127BBE9; Fri, 25 Nov 2022 01:24:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 13B6227BBEC for ; Fri, 25 Nov 2022 01:24:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQx-0005uQ-E3; Thu, 24 Nov 2022 20:23:15 -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 1oyNQu-0005ro-Cq for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQu-0004X3-3b for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQu-0000Qb-0I for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 21/32] gnu: Add tree-sitter-ocaml. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:11 +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.16693393841510 (code B ref 49946); Fri, 25 Nov 2022 01:23:11 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:04 +0000 Received: from localhost ([127.0.0.1]:60835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQm-0000O5-5r for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:04 -0500 Received: from mout.gmx.net ([212.227.17.21]:52401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQA-0000II-2S for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:26 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MUGeB-1pPhqZ1Jfn-00RKi5; Fri, 25 Nov 2022 02:22:20 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:31 +0000 Message-Id: <20221125012142.22579-22-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:4DA7LBY5qR4qz9atJuI9GTcBrUj/hhL+wwFR2jkksNGzBYHMfnk yAJ1g6uP/xhU4+PW3k/h8Rj5K/Xpbv2KqSzjXyam7Ifz6jL084hblUswxsTwDeiU/r0kYoC yuzvdcbPMS8+EhhPRCOWKaGXsMBY5nJ1Ti9y9pcxNAJBRRx4jZ5uOWo4MdrmneQdY1MRcK1 sqUWyTBfcfpdSNrIWk/OA== UI-OutboundReport: notjunk:1;M01:P0:0CgXu1A+Bc4=;fCdjv2ECb+0PqQjUEuYOxSek0jo D+CkxBCXONLaMLhDW5WxDewX11PHRVpDwHTK+YC7bRqekI5oKKuAtW9T0Kab3A0M1NyRsX9tQ X2k/4yX/hmfbZ6ho+UYrUn29NsMP14aTlhvuXchexclgkBBt5uyfTnRKdtJGZsaj2BuUeCc4j W1OLaU+4BN6T+cs6ELgMfckutwvJBbzQnU+FPrOZo49qv87NbM4DivSko4JmQc2v4xc/KWPbr 7ZqTHxOjDMC5stcR5O3dLZj0H6rNiaP7RLLfHXCYid47zn1H/lQIIozvBL01TT8lZtNNUC1sl RFyzOALlyKJnoxHA1lwoMaGm9s5DQIX/JYO8AyuMKgZtT8ZqG0idDURm5/hPGy/2o6yvwWcYk 8FFDUMo6/A+WNf76Ci5Nx7Y9GGee4U4xo7trzUU2YxxdQA/8syRXgjujXHmSj3Qry/807nNVE OjqM56TA8ly7h7LAyJhVmJuDbb6Jyt8rw9yoEtw6YLCe/zKCckpU7vkB4cHo4I8Gnuj6CpTva Em7KcUgfjF3cfHpBKnYXwHJOiasv31se6PQZi+qZo46nIXylBRN7T93x8TAchHBQYLfGrGO+l PvNSYxCkYiAWwbOjaemQZ3h0Urq0gcVo7fnDl8PYSLGC1NoCkVmDGVOFYdc5bOLDoMWJmd7sI K0OljU7/Wmz6WcZUoYp8BGhZ5aFp3lxvNJqYlhNxebOMSAWg2qh1QNbR3v2St/Nk7ZBJIWKXm +AzIODsRaBorg/GhVIn/JJdb5GJOpJdtDImEx1Qu/bukav/fbGiDY0+0uJaiaddYXt4Mf7Kl0 jMItwaww4AXAmhfqGiBW6shRla9TnZxld8VFl/VhBdCBhN83bpCFfeG6oAGfs/pP6/OVdVQAe uEndhcnJJ/+/O9ELGOhdPEdy8epO473Xspgl4YZ1VnVwYQymEtwljo3TUk8X7GjS6aImhvnvK FLSRkdgOIM3+fkeaabdkx/YJz9k= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-ocaml): New variable. --- gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 0f9f9097a6..244eb2e8ec 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -487,3 +487,42 @@ (define-public tree-sitter-julia (description "This package provides a Julia grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-ocaml + (let ((commit "0348562f385bc2bd67ecf181425e1afd6d454192") + (revision "1")) + (package + (name "tree-sitter-ocaml") + (version (git-version "0.19.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-ocaml") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0iqmwcz3c2ai4gyx4xli1rhn6hi6a0f60dn20f8jas9ham9dc2df")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "binding.gyp") + (delete-file-recursively "bindings") + (for-each + (lambda (lang) + (with-directory-excursion lang + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter"))) + '("ocaml" "interface")) + #t)))) + (build-system tree-sitter-build-system) + (arguments + (list + #:grammar-directories '("ocaml" "interface"))) + (home-page "https://github.com/tree-sitter/tree-sitter-ocaml") + (synopsis "Tree-sitter OCaml grammar") + (description + "This package provides a OCaml grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Nov 25 01:21:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44835 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 27B6827BBED; Fri, 25 Nov 2022 01:28:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AE27027BBE9 for ; Fri, 25 Nov 2022 01:28:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNVi-0001gz-4Q; Thu, 24 Nov 2022 20:28:10 -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 1oyNVc-0001eg-IK for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNVb-0000wT-2R for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNVa-0000cp-Ut for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 22/32] gnu: Add tree-sitter-php. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:28: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.16693396492306 (code B ref 49946); Fri, 25 Nov 2022 01:28:02 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:29 +0000 Received: from localhost ([127.0.0.1]:60919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV2-0000b3-Su for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:29 -0500 Received: from mout.gmx.net ([212.227.17.21]:55859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV0-0000aF-UY for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MtfJX-1ol6gt2V9r-00v8g5; Fri, 25 Nov 2022 02:22:20 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:32 +0000 Message-Id: <20221125012142.22579-23-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:/0NBaw696KZx9vR1noXhIAccJ+jzyj6MfQwtlM4S0Rgycp4thPL nzhsjgoxBGZZucQmKqj2iEohlniiuE3EEfzh1EOnUs6SvITFIi65V5+HefOUWrcJwgHrzwh GpLck8F32ht9/7d7q+cr39iPGaa2/hWcXUU/F2px8fTFQeMGyj71DUySD5gKA4dhGM8/0Ia dciAeAoTJUyM4jK867BWA== UI-OutboundReport: notjunk:1;M01:P0:R0hH2jX2if0=;5MnVlgrGeKjDIBCKiuah5CdAGuT RgD8NZ6akj6m/Uuoozie/Yvs3W1UvN6cwN3gAm1ZWa4Mu9MZ6H4DhUWXe9fy4ZHv5ZMEHrU6j 2MTO1H6L9KF8CW45mwhYTLRRFSYCfW/qxR6+TfB5TxTEjIGI4o/OdK0ChygMgfSkiTS+62b4j V6a7luY/NMOoOMgELuDYJT3pUtRl/R+HGkkvpy1DF1s6qd8wDVfNjfA5KUtnO+LhFwM1YJpmn 8sMbK3QAtquDv8GAb0EjqEDJLkn1VH8JETZuRnT8/2GGSaht2GwB9pZI8BX2j1EeSijVMfmNF 61NvpDNWg/EbVPr3bysf4il4e41GKMih8FXpNPyvkbRZ/3dLu/D3rZvzPT/rkk6qLouuCffgz xpZ8L5lB/PwNKIMp9/GqbvjOuFcTCmEbIB3uaaiD/AN5IVYSQUg8gPOnod80h17RNjFRaFUSB X/BW7HAcgAUt4EvZnTpeVja1BP0fOS6qA1N3ApKcg5pDGCct5svahpLri+gx47QWdOALZt9be c8ni1vg0iiK4GYkSOWLDw2qmdNGvJjTPM0IkF0uDuVHz0z4pMOcmg6y9w3SqRDjWycuGAiyo3 L9u6GMbh8aRZKYi1T6mdmqFrHohyj/XP4lTGJQQ4N3Ddv5g3mPFrfQw/WreO4DxPk2LnMCXIC o054D/ozDtDvQQfNwD65KgjgZbwgyuqb4H47zFiDjTvznPSPTrB0JUU/Cx6cA0pZzSt1rXzAJ 2Wto05hT3xsubFX2a2phJypP7cCcSiVDaQjcvoDEJDiHQS4PoMOGtpETDi1r4aorqbwbeDfSp MdxjwRYkiQ7+QCE3ppFU1578ZvzQlg++yWX7cpwxY2ZcHfIlhiaoQu11LS/6VKOTuH8VX0JMV ZH8vtgWGhR57ZhxVMgW8lY/Fv0y+4DAKf/00bCJCJ3lmDjxqUWR+Wt/qjfN4Eavo67EB7Ij4M 55UF1Cke2Kxp9TD7ICU5n2VVvdpcmEmsonQlm0XY15L9joTgym9ozlQxKpvUJTSOo+MU/Qf/r bBXO7HTygtb2G0hEK/wEb7Pvt4mx6M/wBast1/o 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-php): New variable. --- gnu/packages/tree-sitter.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 244eb2e8ec..0a1bd4739a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -526,3 +526,33 @@ (define-public tree-sitter-ocaml (description "This package provides a OCaml grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-php + (let ((commit "435fa00006c0d1515c37fbb4dd6a9de284af75ab") + (revision "1")) + (package + (name "tree-sitter-php") + (version (git-version "0.19.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-php") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter") + #t)))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-php") + (synopsis "Tree-sitter PHP grammar") + (description + "This package provides a PHP grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Nov 25 01:21:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44832 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 2799827BBED; Fri, 25 Nov 2022 01:28:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 BCA0F27BBE9 for ; Fri, 25 Nov 2022 01:28:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNVi-0001hP-DD; Thu, 24 Nov 2022 20:28:10 -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 1oyNVc-0001ef-Hx for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNVb-0000wd-QS for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNVb-0000d4-Md for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 23/32] gnu: Add tree-sitter-python. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:28: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.16693396572335 (code B ref 49946); Fri, 25 Nov 2022 01:28:03 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:37 +0000 Received: from localhost ([127.0.0.1]:60923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNVA-0000bV-H5 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:36 -0500 Received: from mout.gmx.net ([212.227.17.20]:50657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV1-0000aH-9l for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MHXBp-1pBrxd3jN3-00DWxL; Fri, 25 Nov 2022 02:22:21 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:33 +0000 Message-Id: <20221125012142.22579-24-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:skG0HN10l3How/DGEIx6DWxs8+MPuloRmEsp2HOEsJ+ZMYDbIro 7QwzKD6ZFpbWERZLuvtzt1vd8p4IAx+2iIZRDbs8HeOq2hnfuBs7Ug8QNBluOdW4uaKxIoG ZfIAjB1s/28x1TaM5UgegoX07n+0WHQWSfdOyByIoc/tZdSCgqJuKF9NEwrH35TXAx3jwgp imUukFvGN5FSjLZlH8gDQ== UI-OutboundReport: notjunk:1;M01:P0:KHFcRMuqB2U=;RIkEYuUjuXG+6XmWlO4fSk77piM 11M5GKvKyjhsQIoDFXfTt9bH6tRWsiQltjndzMpnhHlgv2/rYBLjdV+Aqb0CLlzfG6qAO1Rzu Ygl5jSIzIy63AZZnVM+YZeErm5CSn0Kp64XLcFcLvUYhwJcTPBagkoqNLcgDOh008KSje/W/C RNfAVTbUIqUuT34YX+7zPbJ0NFq8GLLmqmZ4qkvRuBrUuYmpGrEHDf2ILeH8qyEU3CcjWjCTS 4chJ0aLQLakFRTcwqTphyqO7HWR5ZxqLaCP7klnHx90h7n9lj26Kck0tKyrm5G/EhEjpxLIap xccb6D+A4grFWF5G+kM0ajCdFG7sV8sWWGZc6vyG9EkXhW7ebUuX08+JWswy1PDltKBqjuaZt Oa/APf4t+smnzk7Npllp8x544td9upqVcpKgx0Wh/wL2NQJMAocZRdGJyqYE73QLYzQ258ikW vGmMVKGyf9sj6YDfvKU0BQiClCDQXIBnNRN3wd28U+y1PpGcbAfhAKaKPswKTROJjbzZuB1S9 czzAyE+cyA6CpzCubA7RbWmM5bjzNUixTwOj8gBEupWyzvn0CZt1yAgQTjmBNpMxoSzKifG0e u6FWq4mrCK6naz+pGP19LyYkZBC5prgicrYJleIW8q/ymu8qHHqkTjwwaaMZsUgGGe22YEFXj xWapUkK3Ly+qsDnpU5Hj8ap2WyNKyaZG1JAIQrh+0lPcrKNNhVzyhLqmZ/+U0FPCORctpBoWu Kt4SsOHdPM0ZWB8lxIkmxIrxiP/AocdE5HaqyhQE7fy4n1x+o/2KhWf9ob7eTCPhQxqOsAU0Q TpRXp07oNdk2GcVpqYQU1fHLdg9a/yGIcpLKcBBQ4SbJBenEKdCu2hNjdvt2oXR3qfjBXzDFo h8xNQz0huyz3TBIXepvVmBAQFOMWwnJ3ERltsLpzuxSkFZYYhv9Uk7d5mtFNE/nHKR63PKxZB 0QM3KrBcO/YDzm5d50H5cPGj2zeqolHnk90iVLEGweU8KLhqJjKUfveEr6bVMhAz62jpRsxni M5B3Bcg8rw6t/iyZ8EU8N70zsiWKrICIoY+qN/1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-python): New variable. --- gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 0a1bd4739a..c6256cd427 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -556,3 +556,27 @@ (define-public tree-sitter-php (description "This package provides a PHP grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-python + (let ((commit "ed0fe62e55dc617ed9dec8817ebf771aa7cf3c42") + (revision "1")) + (package + (name "tree-sitter-python") + (version (git-version "0.19.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-python") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wrfpg84mc3pzcrdi6n5fqwijkqr1nj5sqfnayb502krvqpjilal")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-python") + (synopsis "Tree-sitter Python grammar") + (description + "This package provides a Python grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Nov 25 01:21:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44833 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 5BD0127BBEC; Fri, 25 Nov 2022 01:28:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 C468227BBE9 for ; Fri, 25 Nov 2022 01:28:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNVi-0001ge-42; Thu, 24 Nov 2022 20:28:10 -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 1oyNVc-0001ed-Hd for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNVb-0000wc-Dh for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNVb-0000cw-AN for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 24/32] gnu: Add tree-sitter-r. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:28: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.16693396562328 (code B ref 49946); Fri, 25 Nov 2022 01:28:03 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:36 +0000 Received: from localhost ([127.0.0.1]:60921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNVA-0000bS-89 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:36 -0500 Received: from mout.gmx.net ([212.227.17.21]:52297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV1-0000aG-6X for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:27 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MfHAB-1oWiZi0jj1-00gnE5; Fri, 25 Nov 2022 02:22:21 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:34 +0000 Message-Id: <20221125012142.22579-25-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:XwhzzfxF1ozMFfR3/yGekJaY5bCkq6aDpfdnPifn6U2IdnbNXZd BJmSl8BNcalSJWlg352odIGr5ihY3AsHgDEh3SsWTih+9+52KoE8nED/NFfd0A14wxPh+5z 1C5HjOJH50UNa4V2a2IwlgSU7JZgHlwL+h5mW7pQ2gFzFxlzXRUl6+0n36CtEIbhhy9ox9V bm6pWu08QOe+DIa0cVEEA== UI-OutboundReport: notjunk:1;M01:P0:VQJ5I8SaRXY=;pVfZ9EZ6a9hIv3sr3tJDAokvaTC SzEuY5+Rhu0o2uzWeMqmx6eO8sMMbZDMUpXwag0qvje8zjX2hQn9v8lFvZEgcwhBYXxMlatNI HrWYFxy/TSTbqJmKQhGaFWA0kA1f4hwCucT++Vre9XqlRwB9r3Vuh4QuTavU06rErWP9wqFZJ 6dtjuehWlyMI3dJuvu5YhspyAwolY0k5FdFKbmrZjCsbCp0r7WJQf8LqoTMkBPEayAV29AwJZ gUaWbVPvgKmiV9bYD22ntZBnU7Ye+jJdtNILXKD6ZCrzzQbNpfRUBRBLv0xV4FFP8Hy2Okv8B tXdqnbCW0MQVRuW6DoX/xDut9YdPMj48fliIuWU20RzKTsGxKcorkTqHnq+nQzwqQ9zgyac3M 04k4auoG38I7qM10RMghcJbluQbyR1FIMGG6DOjXPBEw0+wyIHCttRBd1qOn2GCP9mIE8k+7Y PeVCC2EkuvudCrbJn6/+/Z/8HHDTzgiJaLN54Vy1a98ZF/rrNoWz/1YfY+GTonuNaI9QI0TF/ 86Tb80WMY557WsDtXdGw8glZ73xwrzENWZZe4NkZhQIR+lPOfYo4nWYFnN2LWTrdXy7hhKDum uiw5TIKEyYLBeGH89QhpzAfcWk95wi0Vmj5cBHpruNbrKCmXT4ookX5B9Sl38ygenwlq3qILd mxddKrxnIxOonQ0emkijMqzKwbm66WFQqna1sQjKxDLgkZBx5Je7ttEjaQ+BBWEmJCL/dbjlq aImcm02DLurxrJwoZMkRyYdCmfeYV5xhd1x2MCad5/MLF+X5Zjg5ga8Yn3MB/RdFfzzhTZMYB IHZgeRddV+p8qByg1B/kw0QLVLhxJvV8VASzX4IFAWZxTuuZlCqUbsBITHHZQsH4w10TEM7FB VGivRRlTIaNMUcmq2zUWl2o1oNh3l1MCuime1PIaW2ZkAAI0e7R2KPN35MoehMzSm6PWAa+zP +CMzNhkC2sKABVoIiklEcsonS7UZu5AAOpPB1xUhxrpYGARgffiVrPskJdZRYDUuX5uhOuygp OQhQDXDa/LnTupwFBIfZ9ssg/uAoAMd1CGtIkM1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-r): New variable. --- gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index c6256cd427..7d00ee209f 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -580,3 +580,27 @@ (define-public tree-sitter-python (description "This package provides a Python grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-r + (let ((commit "80efda55672d1293aa738f956c7ae384ecdc31b4") + (revision "1")) + (package + (name "tree-sitter-r") + (version (git-version "0.0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/r-lib/tree-sitter-r") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/r-lib/tree-sitter-r") + (synopsis "Tree-sitter R grammar") + (description + "This package provides a R grammar for the Tree-sitter library.") + (license license:expat)))) From patchwork Fri Nov 25 01:21:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44814 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 16BCD27BBE9; Fri, 25 Nov 2022 01:24:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 12B0F27BBEE for ; Fri, 25 Nov 2022 01:24:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQy-0005uU-8F; Thu, 24 Nov 2022 20:23:16 -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 1oyNQu-0005sE-PA for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQu-0004XE-G3 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQu-0000Qi-CP for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 25/32] gnu: Add tree-sitter-ruby. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:12 +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.16693393851520 (code B ref 49946); Fri, 25 Nov 2022 01:23:12 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:05 +0000 Received: from localhost ([127.0.0.1]:60838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQm-0000OJ-Na for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:05 -0500 Received: from mout.gmx.net ([212.227.17.22]:38907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQB-0000Ih-8I for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:27 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mq2nK-1od5J91wWI-00n8tA; Fri, 25 Nov 2022 02:22:21 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:35 +0000 Message-Id: <20221125012142.22579-26-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Woo6SPvYVm9E2Al/GF+oEBNLgb/q9paFBe1cvtdUkj6FV25f7o8 qVqZAXdMiB4fpr3h1n4RFKd1oR0d7oAMK+2Gu0us1GSApMfGYPnF0Tv2qp6hveMrdXGgJ0Y sFfhPhi5ZmJd06AlQyvhS2nOE7HLG84VSiraU8Oj0cd7uBuewIpaCcmp5qqmqwFQMdyGW43 aHq05/TULNjmETjJSh7CA== UI-OutboundReport: notjunk:1;M01:P0:fJCqvOyLIUU=;oJsODgW62ux5lCM1L6XqBHpY80W mcOUxREz+g4dyD3u9VzpslyJmL2xvFDMxDQsWD+S/Co16MAsgZbdx/vH0bvBZf5wtlxGMaq71 SOTTqONiVzAPeYfRo1Gqk8sPT+37uTyOrEv71Y/J07802A0c/JmjUVPfQZ8+8zr/PPw+KOTxx RH/YdDrPTEYv3pasoNvWcoYrr8tJKG/wOULIQzFED1xsZDdWQ+dyRIf4gAmzjtTwLDTZPaUSe qo4hVQGGWszIp70+gMDEYVC+yTaziNi6ZtCMzIXMvcKbmCvX+Q6kOhJ4QxAzRukJUE98kq3o9 CfG4v6vMernd/iB6MFlMJqKWUKCW1H5S2uooNbmtOWX5wkVa9QTNfrZeesqvGNKj0ipkt0cOB pnR2IaGoNjPt94HYoynvVy373UD8/UScfafKjhJSquNdCeZ5QqsQbj0ru6ibwMrzC5bjHmADI afn9pdl/e0IvJz4PxRo/Op99m9K9OFfCMKijCTAAVhTNKkINv7Fg+t39dyRgMCYLsR8E6vZY9 TtXKnkSCH4IXXxY9THNffLQ4jG6AAHq2E9AtUlm6+GJCyYUaGcvu0RGw/gqO3aKybzSFJTo00 1t33D99tk66IxRItfuP8D+NK3mgRICKMU+myK9L6sXkCJ6YNMcYFOLtjFlablf1uK8V3kkliA XXIIwSnmpIyT4REH6yLVMOkKrSGDTNDKiwl0If/CJF+mNseUhvSvUgJRmsUxGWGwTQILRyA5/ 2vhyM+ABZGDHnxheDYEOZHco209y1Ib3YTMPq01/Jah3ONCLUGDqlKyecGaOm8rSEOoBsoyyr RdKu6blupP7+oR0AiuqbJoijmTNyb6yEJO46712FOXTlt4h2OU8dbHTg0/xRVaIq4uZmnj9LJ nHWTwHZvJY+qBcUihetqzTwFvObmW/0rnDOjFDzjs1uS7Juhrat7N/LFzoKfbwYCEP0lHXzuN UssQhiHrG+Qu30xoXLGAMBIC+lY= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-ruby): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 7d00ee209f..19e5308818 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -604,3 +604,25 @@ (define-public tree-sitter-r (description "This package provides a R grammar for the Tree-sitter library.") (license license:expat)))) + +(define-public tree-sitter-ruby + (package + (name "tree-sitter-ruby") + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-ruby") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-ruby") + (synopsis "Tree-sitter Ruby grammar") + (description + "This package provides a Ruby grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44831 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 3A11627BBE9; Fri, 25 Nov 2022 01:28:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 36C1027BBED for ; Fri, 25 Nov 2022 01:28:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNVe-0001g4-Dp; Thu, 24 Nov 2022 20:28:06 -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 1oyNVc-0001eh-Iy for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNVc-0000wm-62 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNVc-0000dB-2O for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 26/32] gnu: Add tree-sitter-rust. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:28:04 +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.16693396572342 (code B ref 49946); Fri, 25 Nov 2022 01:28:04 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:37 +0000 Received: from localhost ([127.0.0.1]:60925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNVA-0000bc-Sw for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:37 -0500 Received: from mout.gmx.net ([212.227.17.20]:51459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV1-0000aJ-Pj for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:28 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1McH9Y-1oSby53ApY-00cdxK; Fri, 25 Nov 2022 02:22:21 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:36 +0000 Message-Id: <20221125012142.22579-27-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:BoyxGHhUjr9qw4HWa2xNDGWKQcHiA2OrFi3yI+nAEHIpR1hiskJ XFL2lpNk0b+vxtNwwFR7bxkTjSBK2Yk205189umn1z9Hpzm7s2kOqhsA/t2nWmB+X5zLM2t Qws1nPJcCR7EA3YoidyIBdwFxlj/bNQSk947sgjIMZkcbz+0YJjDMQJkyYAwerSJB5P9MkP Ch63dEaU4jlCH0h+DjIbA== UI-OutboundReport: notjunk:1;M01:P0:xeeAkmEFMYY=;9RHQ0m5aRwHHZ7gGXbabYwLJbX9 0GMT769MvU/kE7qJC7cJgr4LFEACAUng4GzXkDeXwkwzE78Ipj6WXmHij1Df1HeQIyxPA3GHC A2Y2KsbXUQoCM0z/cxACVzksJ3RBhYE6TnCo48vn8g+FshP3s5cubnd+OaHFVjhc+jQgo5tSr teCwQdGAiXwxtYqxUwoQOZdt1yVXkmriW002rtz9FWvbHb1Gs8Qf7vwgvd5TSInDrL89DCIRS JuD0qddkRqWYZimpOnbNCspZz9b2kD68tuYaU+Jy4YJE+xkGcLoNpRdJ1TUlbJFLPqlINV06H rb9p5yRGh2hIREx7bTgaZdBaamJwmgdkNbpWgmkJPNwj6IbYt6wnGAFhiH+0CgaA2DzdkKabW RJZMR76XzV22GB4r68iYbHpdPEGv2DY2UWbzvCXz0+fkRbwhWJB/b1UEjijOGJ7vJPqi8jkw8 /cwBy5pGtw10waIQRkwXK4edenFhQZYkjERg9vEUSkvTGvCr1vzKZDX0dv2F6kMihbqliVH0y 9YBxImnwz75VSG6YHcUJDx9ur35Eg0KjyOypuF0AocX/fGRN7Gcj9XUTXjOiIpc3zmD98blev Je6REJU1X6tJzJ45Ok756pWerpO7NE9v0ctEhnMYNCeC2/IWSso3VbfjAMzFUhlC//uiMTDlp KBHptyhTh3V7GlCA9PoyJB5gyIK1KDxkMfOG77a+L32N3Tn1fcb/pT/3KPLzTvy2shtvzPdqo AundDi75otCqXjirxSCLnyXxF2pQ4io30rNQvXbpHlAIZrw20k7uYNyMG/PxaHsIqKfBA5d+4 MvrATbASV1Ln+NuDMsKA4sInAOxBIiPO1q9kJ50ZPe8MSNjKnjhfW6NzciGglf8jqLfw4bC97 5Vm5GbKESiX5xS5jTjwV+lTQ6vhVXXQ1JZqOGcLsbdTwV2W4DY2jOCWTYeFS3+DEvuBIRMpOq jMUNHWG4WM/J0K4DgTf6JAoO1APZzDikj/3cW8/BwJIfo3Uq8W++668UyX6nuYfcKrb2NrEAu AAg/IqCW+eh4kmd/FK6Y7MG80FlT5GuxaLjB0Yb 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 19e5308818..54f2affff2 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -626,3 +626,25 @@ (define-public tree-sitter-ruby (description "This package provides a Ruby grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-rust + (package + (name "tree-sitter-rust") + (version "0.20.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-rust") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg")) + (modules '((guix build utils))) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (home-page "https://github.com/tree-sitter/tree-sitter-rust") + (synopsis "Tree-sitter Rust grammar") + (description + "This package provides a Rust grammar for the Tree-sitter library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44834 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 89D1127BBEC; Fri, 25 Nov 2022 01:28:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 A60F327BBE9 for ; Fri, 25 Nov 2022 01:28:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNVi-0001hi-PJ; Thu, 24 Nov 2022 20:28:10 -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 1oyNVg-0001gT-E1 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNVc-0000xF-Hu for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNVc-0000dI-En for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 27/32] gnu: Add tree-sitter-typescript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:28:04 +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.16693396572350 (code B ref 49946); Fri, 25 Nov 2022 01:28:04 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:37 +0000 Received: from localhost ([127.0.0.1]:60927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNVB-0000bj-8U for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:37 -0500 Received: from mout.gmx.net ([212.227.17.22]:38689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV2-0000aK-2x for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:28 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MvK0X-1ohG8t0F29-00rHap; Fri, 25 Nov 2022 02:22:22 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:37 +0000 Message-Id: <20221125012142.22579-28-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+Gipa/kwImVmKjue4qVtMbd25NS52f65C+QzfZDc94QomBJ1ElT FXSwclFS4zmwzedR97g+qN8cIPAkzbukO0aPw2IM7H+UG9lHWk+hF7G5b2nFO+i13FSi2ao Sq+si7i5nQFb0Jj82e2daRRNGjopQNud+Fn5paCAjpYZthbVWJz1t76ImRvOQtxN5b9LWAF sB6xHx2e1BHhy5X0DvPJA== UI-OutboundReport: notjunk:1;M01:P0:H3iKbdBtrkc=;O0j9kN0Q6yN7da5di8yVcPijRTL xMA2eF4WcpjZQkpkiZVfKzEY8GnKfXTO042d8D+pEcE1QpaiKYcv2F066wzLmy2B+aV7Up9zr fAKKk8lg+7/5o9Atx5VfAW4xHwMygxVPsSQPk75ZEvDe2BmHrFC9VuiRtecpntuoJUzlX3PDo 8HQE5Z/TK4wQLT6OrY/tUN0IOuuyfwK++X21xJTgFug13HsbCJ3G0c401UOLQymqJRs6nIn+3 K6Gkuy+yZqu2Cpo7gd3IrCes6vhVPC8BxamMjQBS8Ptiy4LbOGX1W8AWJbYqIlliQ8sII89Yw aBoiobDJmHALpb2Bt2mFqty58EGQk7j12l6TZ2tL1p1fLEE0fyxmTho0mpXlD70SBMev50kWD Um2iG0c9XE7KyTlUsQPGJl/lcjKRE5sQz5M7Ef86wffQL/4oZE3xZCnkdmcSk4Dr6lXfTBXMa gWhXqNs6AD2QWh8cRSW9MXTCk4PPsSfW0+whf/8T8oeNL43jWr2F3FN06XzguZLFiwVz5mqFc B4tV3XYXehq+yoTBoW1GeSE5jVC/y9OV2LpSCC1wYtwXCr/toU8SPvuRPqPTmEy+6xYJV0Slr RcUmt4IB8oR0Sg6Vy7U1lwslqgGIpT2qnbH4p/c3KW0z7bfqHciBdd2asF7WkmcEwE+LNtfqc Uls0k18ZRRFYkun+PQVu9LM05G9mD4WFY+DVQOkac9ErXK0J7t+IceUNf9YrO7HA1pjAp4rch ls358FS/6I6OsoxafC9LVsqQ9Bf8xgEq/NpUnpo4sDODCjyDdanl5a9T02KHYNZEPBziBjHwn WCRy6N+wQkB5jFqdvJhUVaNBmOAq/CRyNFwrZ4wIOnG4FtdgGNEciFwcybrGL61Rdqu78qz6i EmxEU8/UuHY4fpXLYdhkQ7uulm+06TS6x1WMaJcAG53iWRu2CdQpw06w03SguKsWveXZv2oKp wUdRSR8f/zgbLcBWj1VV2NDd7EU= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable. --- gnu/packages/tree-sitter.scm | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 54f2affff2..7cf9a41105 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -648,3 +648,41 @@ (define-public tree-sitter-rust (description "This package provides a Rust grammar for the Tree-sitter library.") (license license:expat))) + +(define-public tree-sitter-typescript + (package + (name "tree-sitter-typescript") + (version "0.20.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-typescript") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "binding.gyp") + (delete-file-recursively "bindings") + (for-each + (lambda (lang) + (with-directory-excursion lang + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter"))) + '("typescript" "tsx")) + #t)))) + (build-system tree-sitter-build-system) + (inputs (list tree-sitter-javascript)) + (arguments + (list + #:grammar-directories '("typescript" "tsx"))) + (home-page "https://github.com/tree-sitter/tree-sitter-typescript") + (synopsis "Tree-sitter Typescript grammar") + (description + "This package provides Typescript and TSX grammars for the Tree-sitter +library.") + (license license:expat))) From patchwork Fri Nov 25 01:21:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44816 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 13D3927BBEE; Fri, 25 Nov 2022 01:24:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 AE39F27BBE9 for ; Fri, 25 Nov 2022 01:24:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQw-0005uG-Fv; Thu, 24 Nov 2022 20:23:14 -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 1oyNQv-0005sw-4Y for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQu-0004Xc-S3 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQu-0000Qq-OT for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 28/32] gnu: Add rust-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:12 +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.16693393851533 (code B ref 49946); Fri, 25 Nov 2022 01:23:12 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:05 +0000 Received: from localhost ([127.0.0.1]:60840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQn-0000OT-2d for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:05 -0500 Received: from mout.gmx.net ([212.227.17.21]:41133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQC-0000J0-4t for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:28 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MCKFu-1p7lM41SiI-009ODc; Fri, 25 Nov 2022 02:22:22 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:38 +0000 Message-Id: <20221125012142.22579-29-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:K6NNQKSI5eb1L3RyajbjxzZs47J4EpkU81GvhyJhHQ8Z32QnulZ KonoZMR6P0JqLk6vk5xfFtoYfelS8NMEJsVWWecqihANM8t6mGbFJNj4//NjQ/3mUtMAAGI +sxUpR/9CpxyvYQSmIh3YJRfNgJpZnRSuUux7HFqrz+Vj8wYg1gDrWuJL5WCaMlUZgmMOTa pO2BvIlX0+vCjvke3kxuA== UI-OutboundReport: notjunk:1;M01:P0:e+W+fSq/AQE=;XT5CdQvKGq1Lv+9ipugbDBAfJ9W kdsH3dUoDNEf4FCPgD3ju/0OmovNYHBOhVZ8BRPevfQmZbLu7vCKHJwx94PWpn5TCXOJl/p9e yOlxWLrMN/iVL8Ixzc3rSfFO+k80M7Nf/Bh7hi9o2WR5sEvKamK2VsLZEskSH3T/8jfOE9khx MBT2Qau0VyCxs0sEoaQSvh3/vysoHXlbas7b3pLMNAu83eFx8kXjKzuTDsxe+IA6iG10exxNW 4Loe1ezd5Ihbh92zHy6D/oNJhY5mkCUvnl/i8LUAbxiWWbq9+62/qcHDp500DLCekbMGLVKWf d7zsmM/DsbZNOmMuYOee5BMpjA4KSlhGu38oOjCMxwrZmsD7i4meR5NgnYT9Vwq/uFXaz9g4t 6gQtvQcRjUnjVyXfabfE/D3wAf1/M9FBgkdvlFuo4ydabK8AL4rc1scoyXO5WFZ+pqdlsmn9K F5S4bAQbB77QLC+NOa/HDv6jPmsL/VhmSMsCLR8aSRFQZ9lCnTyLlbOxuwDFcSGesCLzDudIO BLFC3zWKWHK5cBGd4XWYKR01jGFyha6w3CBjhn9S4T/0cxxufxVDLy00LtVejY+j6+R+x6GC6 x8kurwijyZ0GIxZhIXBnJSqn3Gg+Qvnx3i1XYCjpA87vmlfu66kA2a29Ev2S80LNppw+v+hQ7 rRFpsUM69jL+qLqwU9g+WcEY3p4LtUljNBKAzfHgZadhmE1abBA80Un48nBDIgumF8xKQVwy4 UdGrRZ1rtTPvAcqYbXoDi6OAqBarLlNm7sJZ6uF3Oqmya7GdoGy2DcWjFURsh2A7W4+QW+Mjt u4AJmogbfmKPisl5Uboki88uqnelISLXxmSVtL6PlCs0kskP5pPZBnL0W6g1nIc1cr8DBjDUl POjhfsNKys22Una/CrOcjp1Hg1DdpD6ZkHy7RF1j2b7pkkHS/7t46lcThHOvlOH9ACyZt5Nbu MqKFkBrMHEvhHcWsfgLkbTFr5Wk= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (rust-tree-sitter): New variable. --- gnu/packages/tree-sitter.scm | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 7cf9a41105..ca92fccfd6 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) @@ -158,6 +159,43 @@ (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.7") + (source (origin + (method url-fetch) + (uri (crate-uri "tree-sitter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "183niy9malzr4dm81swcgl05xkwqamim6ck0gw5xb6k78nprz6jl")) + (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)))) + (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") From patchwork Fri Nov 25 01:21:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44830 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 44FFF27BBF0; Fri, 25 Nov 2022 01:28:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 24D3327BBE9 for ; Fri, 25 Nov 2022 01:28:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNVl-0001ip-NI; Thu, 24 Nov 2022 20:28:13 -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 1oyNVg-0001gU-EL for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNVc-0000xI-Uq for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNVc-0000dQ-Qn for guix-patches@gnu.org; Thu, 24 Nov 2022 20:28:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 29/32] gnu: Add rust-tree-sitter-for-emacs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:28:04 +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.16693396582357 (code B ref 49946); Fri, 25 Nov 2022 01:28:04 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:27:38 +0000 Received: from localhost ([127.0.0.1]:60929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNVB-0000bq-JX for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:38 -0500 Received: from mout.gmx.net ([212.227.17.21]:53197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNV2-0000aM-L1 for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:27:29 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MKKUp-1pKASX2f31-00LnrN; Fri, 25 Nov 2022 02:22:22 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:39 +0000 Message-Id: <20221125012142.22579-30-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:zBgujInTmLA9ug+YTlRRIQylsNSC9dZtPVBF5yjWvNK/3rfv9DT R8Y70PZ+U2VALYTo8693E2PTsIxdzkHxlPSulwTVvRSMYSAG7o91p288cVCJutT4UGfuyFh /q5zdRb5eECkYHJkwxo1iH+org3HEg/nVlAB2UGikiD4mTOUyF5tkI/g6khGrPU2WiVOa9f kfx54rfao1Z6zl6Yg6t3Q== UI-OutboundReport: notjunk:1;M01:P0:FrsdyuFZGp0=;/wkQBefdqTA7Z+tR/pcG6V3FQG9 ub5ufYD3gGna9dPjkHlg/k6UAH2H12YQhrottgAUrKbz/BDsWRxP3GcooM1uzEea++/ulxVnB FDukqN+voIoZAcqGiVENQmaryk17+Qn1xwlvvClc7+RWlaMNvkX9XY5pEfBcRBZaJOzLOc/SF mshOmjLA8O5ie/yjAtWYfPKO1E1pzzfl1+fTn48ndIN9KQQVQiSWh6x94jV9yVPrlvTfrL1Za UPqIGvNhymngICvA8pXsPHIRwIMjM/qvoo3xuQYexhm+LsXLZkf8d+j07W/JMvlAWTWPkAIR9 DyyR3q19xXMbx9nzfLIturqoNtxDcc+KpwnIggt/1xutseXt3DqLS3QxV4lkMb3Wq/hjCNW4f 8ZCuUcbQxicUqajJytsQUhOuACcXYbY28NGCHCTvptnMdZwMxSVLvoGVLAGaMuiSuVBBkV8JC +oa4OKvJSQ0/cpbSNvxKKDoJB3WOt3IxMHL9qLxNYWlczk97+9/+QPMFrzZtdkscvl9Sprv+p TLrcObovbdrZqahXnQvIG1TZOtLANsUVNdjklF5bUfYmFdx5kEM+Y+ODqIDqssznHprUevOeN MyJJJzRkke/SYYIO90/+KjByNGRqRWJSEY0E7lhY/GPtuXnHOozQbFqGIcn5k4MA762T04gZN srUvBXW54SKMYj/Q/0EbDIGwu7toQe161P55WcwukdICSpnSlJv60g5OekZC73XrHqxha5HVQ TmKCfLsNsYxmfLS4r3zPhgLDvP0WJKMZauvInxier2CLFMRqVpbFdBrVyBR1yR4PET5Ir2lRY ZOaz4K0TmVNWtd2Lpk/5aue5TNnWujcrVZyCQ+68SX+cF64n84sPAiqwg6QfkzHWXVMJL2qm2 FmZOrtwLmF7DP8xlr9sDSIi2aScj0Z5q4uN4cg6lKbyKiuZ+TbVpKrXOw2MZyvEYGO0Hhk4a8 +fS5jbjQfgvN/ANJ43C1f9Ba3MU= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (rust-tree-sitter-for-emacs): New variable. * gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../rust-tree-sitter-text-provider-fix.patch | 98 +++++++++++++++++++ gnu/packages/tree-sitter.scm | 14 +++ 3 files changed, 113 insertions(+) create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7d11f4bb27..961d90bee9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1832,6 +1832,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ + %D%/packages/patches/rust-tree-sitter-text-provider-fix.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ diff --git a/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch new file mode 100644 index 0000000000..215e7fc18b --- /dev/null +++ b/gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch @@ -0,0 +1,98 @@ +From e3576b180488b8231e1fc0ca130748577579d129 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tu=E1=BA=A5n-Anh=20Nguy=E1=BB=85n?= +Date: Sun, 25 Jul 2021 13:11:52 +0700 +Subject: [PATCH] Allow TextProvider's iterators to generate owned text + +--- + binding_rust/lib.rs | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +diff --git a/lib/binding_rust/lib.rs b/lib/binding_rust/lib.rs +index e88a411c..cf214d92 100644 +--- a/binding_rust/lib.rs ++++ b/binding_rust/lib.rs +@@ -5,6 +5,7 @@ mod util; + use std::os::unix::io::AsRawFd; + + use std::{ ++ borrow::Cow, + char, error, + ffi::CStr, + fmt, hash, iter, +@@ -183,7 +184,8 @@ pub struct QueryCaptures<'a, 'tree: 'a, T: TextProvider<'a>> { + } + + pub trait TextProvider<'a> { +- type I: Iterator + 'a; ++ type I: Iterator>; ++ + fn text(&mut self, node: Node) -> Self::I; + } + +@@ -1840,19 +1842,19 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> { + buffer2: &mut Vec, + text_provider: &mut impl TextProvider<'a>, + ) -> bool { +- fn get_text<'a, 'b: 'a, I: Iterator>( ++ fn get_text<'a, 'b: 'a, I: Iterator>>( + buffer: &'a mut Vec, + mut chunks: I, +- ) -> &'a [u8] { +- let first_chunk = chunks.next().unwrap_or(&[]); ++ ) -> Cow<'a, [u8]> { ++ let first_chunk = chunks.next().unwrap_or(Cow::Owned(vec![0u8; 0])); + if let Some(next_chunk) = chunks.next() { + buffer.clear(); +- buffer.extend_from_slice(first_chunk); +- buffer.extend_from_slice(next_chunk); ++ buffer.extend_from_slice(&first_chunk); ++ buffer.extend_from_slice(&next_chunk); + for chunk in chunks { +- buffer.extend_from_slice(chunk); ++ buffer.extend_from_slice(&chunk); + } +- buffer.as_slice() ++ Cow::Borrowed(buffer.as_slice()) + } else { + first_chunk + } +@@ -1888,7 +1890,7 @@ impl<'a, 'tree> QueryMatch<'a, 'tree> { + match node { + Some(node) => { + let text = get_text(buffer1, text_provider.text(node)); +- r.is_match(text) == *is_positive ++ r.is_match(&text) == *is_positive + } + None => true, + } +@@ -2002,23 +2004,24 @@ impl<'cursor, 'tree> fmt::Debug for QueryMatch<'cursor, 'tree> { + } + } + +-impl<'a, F, I> TextProvider<'a> for F ++impl<'a, F, I, T> TextProvider<'a> for F + where + F: FnMut(Node) -> I, +- I: Iterator + 'a, ++ T: Into>, ++ I: Iterator, + { +- type I = I; ++ type I = iter::Map Cow<'a, [u8]>>; + + fn text(&mut self, node: Node) -> Self::I { +- (self)(node) ++ (self)(node).map(T::into) + } + } + + impl<'a> TextProvider<'a> for &'a [u8] { +- type I = iter::Once<&'a [u8]>; ++ type I = iter::Once>; + + fn text(&mut self, node: Node) -> Self::I { +- iter::once(&self[node.byte_range()]) ++ iter::once(Cow::Borrowed(&self[node.byte_range()])) + } + } + diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index ca92fccfd6..d0214f3a12 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -27,6 +27,7 @@ (define-module (gnu packages tree-sitter) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-io) #:use-module (gnu packages icu4c)) @@ -196,6 +197,19 @@ (define-public rust-tree-sitter parsing library.") (license license:expat))) +;; We need to apply a patch in order to compile the rust bindings against the +;; emacs tree-sitter module. +;; See https://github.com/tree-sitter/tree-sitter/pull/1294 +(define-public rust-tree-sitter-for-emacs + (package (inherit rust-tree-sitter) + (source (origin + (inherit (package-source rust-tree-sitter)) + (patches (search-patches + "rust-tree-sitter-text-provider-fix.patch")))) + ;; Do not show this package in the UI as it's only meant to be used for + ;; emacs's tree-sitter module. + (properties '((hidden? . #t))))) + (define tree-sitter-delete-generated-files '(begin (delete-file "binding.gyp") From patchwork Fri Nov 25 01:21:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44824 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 C8C6A27BBE9; Fri, 25 Nov 2022 01:25:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 1F8D627BBED for ; Fri, 25 Nov 2022 01:25:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNRp-0006Vr-Gz; Thu, 24 Nov 2022 20:24:09 -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 1oyNRi-0006Pr-2l for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNRh-0004ra-P0 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNRh-0000T7-Ky for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 30/32] gnu: Add emacs-tree-sitter-core. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:24:01 +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.16693394001709 (code B ref 49946); Fri, 25 Nov 2022 01:24:01 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:20 +0000 Received: from localhost ([127.0.0.1]:60843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQn-0000Og-HC for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:19 -0500 Received: from mout.gmx.net ([212.227.17.21]:36519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQC-0000J8-Mj for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MgvrB-1oXGnz3sab-00hKvL; Fri, 25 Nov 2022 02:22:23 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:40 +0000 Message-Id: <20221125012142.22579-31-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:x8pVT2+hWSLK/mhBNyh7pRAHPPLydmVXoppjZNZz9mi6102CPGt UqMyP8Ab2uSY3MyGYYR2lcLfPuhWA5uatiQ8PFnpfmcpjspjLSblVtjeKH0LGMXoS2WKUgI i/nO51ukAMnDJjj7wLCvFtaTC9MwsSCvZb38rtcLdSvp0s7aooBOcemj6IKr+6+EgOJFM1Z JQIis66LmiaasRz51MgLw== UI-OutboundReport: notjunk:1;M01:P0:0ltnzgdeZ1U=;cr/1f5gPWTqPwNSWiuysMPZFHqp EI6DXRbIzfuIuuK1mgGtRsC4MEUSMDc45Y7yHaxJ4z+odrxyAF7zPXRqGJYqrGaaEhZCBAgtC MzUdUp7sE3rbihvktstEbyO3gULtMbMUeIScdtL8Zmat6vpcxKroN3/l8r+a4XdqB2n7UCseC ueEBzjDX8YdT2oJgvwYDUq/s2Un+1urIHiG9WtdyzpZ/3PfADFxUd928EhJYve2uq2r4Vcgre mMbzkkb86mMBBYO5AGEeKWCx4j+QddiEAqZ5V/i14iQTJFfv8uLPobRDNInXCyU+ydlC/q4WG v97FvL+NZV2XFMvXQIHTHcF0UBC4FSb1Ou2iAzWkO1znzlLRUTCSmwtGzeBB3Dz2Y/I8ZtL66 ePhdLlSlI1+LU8DqHz4ASS8zsCwqZr8Jndz8Fhlz1eqQwgELPsKYG9D+0cgKq7O3r0sI3Uupk u9fIqlGKERzrR06MRudl7ZOfLrKqEMiXdfUqw2CUzaZqDx9niM3CSVs1r9Gacid8ln2QJQVnQ 8820btCeJxr4cuBqtYnm3p5pPSA+Xmfpt6y2DB+gIeow2Yrg+TSSPqf3Ja1tVhvaKXXR4j5Ws tyI/GW4abJAnv5aO8xVVdNuPki4JQT1cg6NUYOWhXrjnxTQ8p62PuFt5pXN+PkGYHUYKJS9Mb EaHUGMNHudozDIvL5N71zLNpZ5OsvO30kmq8KV1eZamFQHwNEsL+tPpm6n5Jx8znOseV8OeAH VxkN3n6ns9GwLBXLaqjW3491r1cnMFY7e7CkfASsrJMrDbYT36T7l521iEn/hQqpA13v9AHHA JOWJZ4xK5LqBDq4V4+kK9/NtcJ/ijmJ7b0ntrRe7hKZGgCh8dy4rG+NCRDHDUlEQaXAUli0ZS IRjYcjNCYUVEqmQxae7Bq2roWtbjwSM9mdSB9g9RpSUHx+ilxonKARokb9Ox1r8ImAzQM5JE9 HydI/Zf/jYBPZHOrLvGpAlb0IUE= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local variable. (emacs-tree-sitter-core): New variable. --- gnu/packages/tree-sitter.scm | 84 ++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d0214f3a12..d23fa2fbd8 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -21,6 +21,7 @@ (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 emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system tree-sitter) #:use-module (guix download) @@ -738,3 +739,86 @@ (define-public tree-sitter-typescript "This package provides Typescript and TSX grammars for the Tree-sitter library.") (license license:expat))) + +;; Local package definition solely for building the native emacs module +;; written in Rust. +(define tree-sitter-emacs-module + (package + (name "tree-sitter-emacs-module") + (version "0.18.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-tree-sitter/elisp-tree-sitter") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif")))) + (build-system cargo-build-system) + (inputs + (list tree-sitter)) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-emacs" ,rust-emacs-0.18) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-tree-sitter" ,rust-tree-sitter-for-emacs)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "core"))) + (add-after 'chdir 'delete-cargo.lock + (lambda _ (delete-file "Cargo.lock"))) + (add-after 'delete-cargo.lock 'do-not-fetch-from-github + (lambda _ + (substitute* "Cargo.toml" + (("\\[patch.*") "") + (("git = .*") "")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (mkdir-p lib) + (copy-file "target/release/libtsc_dyn.so" + (string-append lib "/tsc-dyn.so")))))))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:expat))) + +(define-public emacs-tree-sitter-core + (package + (name "emacs-tree-sitter-core") + (version (package-version tree-sitter-emacs-module)) + (source (package-source tree-sitter-emacs-module)) + (build-system emacs-build-system) + (native-inputs + (list tree-sitter-emacs-module)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "core"))) + (add-before 'install 'find-tsc-dyn + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((elpa (elpa-directory (assoc-ref outputs "out"))) + (module (search-input-file inputs "/lib/tsc-dyn.so"))) + ;; Install the tsc-dyn module in site-lisp and the current + ;; directory for test to pass. + (install-file module elpa) + (copy-file module "tsc-dyn.so") + ;; We replace the tsc-dyn-get.el file with an empty stub to + ;; prevent the code from downloading the module. + (call-with-output-file "tsc-dyn-get.el" + (lambda (port) + (for-each + (lambda (sexp) (write sexp port)) + '((defun tsc-dyn-get-ensure (requested) + nil) + (provide 'tsc-dyn-get))))))))))) + (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter") + (synopsis "Tree-sitter bindings for Emacs Lisp, core library") + (description "This package provides core APIs of the Emacs binding for +Tree-sitter, an incremental parsing system.") + (license license:expat))) From patchwork Fri Nov 25 01:21:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44826 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 22DF527BBED; Fri, 25 Nov 2022 01:25:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 8F3E727BBE9 for ; Fri, 25 Nov 2022 01:25:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNRm-0006TI-4E; Thu, 24 Nov 2022 20:24:06 -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 1oyNRi-0006Pv-CY for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNRi-0004rh-4M for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNRi-0000TE-04 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 31/32] gnu: Add emacs-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:24:01 +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.16693394001717 (code B ref 49946); Fri, 25 Nov 2022 01:24:01 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:20 +0000 Received: from localhost ([127.0.0.1]:60864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNR1-0000RW-Sw for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:20 -0500 Received: from mout.gmx.net ([212.227.17.22]:43603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQD-0000JP-2f for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:29 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MrhUK-1oddXP0rn2-00ngaQ; Fri, 25 Nov 2022 02:22:23 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:41 +0000 Message-Id: <20221125012142.22579-32-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:y7VTlc8b3jD51j/jWYxWbsWj0aADfNLnTU4mxovNEvXr2Kw5G8b djvucw49A2aovGuX5/UfGcVIywbzSYZbNM0uFXLPwCQTItaj7HOKQKiY32hvK168c/lN1BT APbIJwyBnfGaZ5X/ofNlC0j3lZEttGE3ehausgSUlEYFOdDJbE8GVb5G7pJ+mPKShkbL298 FRDOxEDK2IZf3y4nLbbtw== UI-OutboundReport: notjunk:1;M01:P0:B186MvRsH1Y=;Kez2k1vDn5FvXmuR3d0nun0O9+5 HrWKXgxYg2Oqj0YoEGRO5zJDLjklnS50LEkfeUt3h5kuM5wsAJlG3n+QDrPZlQRIdTZ11SHlA mePliaHJATG8J7vmJAfJbECVgzvaLOrXl/DTFT1mMGfsiJUPkN0Or5N9B6YKA+aQmRaaqtq4r OKq2828XwXtGtapZUXy0OcnPxCj2F3WmbSKtOzJDtaeZAviOxlVTMyD/Y7gScAxAM9rlDyRY7 /oFbjhJs6Czogm4BmgwfjFdazRrHseOANWIb2PFI0slrLpr15C3LRpI2vxviAPPs/RFFxYFae VpWxa9SpUy63XSvmzZxtyX7tIWxz46nw7ULLHzmxLFu674dimiXQWIsRKp4IEAeRPrOKsrnQX NZr8Q4UvhxT6vpuQLZp4NdPWep23s3b7+ufiOoex7ziKQQenl49JZ6BbsacgzOSr0Ty2uwLx1 3JfS5mVAaeNYdxSAokYoB6JIv/2j32GhWy0fqTrAcFwzLux3vxbk+5Ro2CcfqebFwPyAuXqJL u0cyzQsC97UCaY7cLVmp92YDvEizkOjsSlTG5iasx9kpbl9aMeg0ggASg4gU6zeEBw4gWLtFi R7AudGfr+i8kOimN5MJ8ZQxTueORChOtB00ij2RfIeURdDvy8GS0phSTInIXPD4qkmJz2dhRh PKqe6JnCj6a6vHIRWmUdgiFPG2FBIxsPnBiL0tVJN9gw+DWf13ekqq1m8t4qj/GSlctpNS4vX hSNBppJcTjuHcRkSvoJFR922kh6GReCgjGwAhVGS/ggEwNVoRSFnfKSPFxPtGN5ozDDYyA/D+ L+O5B+nguVnsXZ9RjyYqNCLJ7HNSqzQpuIzWKs7awTPIvO8ly2sSrzX+qFXtXJy735UR0yjcF wkpLo3Q4aj+fhAkdWLT2DWvCtTmh1xoW1h68mdynPzw8JjWsikY+rhjaiPAE+KTkgfVW5FYnN z56qInkNbPHiE1ySkx/geUELOUc= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (emacs-tree-sitter): New variable. --- gnu/packages/tree-sitter.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d23fa2fbd8..26b0206575 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -822,3 +822,30 @@ (module (search-input-file inputs "/lib/tsc-dyn.so"))) (description "This package provides core APIs of the Emacs binding for Tree-sitter, an incremental parsing system.") (license license:expat))) + +(define-public emacs-tree-sitter + (package + (name "emacs-tree-sitter") + (version (package-version emacs-tree-sitter-core)) + (source (package-source emacs-tree-sitter-core)) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-tree-sitter-core)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) + (home-page "https://github.com/emacs-tree-sitter/elisp-tree-sitter") + (synopsis "Tree-sitter bindings for Emacs Lisp") + (description "This package provides Emacs bindings for Tree-sitter, an +incremental parsing library. It aims to be the foundation for a new breed of +Emacs packages that understand code structurally. For example: + +@enumerate +@item Faster, fine-grained code highlighting. +@item More flexible code folding. +@item Structural editing (like Paredit, or even better) for non-Lisp code. +@item More informative indexing for imenu. +@end enumerate") + (license license:expat))) From patchwork Fri Nov 25 01:21:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 44819 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 0A7AF27BBEC; Fri, 25 Nov 2022 01:24:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 ECCE227BBE9 for ; Fri, 25 Nov 2022 01:24:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNRl-0006Sc-Q7; Thu, 24 Nov 2022 20:24:05 -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 1oyNRi-0006Pw-OV for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNRi-0004s1-Fo for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNRi-0000TL-Bw for guix-patches@gnu.org; Thu, 24 Nov 2022 20:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 32/32] gnu: Add emacs-tree-sitter-langs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:24: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.16693394001724 (code B ref 49946); Fri, 25 Nov 2022 01:24:02 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:23:20 +0000 Received: from localhost ([127.0.0.1]:60866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNR2-0000Re-6k for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:23:20 -0500 Received: from mout.gmx.net ([212.227.17.22]:33115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQD-0000JQ-AL for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:30 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MJmGP-1pIVle279F-00K9hX; Fri, 25 Nov 2022 02:22:23 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:42 +0000 Message-Id: <20221125012142.22579-33-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125012142.22579-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:p2PnVRh5JbdrOAQug2c77p9QgdAqNsacHan6OxarUzv7R5cw0B2 PXJlkJki5A0cmmo4k04oqynjYZqGVppvoxcghKgLSE6LgyfCVi3693X5oznO3vvI4u5vLZP W5oY4TDd/Ez8Vws0oqSNoOtiQHYkgp5V2f6q3QobJWLZK4SvWIuu2L1382SkTtRlEJ/yorE QVhdK6BADfECKrj7rXCNQ== UI-OutboundReport: notjunk:1;M01:P0:YG4aQCyWkLA=;EyuwUni4kt1Ky8Ga7W5wNz4fTFG M8PUy1ONmK4pBXPfYVtUpR40RInXXkJy7B3fsg2X3/2Gj+qeG0J8qQOage85XbVgr5XxrSGcl yHWasTNmOL6EqN8BUwdTSgsCyLzFhwg26zjoOdzuMhVQ3OdEyVy1iygmO9T+mfnhEx1aID8g6 1/m9x8aFE6suCJH4/oBJnhk5zR7Oa/58u8S6N8aKRVkgNmrSZCPkkthO5Imab9zxSJ29C10Z5 YFTXQrhAa7bVsnvZ0oKN55wj4VdUTjkZsllITbcXMcIsjrIIjXCSXAWp5PGPZBV+8oNOz3c+S YTevADxPzzUObF8u2c7ybc1GoKltFQneiw5+D8xvsbvkBIThcFnQ9dD1r12zvczU9XqaYJa+e q11MXRj26ggNCsXvepacuRwoJE7UaVJPN1oVLYdZOeIfPG4lo1gnZtriL31e+f2WZ5EYIsSNE dd0AH28WFw3LhDLzZJRuZW49UyS6IdMYrOgeNYvxTLQ6LvLuOjqy1KrfdBaxx6KrQzXCEDlFd lW/MjPx6lpC2Hr9exPVvTkbPJyistV6DdI8ddi8qWZKC+A3JlEudBvCOLXJThcfebDikfKjTs gQEjSoSs0SdqytDdG9aNzl61O3eB7bZJXwX3C8vXCN28kB1k9eUmXoUoAEWT2wDO6Ulm69Q8W BYW8s3Up/8JGndqVNC7bxnO78ajzTNA6/2Xr/73uewWRX3KG3gMG6FbzCTNid81/yAiJW/Luy 3qUt4ZfSWoQkA8tTkzK0CC+zEnvj+u0/AVlm4xhcPX5kozrJOpuvQyV46NHW9X2Fwqx+v5CWd 0jnhkhGdKrmjM7SDVgSGgM2CtmX9g7Temh2eGF6tgnVJt7kAZT1jiIbLy8vGpTZRZntaSZpQ6 Hm9aU6riE3qMgaP7estNaIwJiueN5/c1uh3oPsY4cemEpW5YUB/fQrDUR8AJnFDQlI+Dx513T JIjt7VdMU7F4buyHQpQBqWsM30w= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (make-emacs-tree-sitter-langs-grammar-bundle): New procedure. (emacs-tree-sitter-langs): New variable. --- gnu/packages/tree-sitter.scm | 150 +++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 26b0206575..02d515bdc4 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -24,6 +24,7 @@ (define-module (gnu packages tree-sitter) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system tree-sitter) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -849,3 +850,152 @@ (define-public emacs-tree-sitter @item More informative indexing for imenu. @end enumerate") (license license:expat))) + +(define emacs-tree-sitter-langs-grammar-bundle + (package + (name "emacs-tree-sitter-langs-grammar-bundle") + (source #f) + (version (package-version tree-sitter)) + (build-system trivial-build-system) + (inputs + ;; FIXME: Support for some languages is still left to package. + (list tree-sitter-bash + tree-sitter-c + tree-sitter-c-sharp + tree-sitter-cpp + tree-sitter-css + tree-sitter-elixir + tree-sitter-elm + tree-sitter-go + tree-sitter-haskell + tree-sitter-html + tree-sitter-java + tree-sitter-javascript + tree-sitter-json + tree-sitter-julia + tree-sitter-ocaml + tree-sitter-php + tree-sitter-python + tree-sitter-r + tree-sitter-rust + tree-sitter-ruby + tree-sitter-typescript)) + (arguments + (list #:builder + (with-imported-modules '((guix build union) + (guix build utils)) + #~(begin + (use-modules (ice-9 match) + (guix build union) + (guix build utils)) + (union-build + #$output + (filter directory-exists? + (map (match-lambda + ((name directory) + (string-append directory "/lib/tree-sitter"))) + '#$(package-inputs this-package)))))))) + (synopsis #f) + (description #f) + (home-page #f) + (license #f))) + +(define-public emacs-tree-sitter-langs + (package + (name "emacs-tree-sitter-langs") + (version "0.12.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-tree-sitter/tree-sitter-langs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qqf5naf4a9zm0am1rn9yn2b2s6q3h9fapsl5d546vbsyvak5q40")))) + (build-system emacs-build-system) + (inputs + (list emacs-tree-sitter-langs-grammar-bundle)) + (propagated-inputs + (list emacs-tree-sitter)) + (arguments + (list + #:tests? #t + #:test-command ''("script/test") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-downloader + (lambda _ + (call-with-output-file "tree-sitter-langs-build.el" + (lambda (port) + (let ((on-load-message + (string-append + "tree-sitter-langs: Grammar bundle already installed " + "via Guix. Installing external grammars via this " + "function isn't supported, if a language you need is " + "missing please report a bug at bug-guix@gnu.org."))) + (format + port + ";;;###autoload + (defun tree-sitter-langs-install-grammars + (&optional skip-if-installed version os + keep-bundle) + (interactive) + (message \"~a\")) + (defconst tree-sitter-langs--queries-dir + (file-name-as-directory + (concat (file-name-directory (locate-library \"tree-sitter-langs.el\")) + \"queries\"))) + (defun tree-sitter-langs--bin-dir () \"~a\") + (provide 'tree-sitter-langs-build)" + on-load-message + #$emacs-tree-sitter-langs-grammar-bundle)))))) + (add-after 'unpack 'remove-cask + (lambda _ + (substitute* "script/test" + (("cask") "")))) + (add-before 'check 'patch-tree-sitter-require-test + (lambda _ + (use-modules (ice-9 regex)) + ;; This test needs a git repositories with submodules for + ;; each languages in order to map all repositories. We patch + ;; the mapping function with one that invokes the tests for each + ;; packaged language. + (let ((supported-languages + (map (lambda (lib) + (match:substring + (string-match "(.*)\\.so$" (basename lib)) + 1)) + (find-files "bin" "\\.so$")))) + (substitute* "tree-sitter-langs-tests.el" + (("tree-sitter-langs--map-repos") + (call-with-output-string + (lambda (port) + (write `(lambda (fn) + (dolist (lang ',supported-languages) + (funcall fn lang))) + port)))))))) + ;; Tests for queries will fail given those languages are not + ;; packages yet. + (add-before 'check 'remove-unused-highlight-queries + (lambda _ + (delete-file-recursively "queries/hcl") + (delete-file-recursively "queries/pgn"))) + (add-after 'install 'install-queries + (lambda* (#:key outputs #:allow-other-keys) + (let ((elpa (elpa-directory (assoc-ref outputs "out")))) + (copy-recursively "queries" (string-append elpa "/queries")))))))) + (home-page "https://ubolonton.github.io/emacs-tree-sitter/languages/") + (synopsis "Language support bundle for Tree-sitter") + (description "This package is a convenient language bundle for +Tree-sitter. For each supported language, this package provides: + +@enumerate +@item Pre-compiled grammar binaries. +@item An optional highlights.scm file that provides highlighting patterns. +This is mainly intended for major modes that are not aware of tree-sitter. +@item Optional query patterns for other minor modes that provide high-level +functionalities on top of tree-sitter, such as code folding, evil text +objects, ...etc. +@end enumerate") + (license license:expat)))