From patchwork Sun May 15 18:38:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39379 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 21DDE27BBEB; Sun, 15 May 2022 19:39:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2F43727BBE9 for ; Sun, 15 May 2022 19:39:16 +0100 (BST) Received: from localhost ([::1]:41286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ99-0001Ta-Af for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8w-0001TA-6g for guix-patches@gnu.org; Sun, 15 May 2022 14:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8v-0008TO-UO for guix-patches@gnu.org; Sun, 15 May 2022 14:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8v-0006b8-Qz for guix-patches@gnu.org; Sun, 15 May 2022 14:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 01/27] gnu: tree-sitter: Move to its own module. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263992925275 (code B ref 49946); Sun, 15 May 2022 18:39:01 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:49 +0000 Received: from localhost ([127.0.0.1]:50641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8f-0006YK-AN for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:49 -0400 Received: from mout.gmx.net ([212.227.17.21]:54667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8c-0006XN-Oi for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639916; bh=FzqA3+dMOhc4Ql/C843wbq8n9u0a78NLSKacSKwkmDw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=idqm0ituAU5fIJjMNO0Xoqmxo+cPpR3ag6+x5cJL30ZAQ43YmAgQwtdNToEYokuhv NGOXp30o6izb7Nmuou54Ixz5X/Hyd7YnP4ePV591WSlLTzGwxThUQcnCo2ryyLrZbM Ilj6inIxmLU7l7vVHHbn1qJPduKWkU4ArJfFssEU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MbzuB-1nKovz2WCt-00dakV; Sun, 15 May 2022 20:38:36 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:08 +0100 Message-Id: <20220515183834.18771-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <87mtfi63ut.fsf@gmx.com> References: <87mtfi63ut.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:XGTi3hdyBKWFDA5EzNRIN43iZYijCej8aPmPUR5YndNj7Z9rHpT wp0DM3vVOxQWDGbPmC006ym7fgJyTYfWiMyzQLTihE5ARNt+9FAkiApQm0wbacX+DlMM5ZA zyJ/eM8nY8eumG4vthehhe6O3DfmK7KvBBsdlWR0EawaW3uhSU03/7d0hFkBQUwIUUK5pP1 +iE2LNSrJuPXLVBtAPRew== X-UI-Out-Filterresults: notjunk:1;V03:K0:tuiHZGxcMA0=:AT5AdGClpxX5bCRkVcbEUx 8h4oj3MObfDOK0MglvDOWxj2TzgqrJ2hlGA/74dLsae/bqcpJgqqEGhfhjvhxwPUhnYrZ4FQE riv2JwfRzcVts127VrY8RlxYlxRpWN7nBIS0sa5u/Mm1rQ3sc/kOvj54BTrBawyvOuhfz/LpT RtDk11ngsosJ4n7dczP1dJzWSx/13CHSNVIpen10JILgXl0qnmo1nwj8hImuWZzp+7Si6Jn8L 4I90OUO9nKJTleYAXXxFEOXFUarwHBsAfNrju9CTeJpACmr9JZGE0EBYjfpNrzEboUndpHesC qFpPtCakUvMtXYjiYuheakUUBjk2RbnnGpEx5Rz1LSz18UYCQCklOzNHpj8Yb1mumb0icLnjQ 5DDibMgLbgG515zEOuaoouoVbR3bkMOfS148+I0C47J4/q8dbmSBcoSuNj4lwRUxfyvr+E2OE 0Wdeh/P6Y1+NpRdBGrYrey8oXB5FsE8ZHUJDp5KwvWkYrVfqEDUPpPkeRLx3mfSus9SmDoCgu rQI9yS5hdg3EwBYoU4VTVKwulgW+r4CatCesXhdRZ3B3sCmRM4QDI7S6WBWgTY2zfWlii9ns1 Svm6Va4QLLHITxFDfgx38PMws6calUrFRogSvSujN8ycX2p3rq9hvgmIMMVkK9NgGQZuNS2Qh dK8LohtS8QL2Hvxs1gRCnjL0tIXk0Yq1nl2LI92rgkT6j5syKtQxijRXDth0/8NajJtTabCw6 YMj05vrAa1QSZj/bvmv9BBzQANHJeP7yDbOpcPfGESpP+YMQN7hF83sp9PHm8G+mUNoTAZHn0 kmJC2eClPiW4RlXCHyy4rSSMkhDTMH7T9/OhkfZR2Pqwm4CmtE/vBUPi95wJ87KESCTZKa7Wq uNzkRGgFj/s3EoTQvXNP4wOcGujrzowrrjfPbrXHYgs5rmsx4d+pnlgcz8fs+coIiWOM+K7B4 DMtyCOxGzfJJg6aF8RM2zNBxQ9xX9TlI7ELVuizLdJOoIpPyWAPCJjmnW51oYmOJ4bIXpy4kU vcXClhoTSfMbcJLzGiRa0P/BPEx1bVeKtgvsPfN4OokTykaB5VG3hbNqKhFJvIkyYNdZ6qryb Mbbh2GTrU3pGQ4= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 -- 2.36.0 diff --git a/gnu/local.mk b/gnu/local.mk index cfb499915a..429a0b577b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -589,6 +589,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 7cbad042c9..ddbfef3e77 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -63,7 +63,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) @@ -1167,54 +1166,3 @@ (define-public virtaal provided by the Translate Toolkit, including XLIFF and PO.") (home-page "https://virtaal.translatehouse.org/") (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))) 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 bb459933b0..c7f7697168 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -71,6 +71,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 Sun May 15 18:38:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39381 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5B01727BBEC; Sun, 15 May 2022 19:39:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9971727BBE9 for ; Sun, 15 May 2022 19:39:18 +0100 (BST) Received: from localhost ([::1]:41386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9B-0001Yv-Oi for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8z-0001VW-5Z for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8x-0008Tg-9Q for guix-patches@gnu.org; Sun, 15 May 2022 14:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8x-0006bc-6m for guix-patches@gnu.org; Sun, 15 May 2022 14:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 02/27] gnu: Add tree-sitter-cli. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.165263993225320 (code B ref 49946); Sun, 15 May 2022 18:39:03 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:52 +0000 Received: from localhost ([127.0.0.1]:50661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8m-0006aE-3H for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:52 -0400 Received: from mout.gmx.net ([212.227.17.21]:54659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8c-0006XO-Oq for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639917; bh=6SFCEm0LtK0AgsP5BPXyPwkzDLNeUf+ymrXXihPZMIE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=QBhsx9jirW36u7C472o6XrAm55rWf7EyG9OiNg9ybnJXPid8uvYdrjOTNXqLIFQKm XWl8bOoD5zj1NzLpD3JmF7VXNWqslHnGVDgixASb3nr0hSAnmUV7/JFFtZXRhnZIZa MbHhtUU4KmYp4yKhUQhQ7D+NU7r/DmnqMmS5cvVY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MJE27-1oAJ7v3lF5-00Kgt5; Sun, 15 May 2022 20:38:37 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:09 +0100 Message-Id: <20220515183834.18771-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:yGGS110TQcSrO+WTzTemSjkS3YWIontOQL9Fejmt9U5JOTUCiDq TzcJMzcYU5Q79qje7TMtYXB1FxrpyyBc9htvl/1i+tL5+ILzICjB1FRmGIiy4O5nOIDh25G iPbrDRVKltlpKrEl974Sq8hFCofWRjRtlM1B8bgSOqJ4nDaEfXk6KuYW3tYaqoUWhIxL/VS POU+CLWokEM4thWHKokug== X-UI-Out-Filterresults: notjunk:1;V03:K0:pjSG98y1tic=:FnoUK60Y06R4J62ABjmYAI dAKOvLTK+z1urb2dG4T5gZ4M/4YYFsW6zfkXU61BMOXAe9J+N/PMyMJtUCFfS0drLGSn4K/qP VtKppcuBDu1P+xw8fWBCS0QYKxhhRSPd8QeB4CkVCPoXLh2HdZXElJpewFHqjMdGsmb6KsDjX wMDOqZpriURxDeu8pEDQG+R8LLOaxCDE2qXWntF83Gg+GWNNcnIWX/puyw+39BbXte6oibfRy YJM9rDZR9vN38eseKomxStoKKiyujkOUX0RUapy6qBH5vrhhB1YYgK6648VgFoIs2q6HNLnLk PqF7DDRYG3fFUZa9X6t16CiwxAG95Po6EqLTQr2bZ02PuB2K/eqB3QODM6FlugZJKdzmexlqw AOh8M+7xxndaRaybpV/2UY5KrNpHK8iISd+NxbklTvZVBenhNliAKpj5AoPbYe5zwYIeha2yI zznUBLR9evdKvm7VyZYk13wNy7C6bZzwBayQLSHsQBOIMMgVg8qxS/xB5gk4hC5gB8kk5MqVO HnB2lPeibWsQdOg6UD5A0Dh4QOkpxRudmw3cRLzdRbhE08F6WPogdjNOskZk5m9E2spDGhyCM dtCu3zHgdKXbQvlwGY5W93UWrxv+mKocNpDtq3j49mA9Rtoeb+xorb3Bo3JK0ivMA2LNP7Q1P 7S5qx3fFS2sDzoynUN3ZweSIYp6op4t+muQ/g4+wDAVZOSVLY/AYXXzxgEvPShEydMTtvKZCH pkibE2oRwGlT/86AaYVAzhXEKhQA1iu3/Ccom4Mrn6UDT8DdPuwa4BpHewMkCXBlPqceQ43Ql eIp8N16bL+cRmsdkktCq1Dxohnye4I/vcduejgybu6QGE9ewetz1ybyaIt3VWW8bsX93W342J 6jJz427Aasxg5ZFXFmJ8AeZwH91Vv1zn/D3n7lFeX75nnXxTLeZ0u9WbPV4uZ1fKJrHrv8He8 6Ya3lyipAJkvq2wFm9TtjBc7UfrI6qRW5Yohrffdzti9PUiOfOsuZbwaJPWl39UZKRYsr/BsF I+3CRr7y5JUHTxb1LuOCShH29OEKPdcI7UX3ZCTtbq9xYMmpwYS+BmvBYardh0lVCYkePaSgX O4beUxAiCb5EZU= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-cli): New variable. --- gnu/packages/tree-sitter.scm | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 7116a10ed7..18c9fe0844 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -20,10 +20,13 @@ (define-module (gnu packages tree-sitter) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages crates-io) #:use-module (gnu packages icu4c)) (define-public tree-sitter @@ -76,3 +79,79 @@ (define-public tree-sitter This package includes the @code{libtree-sitter} runtime library. ") (license license:expat))) + +(define-public tree-sitter-cli + (package (inherit tree-sitter) + (name "tree-sitter-cli") + (source (origin + (inherit (package-source tree-sitter)) + (snippet + '(begin + ;; Remove the runtime library code and dynamically link to + ;; it instead. + (delete-file-recursively "lib/src") + (delete-file "lib/binding_rust/build.rs") + (with-output-to-file "lib/binding_rust/build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=tree-sitter\");~@ + }~%"))) + #t)))) + (build-system cargo-build-system) + (inputs (list tree-sitter)) + (arguments + `(;; Running test requires downloading fixtures, see the + ;; script/fetch-fixtures script. + #:tests? #f + ;; We're only packaging the CLI program so we do not need to install + ;; sources. + #:install-source? #f + #:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-difference" ,rust-difference-2) + ("rust-html-escape" ,rust-html-escape-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-rand" ,rust-rand-0.8) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-semver" ,rust-semver-1) + ("rust-smallbitvec" ,rust-smallbitvec-2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tiny-http" ,rust-tiny-http-0.8) + ("rust-toml" ,rust-toml-0.5) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-webbrowser" ,rust-webbrowser-0.5) + ("rust-which" ,rust-which-4)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.7)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-cargo.lock + (lambda _ (delete-file "Cargo.lock"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + (mkdir-p bin) + (install-file "target/release/tree-sitter" bin))))))) + (synopsis "Incremental parsing system for programming tools") + (description "Tree-sitter is a parser generator tool and an incremental +parsing library. It can build a concrete syntax tree for a source file and +efficiently update the syntax tree as the source file is edited. + +Tree-sitter aims to be: + +@enumerate +@item General enough to parse any programming language. +@item Fast enough to parse on every keystroke in a text editor. +@item Robust enough to provide useful results even in the presence of syntax +errors. +@item Dependency-free so that the runtime library (which is written in pure C) +can be embedded in any application. +@end enumerate + +This package includes the @command{tree-sitter} command-line tool.") + (license license:expat))) From patchwork Sun May 15 21:19:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39409 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 819CE27BBEA; Sun, 15 May 2022 22:23:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5CB9827BBE9 for ; Sun, 15 May 2022 22:23:17 +0100 (BST) Received: from localhost ([::1]:42490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqLhs-0006uD-IN for patchwork@mira.cbaines.net; Sun, 15 May 2022 17:23:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqLhe-0006u2-SM for guix-patches@gnu.org; Sun, 15 May 2022 17:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqLhe-0001Gh-H5 for guix-patches@gnu.org; Sun, 15 May 2022 17:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqLhe-0006er-AJ for guix-patches@gnu.org; Sun, 15 May 2022 17:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 03/27] build-system: Add tree-sitter-build-system. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 21: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.165264977525566 (code B ref 49946); Sun, 15 May 2022 21:23:02 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 21:22:55 +0000 Received: from localhost ([127.0.0.1]:50888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqLhT-0006eE-3e for submit@debbugs.gnu.org; Sun, 15 May 2022 17:22:55 -0400 Received: from mout.gmx.net ([212.227.17.22]:54489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqLhR-0006e0-1Y for 49946@debbugs.gnu.org; Sun, 15 May 2022 17:22:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652649762; bh=/Gkw49QmnEmPsRAmo0qP32TKLtY/FYFJM5hQSILTTBQ=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=MfXch8nQknfKW1q/36DAHttf0w+vpisYU+vL0p2pUynoiNhTkHk2K+qNNXBjyMivC ZWad3abfGI0REJEpV7BBoVybcNpFfNL6jeypPe/6CUk9pyT+zN6G3FwFf8uzjnP0Ja m9QTMRrIdQ1G2H6+nBFGBkCpMq8P5c3MoFYOMnMU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MKbkC-1oBANC0j6a-00KwIV; Sun, 15 May 2022 23:22:42 +0200 References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> <20220515183834.18771-3-pierre.langlois@gmx.com> User-agent: mu4e 1.6.10; emacs 28.1 From: Pierre Langlois Date: Sun, 15 May 2022 22:19:59 +0100 In-reply-to: <20220515183834.18771-3-pierre.langlois@gmx.com> Message-ID: <8735hav6ch.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Ya6eGpNHeTdZXYk8b6KTwI1b7LSTXD8+lCA8xeqfKnSWTGsfpkc lKMgbL1+iqFFm9egmzK4seAGheEuy8oTJbw8vlsnJRFTNPbtEEBbagurGMBY/KyD5/Ee6SJ /96bvqv1uywnZ7amIpbSTStXwaHL4nqUqq7md/ZpYwna6ncjDZZ0NMHbMfZRObYRdkukEdO 2TvRskrfZeHvVDwPwCl6g== X-UI-Out-Filterresults: notjunk:1;V03:K0:upvYuFje34s=:aqGrRVM/pzBllPHoYgiWQu cJFNFGPbaW3cU95zoNrfYEdARguPiSRXuXvmrx/fGuNZAYeaBnXr2zkGo72EN5ahcX7Ffb1Vd 2LC++mCjWj5vMGZ4W7QIIM+2+Rcen/pSXKgp9/0bJQH6oHTMW75vLgeVOxmh7uYQila1q+xlZ /Ud15zjziPsdcv4PRPZzbrh7yk1Cy+eTlRs739YoqizlCtc4URMBbFKz7aJMZRINQrDig6K2m WSsp1tnUBiZhaqpAwJb3RyKgZZz+v30sVxbE1fPOw/UNnjo6saqwFQmONA2UHo42tIe5wrm+a dexqHJHX7TVSvoChnt4bgKUMB0Mrxf33GJ4A1PO/DGsvAPYR7AYalSXzLUsl2xSwLxWkXsbYf tJ0HvutfUV4xUd9PExtqzW3aFISD/Ut2eRIr1WQroY0Ec8q+hZ4bcf5CxZAl39EbcU/fhp/x0 nZUXcq/k09r9IsR9/7BrYy9tM8HYYZMAYmbOKJAhvuZR2IWh7mCIXh9/zeGBbwm5JPMNfsL3y 4iJW7WHph/zIIgtcCKtgv8ml2rDNMH0YU1k1j2kWv6K4DR0PhVzVAt0ZCP49XlP9kedrzxC4D hSZ3UOwhme78gmIjS436pypf0iiOxybOdHN1HiKMnHN+MZ0zZ6m///2xZFOcHQ8FrLqC2PO66 i5GY3WpE4C8kwcCNcTMtxcpRgqGCl9PjlCzcBqoKI0E7NjBozr4U6WWMD+oLz/Gi++umHSUdj EM/R68cohZm7hbmlO7Ban4LulT0lulz45mPvyl+TqhrejjLuCRy4bhrixYKkDNtOzLVpbLc6U 3EtYCnaB84C7elloT9zvBUpiG8JidSza/fXaJCHA8n1BZV0+0nsRGuppe6s+YuVxdvTWSr8f2 bAfd54M4JYwXzpCHw/kTtlJ2S/X9kEQyFpBPmCD8rfpX3s/UTn/unJv+bOEfwI/6RDPiR+azH 8YWlkvPKIJYfQTUx3DPoRLqDjm2Tkxl+nPRkRv9AZhfk3AZVu2mQd8He9eHscLxGjl6AfrU8E 6tuwDrosLkW+y3d60Mnm+jz1eiTZRTn8kHaSg3GTMC3ulf2Og6fcQNcGNb17Z73Swc2i1QrZQ QofENmIpK27WPs= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I'm not sure why, but when I look at either https://mail.gnu.org/archive/html/guix-patches/ or https://issues.guix.gnu.org/49946 this patch always seems to be missing. I wonder why, I used `git send-email' and didn't see any errors. I'm sending it as an attachment in case people are not receiving it. Thanks, Pierre From f16fb42db676303292de5cd9063d0f21f0baceeb Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 29 Mar 2022 20:13:34 +0100 Subject: [PATCH v6 03/27] 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 85a22be99c..de5cdbd328 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,6 +168,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 \ @@ -221,6 +222,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 e1fb50a634..1783d74551 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@* @@ -9281,6 +9281,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..ad59f56dfe --- /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 ourselve. 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.36.0 From patchwork Sun May 15 18:38:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39380 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 826C227BBEB; Sun, 15 May 2022 19:39:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3286727BBE9 for ; Sun, 15 May 2022 19:39:17 +0100 (BST) Received: from localhost ([::1]:41346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9A-0001W2-B5 for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8w-0001TH-IC for guix-patches@gnu.org; Sun, 15 May 2022 14:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8w-0008TT-9V for guix-patches@gnu.org; Sun, 15 May 2022 14:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8w-0006bH-6o for guix-patches@gnu.org; Sun, 15 May 2022 14:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 04/27] gnu: Add tree-sitter-c. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263992925288 (code B ref 49946); Sun, 15 May 2022 18:39:02 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:49 +0000 Received: from localhost ([127.0.0.1]:50654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8j-0006Zc-Dv for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:49 -0400 Received: from mout.gmx.net ([212.227.17.21]:38473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8d-0006XP-AG for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639917; bh=8WsVgaFG9psJpDlUuVTWUW56iFN1qD/HZdMdQMvL8TI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=M/VeLYPEzULLhywawVL4va5R6rtf14HQUlgIEHpT/RbBpsO09XzKiwgeycFYPDefg z1sqRVje6tt9pLCmstzQP12Avu8WHylacu7RAf2KTWnWzssk2TJYa7UiUXy2KhGCHL CylLdYj5CyMkvn7NyxwPetAxWc/fsZlnJR6g0r98= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M9nxt-1nvYT21zXh-005sUD; Sun, 15 May 2022 20:38:37 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:11 +0100 Message-Id: <20220515183834.18771-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:RmBoKgBUYC7Bt/VFmo0MvxL/0O+Qmil2fxjx9IVPfDhltmZw1Os P5PmiduqCJZpWsyUPIZKAUsEfJVqh9qrn8Hcpz48wXRDkRYvUPRMIfjpojJDp2h2aeVQ8tO cWAGwCa5HVC2Bmdveya2zrmM19bUcG2PER3zVS7z60Hi6Bxp8b54n0Px5dRPNgAVXR+F1zH PbOTjWSZWJ68eOyrC76NQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:5KsNEAH5nIU=:I+3HQAL2ZFtGucWyJxJzck Mkons3GAjTXkFIXL9MYyKp3KnRrfJNyVf+X5m8Fw+ZgD8P2SLM75dsceb5Be3SS58fFWkyvDC ZlJqIt8EXgaXp0JRZr1tn4/H7m+hE5hIGtBvXiFTx5cb1RyfkW0FYzHbOIptpkyTBnSs1gffH 0J9lD8XBaNMgG85r1gwSzcaaqv62zcSzGDoGV9i4+Qb5N6ToUvTpw4yBMm7bKsawmKD7fKhHI 966zLhgnItZ3JxmN59nsYzT34L6ZsutIFFNGBE5MrwONAbhnvVNYS251KBTq8Jz3Q39gWXBy8 I8n9D+8ufk/S1QuDDrglJAxJA9rVNQ9KpxlyPEhQciVs/oGIlni+rUEV16kr5nVWgwi/pjNin zHpeeTORegqc6uZku6hkp2RYljAWhcNXc65Gsn3TiHlp6CSBWOj25o60c2G7+dBIIQgrmuinB dNiZcnN7olVwbOEDr6D3r0EKow3ZN/kBbljiyGSjv/UZj688X3BaEwRUxF7vrFG5UAC9V819i vVJAOZThcQ0i//2AhM4AMq2k1cKbPQSNMkqRNFWnI/IeUbtgjpbRs4nqrjciQywvfe0opzkeX 4EQqPEYYewTWoOlFjPS14XQIHjZK/amu6TlVYtyvXu9N7OAV2lXHNZj4yfs4ryAXRbwGFQNvK gsv3yc4La0RHSuIv0TjSZGEQ3otpI2Demv4Ozu0hO1Ebc+qhxHqqCbgChW+OrEBB4up9W1Vm7 9pllQER97ST8r0HpPtuoMWMSUHXHB8SaWlgZoVxC8fqc+dmpNjQ9coZZy695I09pz7rpCwKy5 Ub1GRIlqFxonSD0E2LmfNa0lgtSzFWHCvgk/cGbrCcLAugFaMa4+hSGYyn8RI+sqmbHj3OimO w9Tv71TXYwhfQB0AnXf0Gif23BW004I/UfhJjYlwf/8VXjc4bMBOYG10Cu3T1QCWu9ECLl7UP 2oWoTxKTDXags6DbRqXM5lzJ8DuiwKhl0FYfNSFRdlC10CdxpUY4SLMK+F1iiyTbgMR0wxagE HZDy3T3T+KasnNRqljiaeua1HU4MGIJPOxfhJMOJOACkwf3Y0eT2cy76vLiLHUI14VJD8mkJB bJQndr31r+31tY= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-c): New variable. --- gnu/packages/tree-sitter.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 18c9fe0844..3f07b2d91c 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) @@ -155,3 +156,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.1") + (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 + "0454jziys33i4kbwnvi9xcck0fzya792ghy32ahgk1hhv96xga9w")) + (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 Sun May 15 18:38: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: 39382 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 AB22927BBE9; Sun, 15 May 2022 19:39:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1AF0127BBEA for ; Sun, 15 May 2022 19:39:20 +0100 (BST) Received: from localhost ([::1]:41512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9D-0001f9-8g for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8w-0001TQ-U3 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8w-0008Ta-LX for guix-patches@gnu.org; Sun, 15 May 2022 14:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8w-0006bO-JG for guix-patches@gnu.org; Sun, 15 May 2022 14:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 05/27] gnu: Add tree-sitter-cpp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263993225313 (code B ref 49946); Sun, 15 May 2022 18:39:02 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:52 +0000 Received: from localhost ([127.0.0.1]:50659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8l-0006aB-RS for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:52 -0400 Received: from mout.gmx.net ([212.227.17.20]:45421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8d-0006XS-U8 for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639918; bh=EvbdJw28hrsaxyFI0cUKbcahNdyOTqSqHoLNC8Uzsgc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=L6cLxY0LehNyYdCZ42F7ycdP0qIwj7Zj6hhyh5MfjdNBmXyq/8TF+t02qsRnfJNjd ZxDjt0aHGcC5pvgt0K4UzeWMFb2gP8PgZwRHOfL8lpJ3d38TvfR7yGNf2kJQuCJF66 btjGffolIDrq+ZyHMMNPqX3TFWIqevJ6xi3NFLNg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MV67y-1oIKOx3At4-00S4DS; Sun, 15 May 2022 20:38:37 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:12 +0100 Message-Id: <20220515183834.18771-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:SKswQVduDl4x9+i6n5RhXEecEjsSa6oW8ZrMkimxhf6LWd5HWdU 9bhXQqwjEcq7M5KSmIPuc0PUQsn7eQrvO+G1gkpo37XhvD2voQi/7MlsNbZjWJPvjaExxVJ FCCK/6nmEj986U7aX89ILejqg7x5l3QOrSFO43ZmONdyIoC8GnJAQJO5p/2w2THOiUZw4+R IbH93ATAsQbfMTakIfeDA== X-UI-Out-Filterresults: notjunk:1;V03:K0:NG3gfAdwFZo=:OsUtj6vbb/KvjaXP6G0/Dd SmP/s5TgsqJq3gYCSDTs8nQCxbEBXkANuUj6plgyB6KVKfIbKUAjgqdC6fh6jiQizMvq+xXx2 YKquh9fzWNDXbXXzEerdrnS46yeZQZn9+XWQiT8MmPUTEBpNtySX+WwSfJcTUt/8hEyWex13h BB9+IxjhFRtOT8ePlyUKZjJUQA9lRaAu6aRt8Coc7Zbft0j2zfQVImhYEJG6sx7/pT5PUqICJ kV0LQ9tNBIJQDl4V69r98EEegAMxKpp2LVKKO6CJgk6Gdb1eo+o9wfelkPoDcrk3HHPgMQt8C yvvc/s++eUX8P+tSYNpsk2PO5pWJx0yeWkrCbC6TbZZj3m/CVSdbpJpu5qHOSzUNoY3abObmB EjYt7ojgK3e3+zp9wmSOq4Ari+bxW3V2sJKOZFy9GS/Z8rFUrcKIkYvflotNZX0NekI793Lfa TwSWYi5ZzfusYPwqIx7Uf7SsCMRmEK/yXK7gL//kCZkM0ESYDYZs6gTH5WgW9zxTVG4OG9UZN w8O9wSUy/raUpl2o0Y078+U6U4q1CAPxZNKMQ30aSORATPGvesUpgqJOQ2vyEWi3+p8+va39m cAq/0otYTKAQ/iK8iIhlq4HRZxEzvgbJwZcALWBcWr1BpQTADKQ8cnr6ohVsuFhIxBJfODWv8 u4lkL2APLldoGKICB5Xdp7Qi8elnbYBkBpIAgANyals/WBZdam2/O7weBcaTdQ6mZY1MJhLHl +AenfYKbdLKLenkdOM0Q2AGgFihwPUbGRWh5EV+NzyeG4zPGvXLwCMQi9td8AQKcjPK1maQX3 jJAqTYb90Ob23jLGDo2/QlInlXTuKW0vg24DmBtEaM1lBv73jNIe3IVy5209O/9KSKTwA3pyI MzqjDI6AfT/bUJ2GhCTCP8ZlpdbZXjue0mU8fEsPi4K0/+3ZHXBomB9b6C1AGx0fr2H1zbVer FhvgLrLw/ZRG9Hh4cibCf1lyd1scr8+EF82hrHaeQcCpn0WvMRbb31+Sx8bpa0WoBgvm9U+OR fbi4+rDNmhy0Tuwm9BeCyYmVvxHjUGqtLuUrhH49/JKgcoAW/g9r2ifm6/IXesCBRy1N+o/yv MCXtRtprus1hoY= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-cpp): New variable. --- gnu/packages/tree-sitter.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 3f07b2d91c..5e25d48c05 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -188,3 +188,26 @@ (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 + (package + (name "tree-sitter-cpp") + (version "0.20.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hxcpdvyyig8njga1mxp4qcnbbnr1d0aiy27vahijwbh98b081nr")) + (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 Sun May 15 18:38: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: 39388 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 C048727BBE9; Sun, 15 May 2022 19:39:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B2B927BBEA for ; Sun, 15 May 2022 19:39:36 +0100 (BST) Received: from localhost ([::1]:43014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9T-0002j0-Jt for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8z-0001VZ-6M for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8y-0008Ti-GH for guix-patches@gnu.org; Sun, 15 May 2022 14:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8y-0006cF-C9 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 06/27] gnu: Add tree-sitter-bash. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263993325335 (code B ref 49946); Sun, 15 May 2022 18:39:04 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:53 +0000 Received: from localhost ([127.0.0.1]:50665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8m-0006aS-Rh for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:53 -0400 Received: from mout.gmx.net ([212.227.17.22]:39195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8d-0006XT-U6 for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639918; bh=AZUSpLQUdgCWcFY5+j+faQ8mIW0Nh2Orec/4V4Km8PQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=RJ7xSBlkA7Z8fU2zwKp00ZjXznWaknYTMGWQiKdFbQc8kDv3VHZ69iKnLuKT0NE9K Q1gEIYMY1IijVnv7aoI8qS8aAk3uzoFfW8OtniSpzdm6f6Nvl6nHAgisgnmHkKQUzN e/f2JaskJXGclXTZwsByqsUyOfh9eYKeLnXawW30= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M9Wyy-1nvpRy09nI-005bN2; Sun, 15 May 2022 20:38:38 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:13 +0100 Message-Id: <20220515183834.18771-6-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:V1SoTjOUCKH0TJ5+GWetPV79lFUGMYVd7okWxjtgfSbEBfiHnh3 OkGEqFYLPR9tRWWFUYbna/Q2/RnS6drwrD/H7Zl1bob4s+5ScgdiZ1hoqznqqsmiqM/Wrjj EBhgCVtUMX4/Nxv/nBquF/P+e3CbPSvadjtJYATei+Y0/CZVqNFdUhE4/sn2lAcamnhr2zm WpSG89b/kOFdIIz2CGq1g== X-UI-Out-Filterresults: notjunk:1;V03:K0:Ym68NGCouFk=:il2TgWaLvudShpXmvtE/bw Zs3Xb1udPu8gOGQHk+R5Z8X2aQaLSnScsrqxF7VxifuSyMYa26rkpzk4GPGK/uFtjThLYUahk cb56duOi8ohmEXO9mLy4Y39t5+dWPHjoj7yZjaQTc835cnzT9qEEuxCWTnBMdar4hEWNO/6l/ n1CHf3fgDFQYv1kzwqnHFPl7VVr1t4B08Q1jZRUEhHxExsWnACxrkHBOKh41p9JbReLNse91y bzgw7NHCbGGLE/dcj19kLPu92Zuj4S7ij5wv7m3PC4x/sDNORJhiC6rgenluoXWwT+VPli0BO RpPdzUH3ZjpMc+vUpwxVhQ0cposo+0LcOHU7EJWxwjMFkpF8CNT7FMnWWVfhc+FFKXObJIsPK OMq5Hl5v5ynoxHoOUeRLhZ6n6fcR1XdQv3CLye8WiFowOgbNCEVCuktMi9ur6gL1BqIwYuKHT w3temxwCEdK+t1GRBkWRuKd0l2PEKtoajTW37Sc+IkjWJemaXIsQKGgZcBHMGni2GR35DWk/T 5Wn1ySMm/FmBxry6Ww7Vekx8E+yBlr86HVqXWoBeKOb6pSoJaLY2lBhcu+nG4FfNXGqr6jth7 u3fWN9h0vta8jDFx70YYFAMAlxOOg3Msq//SoTROclus1gJ2/1aYvupf1zHfrIpYYhQf4zmS7 lZVzDITa5toVGFYJK1JfanwsywukP4H4KvTeHSk1J60nJAdiiBFgenlDoROcJipt4+hod9rm4 QqIUNERzJvul+ACcckJBtQBejpENy8AscBs80Ht0hgWqbnq6b8l965jGrXXbzcF74+lJQscXF 8zqNIiaK0AwT+RGBT918zYCmCks6wOuZAdXj+tBMKuLXM44JhCQ9l0TYP/f+5IT4fKS9gT1w2 8SxfFcgITASzxW07mb0g+HtvV26xFjkXLC9CpMbtFf1yJu84qS9xT1R6/85M3OubesS4nVAZZ NJwlmkJ5S3fMcy43qEKq/dXGbhJTY1ngS2L1/VsKDL39TBFslDOQyvjQfB7bMfSTUA5TEGNLr qQMeQrzGKD9x+PoBVsv0Um2zb0pHPPr8OIPzvmbmU7s3E3fDDkyZVaFLQBdzeTvhforPYvRpr R53JH7CUX9EhBM= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 5e25d48c05..084071fe3d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -211,3 +211,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 Sun May 15 18:38: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: 39385 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 ABF1527BBEC; Sun, 15 May 2022 19:39:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 11C0A27BBEB for ; Sun, 15 May 2022 19:39:28 +0100 (BST) Received: from localhost ([::1]:42232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9L-0002Dd-6H for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8z-0001VY-5Q for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56784) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8x-0008Th-Us for guix-patches@gnu.org; Sun, 15 May 2022 14:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8x-0006bv-RI for guix-patches@gnu.org; Sun, 15 May 2022 14:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 07/27] gnu: Add tree-sitter-css. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.165263993225327 (code B ref 49946); Sun, 15 May 2022 18:39:03 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:52 +0000 Received: from localhost ([127.0.0.1]:50663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8m-0006aL-Ho for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:52 -0400 Received: from mout.gmx.net ([212.227.17.22]:50823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8e-0006XU-3T for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639918; bh=VIBCYzEe+08fZGY+DVKewl5vIzCUcn8+BGvIwny5txk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=F213LxW4JiEi0FOHxOcf3Jz7ltBnwWpKl81WCKV+OhbasGRNzZlhvz9RiT2vPNQZs s8JJt5nKO8chPCkGiTejGy1PSDMiyNBV0bn1SPzdrYXRkVPXrJs+EgRPdmx6/ngvuN vxcSX6kjnjdiUj0x2UveqGKuNcgIxJr5aN/I0d1M= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MqJmF-1nUm9l1Ot9-00nR39; Sun, 15 May 2022 20:38:38 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:14 +0100 Message-Id: <20220515183834.18771-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ySVoaN9VpmXxREoEVsSMOLy6/UwKO1lv1yZ1hr6je5AOIwr6bOy S7Y85MeJvA7sWizVR8DY25BCreaMlUs0cKj1AbTJdl7mEewXbRguKJyDf1ntZJm+L8atBi7 Wi6iJwkZot92z86K0mif7fU4d+ZTnOFIrFuJrwJdXkrmI1OEUbpVJ5PzZtHpuEFiUC3Ir/Y boeaEdJZyKPknuY5lwgvw== X-UI-Out-Filterresults: notjunk:1;V03:K0:mdSeb1KKq+s=:hy93tC9AC5+Idf4IXKvtGt gUdhamuqPwqfmfCN1EFhDBuL4vDej0lpDCvusLBn4GpJzv3zSK2gjbfVZC3SZDvhQtVoCIFvv 9isAaoFbZaZdMVlPEUE7S0+7HK3NM4h7/aER/GbSxdLURFsowAv+U+RgJK2oi/8cIGy6j2PDO 5MyvztuXwVsjcR37j7o9yICXfFfySlLVwUvCgO8exDg+1zz/8kSIGC8PiEFwZd6Qh9l/eVS68 v8Hpq8TS0JgTQVKqZ2TYPUSUzIdueymc+bkQBMVlEuqkUmAe4RAs1/OthJO88bRgmIQYHSEr8 PYqCjOziilpoCSOHI6kUCMFPzKgjx75nY6tVmn1y70hODJOo5YHymBSA/cNRVkGO6Rwt7QQgo wNLSoB5gUv51Nn8y2BtuiXHuS/MIY7cONBRJFlkXduTkFnfj7FYcma6Rf2UcrFamv6aH9Uqna CF8RkYz0NCJBefr+gfgvBJ5Td52VwB++VYErM9uQL5eZTA0yXU99PLOVvqZYIy5tlC/bf+l0s mMVgKPB8CfwCtI9D70klV8uSUsW62StG8IVBMBhb9eVJsmSEIPfilLe4K6Lrs2d2j88+tFbcP shG4lxs9pVD5914Wl/oppMIiTk1fIcjoWrjK6syXlf4puC0B3+8E53mY7tzemUi8lO93IKIa0 3BcN6zELlyHXzuZ/AkLvBvULIMMsSuMnOGQIuj6slm+/wf/4L/O2Rz6C9E7IjzjYWwcDyF9kE 7myyPErAvVwq6+tQBhdnvk7YOayHTFUuxd+y4lIbrHwjgIqx9//FI4JEw3Gemv+6OwORvEfub PWLccw8eRiTBQ2VU1dGMjfxgJHH9CX7n9bxQQBdaCA7C4B2DE3P9NgWlEsvMy1ZvrVusyGwku tRbN6Gc8oBb96NG8yDYFTPTgk1OjM1JumFK7nIW5ToQmdYisQv6/khycceAmnhzQO5+Hz68+P xhhl/vBkwgBXHh5G1NUFdVOkXCuTHHbFcWAJ8jxX/K75dipxw3zo8c0yHGJCvXmkyyeh3Vvoj nEq7RwOP9NJANepVwRvohO6LMbtMHrA9hnRDASRt4A8bJS4kV+hGh9wjN9DDuTRp4esUyWhuP +wBrt2LSDI7ggg= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-css): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 084071fe3d..d2f8326be0 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -233,3 +233,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 Sun May 15 18:38: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: 39383 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 F269027BBEA; Sun, 15 May 2022 19:39:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE10A27BBE9 for ; Sun, 15 May 2022 19:39:25 +0100 (BST) Received: from localhost ([::1]:42016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9I-00024H-UL for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ90-0001Vl-8T for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8z-0008US-W2 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8z-0006cv-TE for guix-patches@gnu.org; Sun, 15 May 2022 14:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 08/27] gnu: Add tree-sitter-c-sharp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263993325348 (code B ref 49946); Sun, 15 May 2022 18:39:05 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:53 +0000 Received: from localhost ([127.0.0.1]:50669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8n-0006ah-Cq for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:53 -0400 Received: from mout.gmx.net ([212.227.17.20]:51917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8e-0006XV-DB for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639918; bh=/wbKaKjhv3j9G4ePyOAwnfgNRwvtTn2p5GFafOIXLE4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=RuKSC0f4cgJ70etd/vW7k/k7p3o5Z5KhwD6A/cWCEIqwnQcMS6RNT0UIF+4VMLwC1 PZUuTiw5bf8Ak49tqZmndF8xTEixvW1O8YIOPgiNohMFL23S/LgLTj8CDTU/6S9tOL 6J9JJYqCMKVoidJKvSbEuGOQq0fZO/b2qGfxzpnY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MAwXh-1o13hP2d6f-00BNDJ; Sun, 15 May 2022 20:38:38 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:15 +0100 Message-Id: <20220515183834.18771-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:l82w35G4KKvzZ+WDcvOc+KoWUxLLZai1pbkmNaSSb+bJbhStgre QgBCtmyj3GYBiM+1n6KL/8DBP/7mLgMQjGeFvYtJ0o0J2S+cO1bM7UA5Ax5CDQhIOGaQmh7 UPRVjXqtRz8zX3jFwAK5QM0SPrs2EBHe24W+PCFAvxhhWwzPGchuHorpIp/I6uDh8KPL4Hu mqNlyVEi++18YLisAeZSA== X-UI-Out-Filterresults: notjunk:1;V03:K0:SkP31Jieinc=:oxas16fLFexQ9DwKvpFVQ3 N27ZCl73u/9EX8FBo7IPEKRj3ugn03FHhpLsYo1TTrjnM4AWSIaH5UC/YReDN6W7TTFD2LK3X mJDiyKns1xsvVJRd8JgkbTerGYlVAJx7j+7jkeNWWLlZWuFfYaVW+4L1zM4TByZw2aIK4pWRL 7Q+Rr7IIacZV0f3gn5B3qNpbrOWYOt0rrrCk2Da4OVNKyQt1Co2TN4Mv8AyfNpF0vW9tBzmK5 Ut2cmyyJAO9XJa+2Yrpm/V49Jg7Vm26VW0rMtTteVIfYkOSFKINgIMZA21Oz/zQaFYOCSdz8Z n2AnRsG9Bv4D89Xci6DzeIc4WgO21ZjstWe+ppN7r83mBsvyiTugsQ3SIAO+pf+5KXEPWyRhy WnhBHjsUbpWN8qX+sfzkqhOT2pcuq1V/tiqmrDWtEZN1Pd4oVWGFaIUwwUulwPHGjR180NTcS 5CCgF7zEtSJC2ROhNqzAA5kVjGMlJBxCciuJ9Jfm5SAXn/f32n5c7Ef+P4OhW+TqH3ic2k460 AVG5tgTs9jWQ/F1xxgrlM9KSTWPoY5w+MTqiZYxWxbJ7jWBmoVTi47tm2zcsmLv1OT/0bL2Zy 1I7/N/Qtq4y2dLVtQb7hjfJeB/2jxW8WJQT97YzTn8etUPMnUXx7pp3LTKRspS/5FtfxGdOxI Dsk0Pieip6xs0wckFX123Po3H+iNnxyuXNyqmodS9wwIYBkZcFDbdKx8T4XRv4v50wBOjDQgV v+ouG/JDhj3qKUHngSU5IOJpIaGGlcR4z6DNBkC6LePq8JMg4SgHC0GLGbseHN6/B5LseGK2T pn64z0twZ2QU4eI1FYnXjKZl34JXESaJYBShJQ5IpBAoxhZafSZ3dM5Mqm2+Zn8FZR0F2V77c HPHOWzrQllgTCtxAK1eGTDRe3qAWs168EqskH2UbZUpQNQK8P6V0b54BeQLXqgtHSDlIeCOSF /6uC6+AzfoGSW4lajIPynQ4WSLgCto/bxHuqDwDTSGalGPXvbZ5cmwhFcTkqd6BXpC5JrxIDB aDtxGQR8S8fA9sXL4XWVFDpVU9vkveiNULWHmXdkoGFFZwD+o3JZyqRGHeHfHScPA9te3/uVh jDfn5xzzX2EIdk= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d2f8326be0..de90ac2093 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -212,6 +212,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 Sun May 15 18:38:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39384 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 DA57A27BBEB; Sun, 15 May 2022 19:39:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A5F4E27BBEA for ; Sun, 15 May 2022 19:39:26 +0100 (BST) Received: from localhost ([::1]:42132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9J-00029t-RO for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ8z-0001Vi-FR for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56794) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ8z-0008UD-75 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ8z-0006ca-2Q for guix-patches@gnu.org; Sun, 15 May 2022 14:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 09/27] gnu: Add tree-sitter-elixir. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263993325342 (code B ref 49946); Sun, 15 May 2022 18:39:05 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:38:53 +0000 Received: from localhost ([127.0.0.1]:50667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8n-0006aa-49 for submit@debbugs.gnu.org; Sun, 15 May 2022 14:38:53 -0400 Received: from mout.gmx.net ([212.227.17.20]:47239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8e-0006XW-MS for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639919; bh=+EcJWxKS4zZTeOGo8mzEP826baZs28DXdpkyI/EIxwk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=MR3fH7brH3/CVPNcEfOO2ykZFahCcRfst9aU6F45xUQD4w6vDmuzzu17lHCp10uCg quTKwbtMS18H9jgAQADIQm0OGKwMTSyfq4DyU+fXFSMl6Ul8QyPE+CTxFdcR80ngRh Mz+NKqSq1OU23Eug5PQ92c7EGTymyQl24aa+auzQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MWzfl-1oN0R53siH-00XHoL; Sun, 15 May 2022 20:38:39 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:16 +0100 Message-Id: <20220515183834.18771-9-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:CF/b15J/ulnPyx2N6Eks87MhWaUHGUb4UX8ikwNiW9z4XANt0hA AIk88dq3NRObPpF4hFoX19AfygiiNB0YK6eDT67ydxuNv6GOurscSvGE/5EajP+FDzfvyT0 BqX0pgJnvdD29c0rlZXcjA+6TRjJdOwNJa+A9fHwR7KH6Ik/jaMoQpkGIEBEmTIgF25bhwp aCPi9wKmf6Lar4XaABCqg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Eq5uI2lYQRY=:HftbVKlEWsmCX2pf5+Jd4t 3MD3/AJwhsq+xP9IS/xTFOQt0PY+6wsdDk9L/7kIIw6M+38mCks2rzBlx3OAlARAwYV4SPO7l XgdNo7umjYyiORkb+kjSe1hOYZ5nNSS5WKht42zSHkkCLViGAdV6DSDcfB5dNC+A/1Lli5Hz3 NwqfZ609miGMD6KlMOLi79dG+wW3OexewPJVCO1DEqAmTUetta7M5tusZWJQ89vc5Z/67u9He LiHC7dCZHoHvnJ6Fi5az0R1+gH5U9VwM6r8c7rO4UXjS9tFfCiJGEfJ4FWhdnb4eUDmiuwPE8 18a0RQpV5zymqOY3agqvxrpp1sYNZqmPsJAffngL9ZCXW6xlNlwFH1L2q0M10bhkH8TIkYaqi 07nudBI245zQCowm611z4kAbjeZaAu+cyQbK/EwmOFwYNUE1CUCiPg5AjPmk2v06a/ByYciah LP2zvqUQoGx8EhywFoo5nISxfmUvBKUJWJzWCIdfwCRScv7W25FGDHG+NTS3J6xVYfZtK/cBx 6CyPfUbcv4aWuVIu4Yxyq0bwT8ih6vLBq/JfI2RteXX5/TiJtQ4tu0lvlKljrl3IZAusmckpa gLFlll78FYrrFvv9A174p1yT3Srg3rzhyfDiTfbhFeykE2wX3cW12pEpWUep55oFb6PvNRFJV RZjPKq3ETvGjFfVbNbAR7MgbBmEwBfB5HpEIKqaEtDmW7g5ZX58qzEUpR+kpo+g4LtZPsMTsN j95/Dk3ehSt4roZskPWDWLU802dP+Jai/pv/szkBgO/i/a1i+Sdj6xKCglLE4upj1Z3r6UCTK t72IQcTOmHTBDZSKHA9T6800PY22PkA5H9BKlH77AbLjKW6Dp24MHvdJa3MJ3s3iNxolvxF8u gJb3mhU8Dgis2d4mxvCUwOETVzuSPpocTvH3V5LQIHAP31f9o1llvf2fvMP62aConiEZ7tJJq Lkfag4lF+llYgwOZJ4o6uO7CE3oBSS7QG64oM3dM4ZmBVNlT78iiAzHHCSUtE5UhNbgtsT/oC 95PQLnBobaeJaC/+yMbSmWvfy+342Rd1CdhH/UWY5esP/5AzGnbYe0WqRXugrvRpKYcb60kIz AKjLNOexiybKE8= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-elixir): New variable. --- gnu/packages/tree-sitter.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index de90ac2093..18ea00f7cf 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -277,3 +277,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 Sun May 15 18:38: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: 39389 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 ABEE427BBEA; Sun, 15 May 2022 19:39:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7617927BBE9 for ; Sun, 15 May 2022 19:39:40 +0100 (BST) Received: from localhost ([::1]:43152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9X-0002oH-DX for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ91-0001Xu-2q for guix-patches@gnu.org; Sun, 15 May 2022 14:39:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ90-0008UZ-Q2 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ90-0006dD-MA for guix-patches@gnu.org; Sun, 15 May 2022 14:39:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 10/27] gnu: Add tree-sitter-elm. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994325395 (code B ref 49946); Sun, 15 May 2022 18:39:06 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:03 +0000 Received: from localhost ([127.0.0.1]:50674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8w-0006bU-NR for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:03 -0400 Received: from mout.gmx.net ([212.227.17.20]:47781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8f-0006XY-2L for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639919; bh=q1S4lQo3UZSOwAThthf0+pt1mvfdWH5mrrP2p/P5gp0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=fOfrVjDihqR/CU6Hl7vP8RkQ4pJDYnR35G688dNWCYDJPdcbGkG4Fust6zOCstAeG 3cQOM+nEiykfyOaNllJxriDXEhu7fB5z+i2mb+UMnsQU3qtRH49WFeFsXiXlZxtgC/ ET+pUI+946Y4lOhBIZOOMMpKNBI6xHjJNzKGHeZQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mnpru-1nXEzl0sn4-00pMrO; Sun, 15 May 2022 20:38:39 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:17 +0100 Message-Id: <20220515183834.18771-10-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:43ku4LwsHrj6aEKaGT1UDRqhUJFWwFMt1Xdw7Qp489XninmFnFG G2DGcCCc7Ex6ZkLDGfX7+uh3p9FyDeEn03kYtA5Vt459DsnBGt6LyZhz7jz+MMRE54xDeIo XfeOFoCC+7fFSNvYCFB5ZkzOTdaEVPv4ZfW8ISntl3wawvXBxg7+Wn6p5CryAxMrw+/OuZK kYYI3UmdXGvWmssXxlwGQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:eAq0LJYtLc8=:7OnCjK0JuYXbHe2AXCWTzZ Xm0NFoZP3wBrCB2ktSbyiDYDrlqiD1UbT6hE2rQD7ih4xqiLtckWYSVZoIjLwKlF4DhknSZyJ f0KoIU6UqHyc5yQvDyn2H3fniAOnCGAqVbron7AZgvSSggGtP7sot0QnGLlzpGS2bGqZC+z2Z CiNAQuHFYIHiHnxi/NbsuuCGQ3KT2EkuI4/+ybFuOut4cvzr2tYJ5Cvjs7QwU1/JCoagZOuzX ItyyaQy/MWol19onlnbHK+SoJ76QLuAwxNhcCPQYqqMm0UswEV35pS98Pxb7jn9oZsmfGY5r3 zoJIZfOeD2wr6ppBFOQTZrcZ4JRfI2u66Usr6cxu1jD9WyvSosfRMdzbtqZJG5v3EADzdeK0o iDCZBOiNfjgSAWCcqjcAMbjdFzeoN3Mn4Y931MuKkV8akcOT7ebDNf0R3FMBlWtZQiSDcxFGE Gmp0+roX5/udhBw8gnTE95B5new0UsMoesfY+ZgqPwd5sKKhFvdUE9wc8pMDY8+pFK4nTGOLw 24L8grsGC1b13iENML0YE6RzsoEsZ2EuYg8zMXDPukYZCltLnmITbeA0XYuBU/SJ7QAt27c9t QDzRlgknJCEDDjy9OgdiLnDJXxnRvtkpAPcpZ0lv+25/rUgFSixQ3702W6TPLmszUpv4rt/8u n6nu5CNbsmpMUcqzGfwcKrgIahFtNbvk1LNZuJefZLAmlIuQU1WdpwlWcWPl0cJngiZkP4d9k OnIFR5Z8U5KYtjFWFSylPsT3q2vNDyjMCgz0iaInHroTj0AP6TgvVEL6/F6dgWbjhC9IIaJEW l3jypQ7mq2mZi1x+oTWjcspwmxq2iG4qchus3bgDsYE4f9rZWkNAFxaCl4dso2fbVv4ZMVQdo hJoB1PrCbcsRb+Lp/yD1czljbv2AMlecB7BeDKIKI3kaxbdHpY7Bz/rup634nijJIi8h1Iu4F FnFGthquHT0KU/n/c+uIA+qgBC549YfFYWm+Cmb/lqpGPdzb42fcdo+BZJmbjYYH2TVQa2Bag lZltcd0Zi7QAvzRgFBO7kvwJ3xXfXyuTf4Ywe4BHRoFmKhFtPkQqUMhETyD3ojEfLoQ2VRAHS 4l+7SSFIgJrYk8= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-elm): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 18ea00f7cf..0aafaf7c1b 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -303,3 +303,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.5.1") + (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 + "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw")) + (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 Sun May 15 18:38: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: 39387 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 838B527BBEA; Sun, 15 May 2022 19:39:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 548CF27BBE9 for ; Sun, 15 May 2022 19:39:35 +0100 (BST) Received: from localhost ([::1]:42928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9S-0002fZ-FB for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ91-0001ZG-Su for guix-patches@gnu.org; Sun, 15 May 2022 14:39:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ91-0008Ur-Ky for guix-patches@gnu.org; Sun, 15 May 2022 14:39:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ91-0006dW-Hh for guix-patches@gnu.org; Sun, 15 May 2022 14:39:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 11/27] gnu: Add tree-sitter-go. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994325409 (code B ref 49946); Sun, 15 May 2022 18:39:07 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:03 +0000 Received: from localhost ([127.0.0.1]:50676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8x-0006bX-1z for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:03 -0400 Received: from mout.gmx.net ([212.227.17.21]:42661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8f-0006XZ-8c for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639919; bh=t6rduzJr9mwKmI10G82YoLtIpLkoyrVWls/nNsas9vU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bXO5SzR3dTgSfidkN6SGYf+SBL16Jo/j3U8glHavk8CkNMDvAUmBa1oriDI1iIcD8 1gbYEgJEHsBONXC/cu3GOxKYJgIcssAV5UzGKnvoL8dJSX+XUURNkieyYgeRzFNpsr crShHIBjQUaZymiKbgDxASfUiTyL7gSgshfUtDsk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MN5eX-1o8fV425gL-00J1er; Sun, 15 May 2022 20:38:39 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:18 +0100 Message-Id: <20220515183834.18771-11-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:OD005RcLOJxXthPISE2+NES9CcoWv/7iQr3BIs9JhDz/3UUrE8M zBpbZFXUCVbc7Y1nAzIGLkE91P3Z9Z4h7N8IkTw+Bbw9dpok1sSP+W8hH5ghKebsM3eUZGy 1phxrIso9TqBwpo+NjwJvCjGiekiHM7BiQXM72wmXnlOsHZJy5PDW3zaZiPbXlDv4g11yEO mzQFQWZRl8Urx427AqpoA== X-UI-Out-Filterresults: notjunk:1;V03:K0:ywsq/kH3X1g=:01rfFrGUAdvvcqHwZQsYP/ 1Kg3U8KF/+uZC11gvYzKMZGFivqbBQw8tEQSCSrzRRedgpW24XsVnnq9K/rcW19UYgaBpO0zC Im1Go/NWGY9CS8k61mMljGlC0EfFqfkK/URjTz4R2aNPYfvs9lrHbsD2mLyESqLJibX18Zo1i 4z4jW7e2v6j6qrrsGiaQewmczLvRjub9+EPCMw2bQrFaQ9t7ZaikbNIlnrVmrbXt/wr7CeqAg RmhTuIGEvs1lTpN67PRFkdRzLPVahUVyuVIHedATVRFlNrO6NS/wTNrqQpdx4O8pUIvey7zl0 tPE943WtkSDS6Qh8pygnrj8YpYBPYOUJ0xhyun9WeP2LBL2oCdgyIaHcpR+iyemMe4oesO3v2 CIH4KkedmxeUwJ6j11V/7a2SJ+ZaC8OkAvi5KSbr+5czFeldedVbvijTQ1K/Sc1BybD996pPH dta0oDL0DosrT5zKIX+jgC/Kg0JnK0z71YKxHX75ELUuBbw3887hf4KWbrlnB03vb9fu4ppbq 7+dgXq1yMoBdv72ABpV9f1KNEZYruEiL8oSErQnyhtwCblqxGWysyFlX0ewC99QeWTMlWreeX wgmcBgEv/wmHPMuL3P0bsvkFd+lJErQVAZvhQ6HN6M7sK4Qg9RKHjyyhuPf44ASrEG0MW0HFc KmF669zMhKXe4cJMn4LyZlG8DWfwcAmSGmdtEZ0eHYVoUyftXSSVE08zr2TyUdmVnmb3GKioq NJOTcLyX4U9szTFeHH9ml+O+VpV3Uhr5CBQZ/ZpOzejU/A5BIuRIKZZpzaO5BkCfrqt/t6Opl KWRd7ROr8+bf6TSyIFQNJledGj1QKQF45dYqNdpuTVbu48bp6aZvt2DS4ONMIIzIJR9HBLuLy oEEphaDKKeZxXJVO/kPoa1agheCk2VR5NhT/cF8b4ga9DGQt8CijpqVNucuoElXdV0JJA1q3O tbwEKCSmFWvQrkoV74Wc1ilvxcrSEQcdBlFuwYGZBylmOgNL9Id4h9vomv9KL5MXMPouy69xI yQox/ozCMGlt/3qivZrQ6IfFqjFAwvJuBG8C0TmabNlXmDOXpkZzp56CAMvIh3NIsGeRu7VS1 8xlNwVEKo7iq94= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-go): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 0aafaf7c1b..585b44b9f9 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -325,3 +325,25 @@ (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 + (package + (name "tree-sitter-go") + (version "0.19.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x")) + (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 Sun May 15 18:38: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: 39386 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 CF6F327BBEA; Sun, 15 May 2022 19:39:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A416A27BBE9 for ; Sun, 15 May 2022 19:39:29 +0100 (BST) Received: from localhost ([::1]:42404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9M-0002Kk-Pd for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ92-0001Zd-Ek for guix-patches@gnu.org; Sun, 15 May 2022 14:39:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56808) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ92-0008V1-62 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ92-0006dl-3B for guix-patches@gnu.org; Sun, 15 May 2022 14:39:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 12/27] gnu: Add tree-sitter-html. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994325418 (code B ref 49946); Sun, 15 May 2022 18:39:08 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:03 +0000 Received: from localhost ([127.0.0.1]:50679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8x-0006bm-Em for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:03 -0400 Received: from mout.gmx.net ([212.227.17.20]:43203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8f-0006Xa-Il for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639920; bh=QwNtxVlluJ3OnQm7qlniZiUdQiqfuAQz6S9loJ0xKxU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=cqJhKR/WZRswVvQ9ERGfyBMacRG08VEGjC77taPbuwlS/TtflfIqrowOhK4IWVHwW kwWRMOhNhqoqVWdi2i0DWoWV3TcerBWIAa7OwBppeNcnuS6FDpvIXTuNwRujxW51gq GHvxQItHa+MvfDnHSh/nuBQPVY15EaHGSJ9G3wpE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mxm3K-1nh2eX3I6w-00zEEM; Sun, 15 May 2022 20:38:39 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:19 +0100 Message-Id: <20220515183834.18771-12-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ku7e7NyAICjvpALHe6n4xlL9qZ/y6xyg4XBr8pxDV6VUXvvUYjF qmkcq3KUv6MkUr9H6ne198fbnkePbmxVw6Kh/s0jw4KNXzcF1VSh5OY5/pHEtcrJSadTM0t daX6kshSBgimDSDG+np5134YfqXErAQZ5PnwuvrelmJlMXrbr6Ucec6247XnnpUthq53SAQ QeAzIAlEwtF2ObskcVBPg== X-UI-Out-Filterresults: notjunk:1;V03:K0:zqxNw9PyTPE=:KEIC84JXspUn7CicxWXBbD quAV5SSTWF8s/CvG+yBSwtGDJInSuCEernA0jQaRWfRIWdBxB9V/1iWGVOejdBESUiWcZyo+o +bPV8wJzkQwCJ4MvBccsoV6qgZJw+M9OwOPMZzxPbJfGkwmswmVuwWMmPFIj2fp4Ri/7J9wFM lgeKnjkq9KYurJ1ahZZUW/XypP7Z3jvRil1eV5O+hEeKtrILkSm2y+8btaQwSJUu7TN+J+7xA ofrMlPV8DUsjAe3CJByDk4dCCE9NC7/GE+DolbKgN1ysjq8a3KatD1Q8JlUQwyHwFrhDrlaJT Y4pLPdfYNNASYmPNCa5p1WooClCYLEOwkVsITdyWn9XQBQwSNqO1Emy15WRgzEE9gfOVFHmJd ZCL4FysecyckTCt6ad6cFhsO4TVAhNof7XJqskHpWhPXz/HrJ9+M3aqPYQclrQg/bYDhiV3Z6 UudLwFYvTkSr1yRFcUmhQf36MWCWyKt1mtxn/akuDK5sNuAO/nME17/wnSqDu1HAroz5jOsMp qDBOL6BfYBh0BnDR2HAwWhAXGhvdC4tNE8SaOlemlP9KxnH5BHzf7m/+i0rjyZpknSwuPf9sF 7LkYeQ2zwp5jOTIwHB1LYtauXsGlM6peHEkiCriQVsl6XIMXrMcaGoigzxRpTBQfiWSG7X/0P DjF0KoWBenFzrPXM3mq2Aik6bdUXnZVyTM1wnp6ASMb1aq6rwqjasasbDGlXuKqDzb44QEMu3 Rb5IqlvYFmOXmqsmYX8wI3BiUJgOBZLDzlN/cuROK1yExWjlp13shQETpvQ0TDf4C8Hnzj7i8 LgQZAhyDRWrotJUkVDesLQDaCDIzDkLFQuuXPRnrthIoLZ1HMmPWq9+x6NRAAQmKA1U6Je9eI f1Ka14DA4S/JXQIBkoU39tkQQbbv7gWMtWbJE5+aeDh2ieaFWGvJREowjUjMpmTaFDgbUI4pk B1s8wN8mg9ddin1aOq7LWOUEwQmQAJb6hCpi8Je28Wp3OhmyzBIH0dyR0Hu0A5ZTploWj7qjz Ic/bFzyNy/V9ju3DmCNVgckdF31DK/rZlt6cZhQGwHe6AsOgUzInBWK3WhW431XW7XnMJlNOo ReHiqX5hFghCXk= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-html): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 585b44b9f9..15f832f8ca 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -347,3 +347,25 @@ (define-public tree-sitter-go (description "This package provides a Golang 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 Sun May 15 18:38: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: 39391 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 6F11927BBEA; Sun, 15 May 2022 19:39:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3F0E527BBE9 for ; Sun, 15 May 2022 19:39:52 +0100 (BST) Received: from localhost ([::1]:43904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9j-0003IU-EY for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ93-0001bC-2j for guix-patches@gnu.org; Sun, 15 May 2022 14:39:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ92-0008VA-Q0 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ92-0006e0-Mi for guix-patches@gnu.org; Sun, 15 May 2022 14:39:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 13/27] gnu: Add tree-sitter-java. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994425430 (code B ref 49946); Sun, 15 May 2022 18:39:08 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:04 +0000 Received: from localhost ([127.0.0.1]:50681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8x-0006bu-O8 for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:04 -0400 Received: from mout.gmx.net ([212.227.17.21]:41915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8f-0006Xb-So for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639920; bh=BzKyQh/Ljk704tevodvAAUnqbhsH5CabiqEVy2aFQ9s=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=eLpAU8GfY1bdvuDvuxUpKP9er9r83reKFYjpvlzHIqIm4PthOpdrkBvqBFgiGReKC MieSNsT87H+WqO6p6w1HoP52O5FMR2Bp/zJ1TEy0JqI7Qk9I5wUL6h1HiObJCUthUw TZ9qboFqnYQHti38kEX90y/CHdmfiM2Rz5h+IesY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M2f5T-1ntsi70KFT-004Fvn; Sun, 15 May 2022 20:38:40 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:20 +0100 Message-Id: <20220515183834.18771-13-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6S9es+QHUbH+l9mY8GWNye64fMnaHq/5R9hy2k7JIoDjs3BUL76 Msdh4BD25OGoq+JylvqJEROSZPxFlN5Zgda2q21nQ1757tDE90Nk8xzutSkppHRM/rHT7ZG x0jHYLE1rqWoSnuvNae4tl/f02My+Siz2RjPnZy5/unXSluyXaTehu0zZlEQFT4+pg2ph3B sEttttUA3xl4gwSAbrylQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:4mwn9zbf5Oc=:cNM9rM4BGt86Z8nteiCChd DofHBKWiSRvRbJhVjL1HxZR4UPr3O2gk9ja4cwSrjNPuVV0zoR7nZ51eRBfiYQrepaGUiky8Q aU0BuEVhNGKsrp0jOktfe/SnauU1wINVRICHcP/pKbioWAQTHAufeJoYxkmClCoWDeqOy6V+L LOGo2lIQKl31C7JnpXBfdiPxpY/N3Awdlxal0yAi2DrsJnwZJJYHIE8gSkBh75+3st2ef0PUq fL/+//Ur2jlmJRqZZ+QnqWhqV5cD9BOAo123fsXao/1Zg5yoKleR29tC8xgGFmbvWz0+gszK/ gbbYlQDPNtHxxWvZqw9FLHmlkPPVjXE/Ua+UKN8D0m91CqT0J8kVV7LtxME6qTB2q0jRTw8dV Xh6SHd57yKReVi2y5posQowguWouBghDf9oUl/4TVl0BkYtFrgF4ULpRp4aGaq4nQscySbaDZ +FN/7UZKWrJoAaBY3nBOGGBToNz52fgCzw4n0vJZGexAQkWvzbO/bmEZ/F/yzjwq4AeC+ffZV JLU+ClOLd8UnwnXA02gpxSNXSJEop9B2bKtD2VTglGlj58n1/btJEcSoYoWSGhPaVqKYEnRg/ vc4Ol7uDOD8FnwLEEyJrmoRqa+c0uEFnZrScUbD6FlPjJD4v9eH/VdlVsF11ZHf5WGxgW5vkW fTQkEWpe5+1djR0CJKBF84l/ucfAvzhtpO19AllAs4s/IX25OgHROyj0Tp3irXec3lSe9HKZ+ sE0PDpKbI+MdkpDt/5rXP7sc9mc4LiYm9sSztjo1/rh5GAreDcNLxV7earSc0es9I9Z/7UQ6v 9c6rWWGo4rCnqqX6CThEBw+MsKKWs0E92kiYoeKEgm0a44hMR1BWmzmBVDAjsFVh0JqHng8M3 ecmqZdK9kQrQ+J/njBV3smfzAVmM9XNk5ENqeGAOcpKQ1b+oycFhPUWUkVSbjSkQkWZ40elp9 uXZEKHhFZZZnrqd0UccXQCFRsKbe4FaGj0AZelgn5PZ0t/7vjVsdKSqfOBdf3qe3k02GJj+NI j/BG+iprt9eqyRDvQEDh+oJcQpzduaKOG5bgYHbkcdBob2ByZqjFNKEdZGHfHIYqFq6Gf/Ug/ BtUM7+K0iS2vNg= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-java): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 15f832f8ca..010a7c3751 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -369,3 +369,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.19.1") + (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 + "07zw9ygb45hnvlx9qlz7rlz8hc3byjy03d24v72i5iyhpiiwlhvl")) + (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 Sun May 15 18:38: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: 39390 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 9897727BBEA; Sun, 15 May 2022 19:39:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B3F027BBE9 for ; Sun, 15 May 2022 19:39:45 +0100 (BST) Received: from localhost ([::1]:43316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9c-0002ue-KQ for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ93-0001db-RG for guix-patches@gnu.org; Sun, 15 May 2022 14:39:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ93-0008VS-HZ for guix-patches@gnu.org; Sun, 15 May 2022 14:39:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ93-0006eE-DI for guix-patches@gnu.org; Sun, 15 May 2022 14:39:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 14/27] gnu: Add tree-sitter-javascript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994425442 (code B ref 49946); Sun, 15 May 2022 18:39:09 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:04 +0000 Received: from localhost ([127.0.0.1]:50684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8y-0006c7-2u for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:04 -0400 Received: from mout.gmx.net ([212.227.17.22]:36685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8g-0006Xd-5x for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639920; bh=+fezN8gt56Lj4DRO3ppa43OYTz25UULvLVubVgGQG2Q=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bKG1evGCkJEwUolRoTPWAsE2iCPYyx6i4Q2uVR6rWuN8NSWwQP3IxTfdRz+itc74w eSf0pDK0d9HCSM7gpzDqvtEhnbzkklYOB7z4K2z8HtP5tQSSvIfMfC1gtq1KbSXNYs lV4b0t2SyCnP+2zAwR6377GpgqMS9t6zKVEUGyvc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MUXtY-1oGfi41ZFw-00QQ3Y; Sun, 15 May 2022 20:38:40 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:21 +0100 Message-Id: <20220515183834.18771-14-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:J6ivCthOEDxoaCPHu/Cg05RvKISO/+IS0Q9U3JtpyCEesrLJL0o afxWb6CNnih0UC2ZUVNdjC1LuXmIXuROykTnPqsQm/RmAjnKJShXUCmI/VRd2EqpGUh5AsP Zty3f0VHovJSu++FhslcTjq6obvAuu++PqsvFyXSaICan2B8oHtdBmPyAxhshNyrEQmy7oy YY57V8Y2STpdgykXyzv7Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:Ivfn/CDJb8Y=:ALahBkmo07e0pD+aKa+W/B IxjYCWOE2cltJ20nLwdeY50n7udovHGDdCrEhwxMLclf28sYoyXnVjGaFgxPlWy9PaMGSy3lf r6V/G48+6kkWfasKhoM60ECMVHcDVIT9M9xGSl7hofVru+ixtk86iGJdEzSp2yHw2pXMonVuj ZxiWQr8oRZPlDkU3POnkKBClhrJAIfYAYDjniS4+ooI3SIW7M8j6RHY+1kyAaytWweS+9mnMl 08isAdz27M6tsFVXQDIBs71yRnENJDydZfWMO2xT2mf1zabXMjVqsWCmColzRlyJ04QA3uDwy yvxmwJ0azO5cDXn44PTZPt2cKkaLf/PqseATyuNxXUjI2KwRA7tmzEt74iPacUYjPg11VuM+o /kyezdBFIB9lAflqBTHPXeEAz8hkOSBTs+VpQIKZPxKI1F8yCAtRXhs2UtM4eIoZZmqCK+4NT 13OGs7MrQWYdR9oE3s66wOQOsmQQOkd8it6u+/L/kkadBsEb/SlHXzGKyhZROY8q7jTOR7gbM aimFHdkhUCGT6Nl4oTcnUAQYJv/4u3jtYV8Rx1uCJ4FAWsr2wlKKIqjjkGs3Gsq3znbf1s7b6 eRM+SSwuGF5u34H2jeW9F2LfrmVp5nzWk3IEtQJNdskYz8SqlcFovDRphAe2d65TQ71F0SKUw rmjND2mFW/2pninhZp5d65Pa+D44C+xAw7vaayT+d6HbktT3rZOG3daiqUeVvCGTE5k8PfzHr DzM66v9n+tzZ4vEacZgXI2fpK4ilRO2Du/q+GQ6zwji5uvkmL8T6Y9MMNU1XjlWXDu+61DP61 KEXq11tU4wTSRClizS4K32jHHSBMhyLGkTpMDhpasfHO3FM6tnzu7u0yrtgKLtO09KwWj71SS YjsArUwa8VgVH0OwiL9c4J6u32kkWguaztNz87bySDAsj5KwZ9KLG5g40Ax4jH58fl07uLTZ4 ng93FOZ0NyRW1CqiADIQfCDPEXbrVaUZY42hsZDRM0G8NedVxmPOC/uGHw9L4TM0QGsytC5Lj 4IGwXO909Tp75rRYs0QbuPQxmLphzQApMxMvdRrldLIeEeFhe0Smsa+En/hTbO4HdA1iyXLqX onSJ2M59LhIJl0= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-javascript): New variable. --- gnu/packages/tree-sitter.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 010a7c3751..30220a5a8c 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -391,3 +391,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 Sun May 15 18:38: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: 39394 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 6598627BBEA; Sun, 15 May 2022 19:40:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D87B27BBE9 for ; Sun, 15 May 2022 19:40:02 +0100 (BST) Received: from localhost ([::1]:44608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9t-0003kf-89 for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:40:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ94-0001f5-90 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ93-00005L-WD for guix-patches@gnu.org; Sun, 15 May 2022 14:39:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ93-0006eS-U1 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 15/27] gnu: Add tree-sitter-json. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994525453 (code B ref 49946); Sun, 15 May 2022 18:39:09 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:05 +0000 Received: from localhost ([127.0.0.1]:50686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8y-0006cH-CI for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:04 -0400 Received: from mout.gmx.net ([212.227.17.22]:41733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8g-0006Xe-GT for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639920; bh=nnf9EgP5sn2lsJnZ0CQXYvNaTRVvn0G2kVP3cwrrJKo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=PfipJSlBhKFyXlJzqoW2RIsCAvpAHEoXfbP0ZaDaEaARXQCtMDadOZkjgzDmkrQiO iah+yGsuIu3DBYy56QMEaGFb/2rzmE/y7Fty7pAeTYPb/3yoT/HKLUspwxBfplUFUb 3qk7F+7Ysqru/Nx2h4ZgHJ5W4/Fhxru8B2VDcnGU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mdvqg-1nIu3y2j3e-00b6hu; Sun, 15 May 2022 20:38:40 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:22 +0100 Message-Id: <20220515183834.18771-15-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:kM9tGR1mfCleXe6/R09ZeNUDHJ6CcPUSNq+1/1QVetqdZMp3A5P PcXwjmE6hObVWxEgrvh5dB5rQLLU18q1VCCQZHXRXWm54sRO7vGinFiSzb/1PXe7dNiEWNn l4dVrngFBKR6kkcLdKhE3NpCR88xjbCOHcDszUaD/xLAcbfDoXFQIgbfj+b46E6sk7iqj0F TxvyKkyUA/YseiqqhuxdQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:G4ftU30zyG8=:8reXYNz00P4Njd2L5KRn57 yOfW0n41KtuulsAFQQo8qm/bunOFjurLlK4iJTuKFJk86bwcd4l2Ab8YOmFow61/Not0flASE wQ6YYZm1NdPZwZwZpmFRRXMXjMVfha7hTKMtAqVAUvVzH7p+bTjH3TH80yX6ymwLXOyIPAiOT u4x5nMoQebveotRIInAFQQoin4+GjINMhs8n26xS0UjnlpO2SlYBb4oXWDGsSKzpVnwani6r4 cL3eBYEp/tIz+L843QJA+fJfVm0GuU1MnmomHhqHfAoGla382LpShF2CfMWMaR1Cf0YRT1EVk VPpg9Q8KfImsetAXspp/6b2USqHaglgVU5xa/ScbzdQh5a6hOSPUGu8R66Pnp8Q1+O6vO+HwR 2F2ZjJLzSM8OWKidyJ3ZwqTpVWnmFFs/CHT1eqdwgu+0sWmcMJmbmkNePUeXhG3k3yK6l4544 4EAsRo64szV1einQOT/GAiSc1NEC5O9iRQrFUD2kZITscDA3pBPvIMxhMGPPLy9z9OepkJb3l oiB3oEk8QHqVamFccrkugnoJ2uS2k05jVWtaZV7XfMH9u6t1/acrlVVgqcfJzKfWbWU47qIlW Eq+YHhLVxMJjXs1Z66/Xrxd6o4S08dt6KkXiV07hwZZMIOTKYJSoApKE/TtXsiGWxI5E26XmI VYjxKDEYmp4TcbQ7uNf6nweDH4V7AB6db6Ojrm1Pv3u+YxrXne/40WxtEmPFgruAmqUhikoh7 gCxGn3QRNOyrummKjprBgm8uZBzvGVy99MLGD5XR4LlTIlyqdzzaWkVAkSW/y7Ok67syEUZaT g0cZXSgUI1kxRgl1DBr6xudP/l/uRr/NQBjL9AxyZOyFOzUIxqlmvO1HGYeoTrILw0Uqwyh9l PdEU8P/KYMoQGuhhfECG+IuWzfqdky9T9SqAor/8V3Z0yly6EPMbVtZPm5oe08PvXIjgoF+GU z+9eqr0t3m3NWYZ9OdTOvMgyvFVNdASaV3nRnZj6ti/H0OOvhJLLfSAXmbQzNbL0BRKjg/spj w+8hwc2MZv0vn3LSKGNvLWyqNXqdLeIoqCo6uHVd5z6wesCR95SRmV5MLmrd6n6p1Fj+2ar1w U/Z/kpPw6QAM+A= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-json): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 30220a5a8c..d43e16af09 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -414,3 +414,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 Sun May 15 18:38: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: 39397 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 6044B27BBEA; Sun, 15 May 2022 19:40:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3190527BBE9 for ; Sun, 15 May 2022 19:40:59 +0100 (BST) Received: from localhost ([::1]:45300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJAo-0004CU-Be for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:40:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ94-0001gJ-MQ for guix-patches@gnu.org; Sun, 15 May 2022 14:39:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ94-00006q-CP for guix-patches@gnu.org; Sun, 15 May 2022 14:39:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ94-0006eZ-9t for guix-patches@gnu.org; Sun, 15 May 2022 14:39:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 16/27] gnu: Add tree-sitter-julia. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994525466 (code B ref 49946); Sun, 15 May 2022 18:39:10 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:05 +0000 Received: from localhost ([127.0.0.1]:50689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8y-0006cU-QP for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:05 -0400 Received: from mout.gmx.net ([212.227.17.22]:50147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8g-0006Xf-Ph for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639921; bh=WZvF9Q+NpAiRDEA0Z3vOQHaBDlJNHGoIMYrMQYGYZPw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=akzx4vCqRxtx7TAgH3gopk11OhLWO29WmvBi3JXZOLvTmtkSf9HpjtJ8uJCN25evC PkGKNaAO5lmPXhx35gBqUaWBPDEIDxtoo/DmKNtfrYlGx9bck3uLTtRIsEqz/aMLdT GD8VGVbdO7BpImxsFkIVDMT0Sq1VDu4R9npjJMRk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MOiDX-1oFpRH3uyF-00QAWp; Sun, 15 May 2022 20:38:41 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:23 +0100 Message-Id: <20220515183834.18771-16-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:rBUI0gl9RBIbBzyABb/NCojB2tpZaGEQKkE+Xd1IjGKQGVCyFO6 l+GgpPv5EmNwSZpeGeiCj6hsJjVH391KQlbcKS0QrcCm+NCNhaXzX+I82ItUowGjlJtiz3X eWmJRFnJ5hM4fjjPKrUPPQa+ijMhaVNq0cDj+CbxFdopbbqgUtn6R91i3l7ECG3F/UV30Gu YqiY/WRxxKibiQ35Fd4kA== X-UI-Out-Filterresults: notjunk:1;V03:K0:DdwcSGBUDWE=:q3TYJbosLRJxDBGuXIevDG eRb2ShDRgTPMB82Jnvv+RLHXexSyl2r1I+p0/z49eob3hX2SR3R6XETJZcYyh1FT9PN2H5+eX YuBSwXWoREGWZR5p2LJD2PIaU6P4YzlY5WuVvF3vG/Q3Cg64IrYUZYRhmtB9wDGvbVOR6MIVc Vy15bhGbjoaYWGUOnDK9XBt0KQoXAuP5sI8nWtHvCZ2Zlu8ixIQ+VHt7UgFB6cFKKmYdI4Q2s s90JFZ6UOZTPv+pj33h6cKao4QgHBhyoHqHlqEkVeQUBcNzCcsmWV2Msyx2EksGrjC+reoMf4 DvsvrpN0//uoKdTfQaDsBWKEo855zUBbjD9gZd9Lm9Jkoab8Td0HxSn8TURZ2iNd5WYN1HHf1 WpPcVb7qiO5RUWn50qEicRUAET8+HgFXTEyZJTzqMbwtDrGbJn+h5PuZ0kCAEdTWAZWu1TBGc A/Xf+6asAJ8cfDo/D4fZB9R6C54yEhmDlpnrSi5IfOGm/T3H6BMO24rkrhh1iVGccL6tAcylf iTQJV1Lll7hiGdnBqb+LbzlqYCiXpqq165N1eefFiXlfGuUNhfIL6Yd1rVPycXyfQ7da9rO2V 4kYsopfkppUVZEIgq7l1q1tSjiUadx2j9VrqWZyKys4VlUihYeOsdQOCT99OeLq9YR+5rMgG2 dbHSkdlLntGQ5hAv75IfV7pImZpqK4ith8LMmMt6L9AoDviSxaOR+RBTZcp14IrTQrSkSP8pV DBROwEq37tudLeMut+IohwP8gkxk3+ccvJqdLVxnm5ohed9g6RBTH8DExlOlxmQJjyTYeorRq hi6deBBfExFsaxN0hyXR1pzZ/D+TErO0EODTwsEZVwM9wF0CydstfdgezMDAOCU/3MlD+fn56 c/jckSn9QVDBZzU28Faa6N+sVBjpmMUsDpsOI0O5kEthmL3vzPFHu2m7gC9LVwaZ5xVceQYkg f8Sz5LuhLWP2MinaAIyGf1AeCB1HMdFmUFmQO275D21lizWebNvRBzRVVDoiWf9qkBe9IEBir HHJdLr26AgvR20SqFqp9sGmhAljzXR2if6RFCGHQBRddUBt+PhgF4fM0cu9jjY3gSnatxMoJd ahrobGFPsaJk08= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d43e16af09..a535d8bc4a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -436,3 +436,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 Sun May 15 18:38: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: 39392 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 2514427BBEB; Sun, 15 May 2022 19:39:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C33BA27BBE9 for ; Sun, 15 May 2022 19:39:54 +0100 (BST) Received: from localhost ([::1]:44118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9l-0003RD-VE for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ95-0001hu-5E for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ94-000077-NT for guix-patches@gnu.org; Sun, 15 May 2022 14:39:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ94-0006eg-Lk for guix-patches@gnu.org; Sun, 15 May 2022 14:39:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 17/27] gnu: Add tree-sitter-ocaml. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994525475 (code B ref 49946); Sun, 15 May 2022 18:39:10 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:05 +0000 Received: from localhost ([127.0.0.1]:50691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8z-0006cf-5d for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:05 -0400 Received: from mout.gmx.net ([212.227.17.21]:47915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8h-0006Xg-1b for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639921; bh=YM5edGU1bLo9i1mczZiWlxXT/0S71h3oHUjjj709los=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=W99wU/aGlcxH/GM0KBoxRiRMTu06EnIu+9hsnuajl6pyR97cxQqPECt76SEby43qc yTVhaAB4PcqybPLqDDu60C4q4ScHOvXmjvOBvc/vSu9Z3Bhtg1xuc1ZB2t99nLn1Xm KWzIgvwmmaJ5X6xA3xmg1sP06qh6SLpgKIRfiYN0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N4zAy-1niiP70v00-010qno; Sun, 15 May 2022 20:38:41 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:24 +0100 Message-Id: <20220515183834.18771-17-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xwB9Xrrh/9E9TykPjFfqp9aU3C0xRLWYcOaAEnJEhgdOYT/GnGc n5rgnDeoIpt7xIU42lp/oQ2pR2tdERDuvJ57vugla+liLKjTwkIkZhjOJx5PqXGjohCUWtL GI8bN237xQY3ihPlR0A20l2K2roerrWT13Ghp/NMIugkOEiriFMroUKEHb/VZirIJ6kGg4V jS8drbVLVWQ0vJ44XGkYg== X-UI-Out-Filterresults: notjunk:1;V03:K0:9j9aHcRJwRQ=:GP2B2LVRQLothvcLRRj3GZ UpsSZZui35dFLstIToCJnLzux4xQcubKFSlUNyvnabxbR+KcqPQ5e1h8R/HQkTuwFStnnNsRe goFsE3Ew6TgNwoFCcRIWnRWNpJY4APnUncAiUjWZNAqnMIWgaxX2O+nTVdwduVnXOMfCKM7b5 F+eq/z8+kVoPwDqTkaQK+tQdr7uxlIoVwW0JkgtFHEpgCfCWxbbO4REyoq59yZOnPWz18ZnwW 7Bly1T4tnDLl9i23Ba/8tmT02Uu6SCqC6dmbff3aqFk3vykHWVWBVgdz0oTA8/QoC7ApKLwp6 e9LOvokq8l4jx2jJ3BDjzs7u0qwa/3FUabs7TojsTrVwtP+bZO1OrhO6pCDFCTfEZnUZ4x5vy rThrkFM/KI65rdmgPt+T/5RVwjMRHnw6Vv2J4/z1JQms/AQZmaeDyd++roHTacL7rCZ9t0fae ULKt9/gfitsJPn2HsWigqxleC2UX9RRuGhuagN/4IQ+jX9D8+Kyxxj33Vg4YaHQ9kGY/FXfCE mB4mdgg12D6YwanjMbiFxor6QSs7KtOS3JX56XETLuVWhRLMKIxBTJjmQPTAN1q8KRIU+5+Et Y2HHzfwww2XPmcC6uEKd+X+m3TauhWRJ4kF1MZ48c7KArBuAiBDl7PJ0hvfOhHoL/w7v1Ffcx htY6RWdea1duk9pQEJR6ivpfhZc/ZRDu26zMqKn7qm+OvU7bOcBkRCnMN6KfEZFFtytDVAkZs 0AyleewmdiiOLsu8CUs3CpWEdfFASZHKmwKjccp3xY8kw99o78PrVRcRrCUy7QGnR39tKwhkS WoYGfd50RdCDGcwU8agOwsankzYt/F6hDAzdXTWyyfCpoYc/VvZUC5A0Jg3/YCVfzdmn1h8b4 VsgW2VrPwY08Xsv+60BqGSHihaklWmuDpD2RCk3T5xtu8WwyLAzVs5BXzk7lVO6jnhGF8kClF i5ZtzExFgUoiSIW2OkLVSpJC6SSvAfQINVWUJRmBv6fn//XxPI7p5tR0kv43uUYVR+SuPvTMY nKfb7T1VX3eiN4trf7kiMvbE1IDuLVUYj8kxV+WmJRpDR3jShnqRubHG82TXIiVC5MI7VRDbM 0x9xl/ngPw0z+E= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-ocaml): New variable. --- gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index a535d8bc4a..ff98044cc1 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -458,3 +458,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 Sun May 15 18:38: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: 39395 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 473AF27BBEA; Sun, 15 May 2022 19:40:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0B3E227BBE9 for ; Sun, 15 May 2022 19:40:05 +0100 (BST) Received: from localhost ([::1]:44804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9w-0003sI-7N for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:40:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ95-0001jO-F9 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ95-000098-41 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ95-0006eo-2Q for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 18/27] gnu: Add tree-sitter-php. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994625488 (code B ref 49946); Sun, 15 May 2022 18:39:11 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:06 +0000 Received: from localhost ([127.0.0.1]:50694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8z-0006cq-M1 for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from mout.gmx.net ([212.227.17.20]:45129) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8h-0006Xi-AJ for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639921; bh=gFdEHrCOPd3ePMY4gGZSl3Kbu/n8CTI4SP7/QSYJnQ8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LXaCs5UyXzQcT2syXIAcJBycI9pk50R29EkFpFa7qhF0+bomkurtquKpqFIMQk8UM vQ/L0rci5GcMr+rypaW1tzVV+wKZQZTx/dvzx05kKTB8NxPlGG1NX1RQx48R2RwDJo gbtHlskNui78Vgyl7drWKj/Df9ujrExf5Hz5n35U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M9Wyy-1nvpRd27fQ-005bN2; Sun, 15 May 2022 20:38:41 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:25 +0100 Message-Id: <20220515183834.18771-18-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:rlpLj+2/eiel7TxTFGdwIxE88ogqt9pr2bzKEg8ZlQGot03sKcX RT1bfwVqLj79iqsTxVHtc/Qp5QytF1h3wTGAxDF/GRPunK/Iec6sdPTdf842ewdLmsiK1Br D9Goirl5iZIwy03W1Km0CmxY2vGG+pXiLTV/wAh4l1D//yapwMDXs+geBw9ur3jxxuOD7YG djUoH5Vlyh3pQv1j+Vz6w== X-UI-Out-Filterresults: notjunk:1;V03:K0:VuGDFx5JMLU=:bPCDTjtk//hVMsaBYR67PI uvmHaTTwCtCSfDiittrH8LSPHudV4uyIX8QTO8Hi1w0P2lRhA/ywTTkaOnHf2YOrdwLhKoYDF ajgjmpNUL2xgPjSrgnxgev2gRvlS6cZeLoEW/At1zEJiteMOUVi9cAZ9BmOqwwvDBh7Id3H8y n1EFebAfrpEFO2WsNLgSq3yaT/UhpjEyD29E9ge/vaWjPRXPLOPLQaddKIUZPeeGvIOd5jnXf xyp+PJnvCdD1WstWL9YBKO/jICDXIMewxZbiw7CRc8RftghloDNp0atEeEhddVkjMNLxeNR1n z4HvB/+KPK/9oBP7IRYMVv/YndbaVuiAVfk8xfwwh+eWZ8BwRfLTgT849ziqUvWCcFY2L8Lz0 fCPab3PYFD97W4aQC4TIpE2o9VzwZuHb5Uh8Ns2YebI5R/fDJwTt+SscFV3Py1qJkMqHZXnWG /muy/BCMEkti3yZ1eKWtdKrbf9Ga6YYx6G5rK61iODzsdCqGeZub2Fh9C16KpFwbnYv/XWV2K u8yQvTppL4l+4zNUAk6Bfcrex4NbRjELqpKkhuEk9qdXDR5t017iCTdD7lL/aHbBHBWb4boKT M+tT0EdXl1JerY8HgXjIJJQWGHJV0Kq+BvQpAUyMqJhhGQ92IQvcWnKYRrto9e2jBJe7Xwk3z 1gZ1qDTeDi81hOJ8G/HMTSyCBfAw5G/1nD0iJbWendnep/R+dlmKh63QSvKE0MDl2edEPpxnj xD+ecG0+MEnX8+FDkm2zr5zGf3rcZq0X5+huRrlK9zQUCO9bNR8/6nI/njEz+/7mZjRVhr/C9 gaPWXmI3y/mYg+abb6fM0wczLo85PSr5fbLBdDrdiIABbjgdetOls7Q2PbMsyMBSkMtz91OQx yT4zYwJZdC57mGbgWvWi99coowWX4tGvTWx12wIZRuU0+glWpP4vzi62/xrt84Wt5mrm+uxYY h+beDtPo24Qqiv0W8YIuCfKnF7qpI+bXGhRC7WktqR6UUP90sKq9Z7/C3CP1TSewr+1fRy9my J+Kh2ya9CKQFR6gQrLNqoDo9RZz9G7BSpbL6n6YPd2RG5CdpTvmyuxE01L8GDJLKp3s3pUgae VpSOxI/JeUyHN8= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-php): New variable. --- gnu/packages/tree-sitter.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index ff98044cc1..654445f71d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -497,3 +497,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 Sun May 15 18:38: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: 39399 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 592E327BBEA; Sun, 15 May 2022 19:41:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1DB4A27BBE9 for ; Sun, 15 May 2022 19:41:10 +0100 (BST) Received: from localhost ([::1]:45966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJAz-0004fM-AN for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:41:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ95-0001lW-Te for guix-patches@gnu.org; Sun, 15 May 2022 14:39:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ95-00009Y-HZ for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ95-0006ev-FB for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 19/27] gnu: Add tree-sitter-python. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994625500 (code B ref 49946); Sun, 15 May 2022 18:39:11 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:06 +0000 Received: from localhost ([127.0.0.1]:50697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ90-0006d3-67 for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:06 -0400 Received: from mout.gmx.net ([212.227.17.22]:55407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8h-0006Xj-KM for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639922; bh=GfdfhnCuksq7p/nUWFVcopKXe2x38FUN1bZi67NsP9E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=PtPCFfUWFT7YJYwbSTQJpmS2+YnF9XaAQ3me+KXL6c8qMF2k0xmsa7Zdb1ipQbtmO NVKxS0zA5GmvDaO7uwZZlPewO1YXdBFv53EgHcAJIR5hR67UrjdqOfnV3Cw9rLrVGn 3qgCQRGxnpgV42hhGIA4ogEVhLrCMvVKrfXZd2eY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M59GG-1nrPbJ3KaK-001Deq; Sun, 15 May 2022 20:38:41 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:26 +0100 Message-Id: <20220515183834.18771-19-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Ansc1NoNFXndQfs0/ijlI+VXGsAcxyH6WWy2wIELi8gi07mRc+C 6GCF0N0eZ69jnqk79k1IvXAnTzF5o/frCH2rGz94EVNqbCX0V4Zzd05wqGtneP2KygY6SZp 3Bk5FUvNg6I/Q5rY8gured53NQjfTNgMkxKEkq7eUDVKdCY0J1huBFoztLwGlAYgaXnNt+A OlUnD7v6Fo/MblaSEEOiw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Id1AzC7/684=:05v1TiFHK2JNoKrJ0dvCCL 4oF3LzQMKEgL0w7oJRa7ZrllP3na6wUiqJ+M9goLa86AUzIhluCfcsPqNAi25R1C4cl6HWkuY ECzNrSTAtxoAWsO0tQjGOUD31z1fMthUibHQZIrVVlhM5FqCXdcmWSgmg2o/YwvWF3XNNDXcE sNRr7CkPGRNRyO4gQEztw+olyIvZFAZREnhm78TwdFcadGpOEon+gTZ8Fcm8yG3XOsu4ZhmJI I07cW6emQ3POtRjezl4lwPOLgGqJFn/G3loNgHLgPnHnRGEV59Kkq5+0rwpdvlpYnzO3bMdzp FH1moNvX63AB+AzsBPWZipQdnro6y5qDjjUdBqCL+0+kll+iy3OndiqhNU6owt1yW1i7mocbU QD+N6mLGzzjfK9xaVJqI/22U8NquQoFwc/ekcq6wCBWq99pAG6I2fSurjIGJ+8Y+sAbo5nwgk nLYx++aqClMxyj2MI4Jvnz/kyZUCScFVkjfzcS9GIXCCWHqXgAQeWnKz0KlNF1Swx1Q5X9zNq OOThaeEzP0tFWDTP4jmqr2TPNyxotoQhzmGCTr0EWDhRjQz0NAsTM9oxctA7NXZ8iIlehEl6m uSc7ASe4I9fr1grq21ZMfbT1c05fCAS7c+NqBi7a9CWrPNdH4qJUtSgYgxVROVM+0S8oPLh03 smLT/Rqx57W2Kv4wmD7yzkhoVPldIp191OMoW1w1tAJOcXtNP2Xg38jGloLhMgW0RO27kbjXr Oh6XA9efIpUOEG8KbXaeQaZCD5IyBHRD9LaWXv9AhrhRfdN+YZFA+oXHaajg950g4RWkAGX0G YMIQbMd7zJ2pk8C3vWzCdPherCCVMRgRIqdWVUmxWScC+ugP+tR8ewHSbCWeGqBYj200TceTy LUFOAoRqND9b7JrFBcW20Q7+cVDRW1TpJu4t0L1IrczHpoffKIQcLano/UeRXL0yKXE1zpVNT elspxRZreu9PXm8oaifcFgiEvKcMJT2h2RzMQYSsJumv8XcmkUIYEZC2bCtUzIRgY25Wmg3bv ejzZW9/8TuxvjOkDrebGXWrmulCsJWSN3xyHnO54nDnhns5M8MpHyj5m7fpItyZs1tQgxAA7P WSW/LIAdzDgArE= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-python): New variable. --- gnu/packages/tree-sitter.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 654445f71d..c43cafea2d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -527,3 +527,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 Sun May 15 18:38: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: 39393 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 9A0BF27BBE9; Sun, 15 May 2022 19:39:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 61C0027BBEA for ; Sun, 15 May 2022 19:39:55 +0100 (BST) Received: from localhost ([::1]:44170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9m-0003T2-Hp for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:39:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ96-0001mb-9h for guix-patches@gnu.org; Sun, 15 May 2022 14:39:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ95-0000A4-UP for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ95-0006f2-Rq for guix-patches@gnu.org; Sun, 15 May 2022 14:39:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 20/27] gnu: Add tree-sitter-ruby. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994725510 (code B ref 49946); Sun, 15 May 2022 18:39:11 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:07 +0000 Received: from localhost ([127.0.0.1]:50699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ90-0006dC-KL for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:07 -0400 Received: from mout.gmx.net ([212.227.17.21]:46979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8h-0006Xk-Rp for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639922; bh=YteDEIkvxq8C1F01dhU0kDj8ryFQ4AGMA6CaCmA0Y+I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=eZqeoYVg5LcfpuIHCvODSQ69mpQDq2pvDblGVy71R/AaTVYDpKGbRCxHKhlOTlukD 8P50D79z/F8HCmDGAuXQsslw0vdxLyrKuN+7ca8hR5VlU0g02dpNoxjkO0ziuBCi3Z lN4cREmTeyVj7XMqLr8tjJe3FbLvETfiOQaNFB6U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N2E1G-1nlSUm0Nhe-013bxa; Sun, 15 May 2022 20:38:42 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:27 +0100 Message-Id: <20220515183834.18771-20-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:tNnXjbqmNEPd6OlaCV/UrnyIM4l05fZzu8piV5RD2SfWaBrywT4 tO+MkAjoCPAlJclGLCFF6JV4aDL5hVxu6qNHDXIBfnewITCGvypS1jRWaDzRyd9jpnjxv3O VbaCCDZgBYXxZQYCF4RCW8fOoJ4Jm40Rv/5bU+FSQkVBA+QaWf5WcZp7fOq3eWa+rWA3taf GjblZdgKSoRZzBTanx1MQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:9pzN8XwWjQI=:31HX8bOfwRQVDKVxcOzKgg 7dzQoh2SFMl54n2UUF4dm3TPeW3zEhIwO2S3MWx2AeJ/xxUumuGGoGhCI68CXdwfPFrbwTyCX uS7CtD/8s2SDlnRJQhj4kemZo9VZK1D+1j0WtQBptRlsRxtUcIaz9eXjle85Cqy+ezfNSLNpZ r94lbZNtZuGuiTQjFNLJ3htcl9f1UAZHaVknLFxwkWwIQaE5rtSeFmEP2PnVv9ObtNaj4euEb Or1qkU2UaSzF+jqc4WYPOe/WLjp+Ct0qA/p2W/bAjVsW413qnFuTn+EJhAl0RCSZTRr6si5Y2 h7r7M2Pd/C/fqTZtbtV/2n/RJKt+Bk1f20rbs4YtRO5N7pSsx0lgJ6tPWzpE+wbiTC+7T4vXY RG0XRbHXYH1R/YRfoKEXpzwPIPDACJ2HO4mzBol3wxDubuDjIn0sdJuNFj3piWGNPcgFK7pUW tmNUUEMAvmz5zoHjlmj8Ym+hzqCi+UjjqHOwLInynojbDk3mNv6GYDYCAyjpsU8Gb32zpuS+Y H7s7Q/vTJEngVB5TyHHW1KQqMYNh+fhW3MMduD6JV7EZKCMyXeKGQoYXcCIOugL1C5AKOhr2Q dRaqAPYyyZTtA7qAh3xwlisZ5Pz+sppUa5x1c84z+i5V1ZbDAV4Oa9X5/07bg/2EvoZIVBM93 mmW+h/9SHHyMg0g82x1lRikygadfMhGO9u8SHdyVT6OyDrv1kr7LUMAzL4a4chDFEsvgeQa2B 8avZ4a6e9gFCllOJYpOk3nD3g7fLgG9gP9xnVAXV7DpAfDJAD6NBdPiqD41XyBH5HoNcpOcLk zLa8cWlzmjFE33P8Y0x7SwitxksYibpisaAbGYs13csx+Td/JOLOlbKqBWk/heIfCe4lvPoOx XjZjJCCeuHWmDkKAtoFYm1IA6qvhNBzDvAmms1Jn/MQwC+JgI1INzzif7JBb2GwCU3KLHk4En myNDqqe3Kwon6Eg7ZJFCsLYndGU50Wwau/Xzm2HOm43db+L5b+kg0T7ndZtzMblBbtTyVhzLZ 4r4CRphi8+qrtXSuE5UulAwVXGheoWeENS48W2lirf04Qf0SOENyAMZ7+7Rl+gSPu4AZske03 xP1cbeKqV4R6s0= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-ruby): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index c43cafea2d..c7b1998253 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -551,3 +551,25 @@ (define-public tree-sitter-python (description "This package provides a Python 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 Sun May 15 18:38: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: 39403 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 16FA127BBEA; Sun, 15 May 2022 19:44:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D4C4727BBE9 for ; Sun, 15 May 2022 19:44:24 +0100 (BST) Received: from localhost ([::1]:48166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJE8-0006Ke-1u for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:44:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJDm-0006KN-Um for guix-patches@gnu.org; Sun, 15 May 2022 14:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJDm-0001Hz-Kj for guix-patches@gnu.org; Sun, 15 May 2022 14:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJDm-0006oK-FL for guix-patches@gnu.org; Sun, 15 May 2022 14:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 21/27] gnu: Add tree-sitter-rust. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:44: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.165264023626153 (code B ref 49946); Sun, 15 May 2022 18:44:02 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:43:56 +0000 Received: from localhost ([127.0.0.1]:50741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDg-0006nk-0F for submit@debbugs.gnu.org; Sun, 15 May 2022 14:43:56 -0400 Received: from mout.gmx.net ([212.227.17.20]:43483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDZ-0006nL-Jz for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:43:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652640223; bh=qA8wgNvEue8rvtkFy7sxiDRiaUCyD+YoCamN9ACuLs8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=SSzaL9TGpkzV/aQRTQe7zp3ktkKJHdBepa0RrGzWtmUGUBQeJ6olz7Y9DLaxKcNFG G8bEWVXmBzfcmAKhJhf4SWxJM/9J15Ec/s+dEYRuSO4vJnOEchVTm6XEiC78jDYxgA /OygR6HORlZWWuluOn79oQ7cdLK8vMvJOdEXnw3c= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M42nY-1nqJ8c3cMi-0007fW; Sun, 15 May 2022 20:38:43 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:28 +0100 Message-Id: <20220515183834.18771-21-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:vay+A5e/8JWLo332lLY0sdAqU9Sy1vLQF6pSTT+aHx9f6Lpywc/ xt7tEVZN0GzTIkecspB0R6SOkU4jH4XNjWroqz1DNXaWTWm0BTpiSQ5ZNK7SHJCdmPmiF0i 95CR7s6OnzZjf9RortEkmVLP+Jlx0OAn78OOe5GoXIDjCMF0SL33l4L/bnml00lgN02+FkH rFsvHc33neF9yJq/IPRHw== X-UI-Out-Filterresults: notjunk:1;V03:K0:1YNJvzPlIfI=:H3A/3wOYJ18VqjHKVvC/1e CK6HIroLL0dlxiHdou2pzGa1MhYA/YFO9iRfiHbGkbg5Ffb3ASGU3tHrL5rfTmHVFqkX2CJjL U9HSyO6EY1ETUUJu7ndPlmnEnOZI+U036xw8VuAVH9A1M9iIXzgwaGPAxHE/eAQdszJ5MTF+9 JWIfmXTU3gDXlV0t3rZo/We/A4Ljzi0CItmxe175LKV5Jq7ivgkn78hzu23GZanuiFnbx+fU6 4nq3Dz/aAoDWx5VwhczvYX0nEHymcdbyTkvBMTETrZObHYCNewjetvuLhmI+L+lVanbo6amJn pI6B6DMC0wI8t6ECjTdW8onZfH9bpIlQqbD1EIdGPH/q642losBQvV1AK5f996ndVE83h1iy0 v62WfbAZBCmRDBn3FUYyGizRT0ABztMRbiy+qMuNbFsc8jYPy8U32NGeP8UK/Liij53deaKP5 D7r1+Qzx7jtEa6tMtY3BnhGfXammY/XeK0kMVg3zpWe7yj1kuuiYsRfkyqWDOeGBQLGcM1Vn7 qsC9OZ/q6jiBuSxqc1RYEUDnJPevFT7Qs3jJKUoOtu7zOwQlcdEipAe36L1/VoY5BFtftmtKq zcSsY6//FexDKTBTZDm0PqnK3M9YM74f9hIbBiHTBjSB+2GSrWN8MVKF1Z5gGMbkIwrXKEC7v 61fQ1uALxlWRMRSzpsHQa8FI2wj8hJJ2Ti6S2qsKfy0UMOLFkXmsefIToSPpu27OBpsdF8AyJ pULu7c64yMs/OdItV6CSRoEFmPUSn1zf9HHcBrddgGbXWOprc1FrZudFZAAhKL/r8h3cu+MD6 xR9mizs0/UxZEQJQJczv4Lasf0qEP0I08+E2igt3ZCOLyxtQp3h/apB2I2FYkKTlO3oZ5/EUK PVNOhGh7KejA58vcJKz4BUo8KwMxL+2ME6djQnyELeu5wtZVVEfgZJtK1PpBHzBxRL9KxEV2U txMtSbLWFVVELdt09qybTDmxrlxsCXEuP1npY5VpHKQCqn0ZUTKbLh8eTcN0o8NjX4Uo3h89M qYS1Oq/D9safnJlXegi6MP+PiFT9Wvt3+00b+ONbIeMWZyVtJYn2f2B6ase3r/VoaFfCwE77F fWDdvfvfq+jjeiNw3PNSN6MjyS2rmEHtyvJByx16KGU56qcOAGiSIjpTKH5bbCuF/sJA5RDDM KFd5BvUKoc32H4/oKU2BXig+vKH2JeCNWOeJGD8QYizbQSv2e28gT1uBipKWVpn4G141vrVE4 C5hJ1NODATM8v6Nmgq5eCsPXixN1EuQJCT2znWbBeXtJ8JjmI/dfoKbCPIXk= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable. --- gnu/packages/tree-sitter.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index c7b1998253..c37183e131 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -573,3 +573,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 Sun May 15 18:38: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: 39398 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 2787D27BBEA; Sun, 15 May 2022 19:41:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F41127BBE9 for ; Sun, 15 May 2022 19:41:01 +0100 (BST) Received: from localhost ([::1]:45484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJAq-0004Jr-QC for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:41:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ96-0001o0-JO for guix-patches@gnu.org; Sun, 15 May 2022 14:39:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ96-0000C2-AG for guix-patches@gnu.org; Sun, 15 May 2022 14:39:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ96-0006fA-8O for guix-patches@gnu.org; Sun, 15 May 2022 14:39:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 22/27] gnu: Add tree-sitter-typescript. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994725525 (code B ref 49946); Sun, 15 May 2022 18:39:12 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:07 +0000 Received: from localhost ([127.0.0.1]:50702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ91-0006dP-2e for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:07 -0400 Received: from mout.gmx.net ([212.227.17.21]:39131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8j-0006Xt-0z for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639923; bh=YlonIHsU6WCnPES0mZ9XvRhq+5wL1dsjaxX7TUiXt5E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=eD3j4T9tgWQAYVmP2dKgGKp0uKg10Bp393HYkpnHHLFbsOw13RP2ofa5Ct+xzJMvl zaHO3/LLFCiY9W+vE1349PgRxRuWXy03TYH/hER/hXGXXiJP670Sw6RzLawTDBBZJV 0+NeuAfrdbnsJ4WTQ8A2NyUlzQTq6GvNP9K5IpdQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mw9UK-1nZsiV0efs-00s5pm; Sun, 15 May 2022 20:38:43 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:29 +0100 Message-Id: <20220515183834.18771-22-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:vfXGIVhy0tAVAqbcXVwkLH8KQlXsGeXy3/N6hIeuWr9Ifr3OL96 w3qmO5QQ3v6nfyLkxu2HaXffOsSBrjolWYcCCG9cpGwGPjThywvHPwGpf9SIGGXLLPuTjPu Kr5IQruVtEMb0kxpy3t3hgNnOStmpiIaXCAMPPQT6cQ3NswyJ651GGOn5fZqlM+L4ufZkVv bDRmVqgDJ8zoYNntG1HoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:8cbU2RQXiBc=:IXtffQ6j56kTp5IC6224pr St0Mh2QCxHSv/ID9ZPaonuRj/uV8J4HWrAGB2/pJzpMKi8WexbDR8P09b/lynV+CSuY36PU0K Mva1UM0+AQ6SzVCqGUMZflwT/gOR3rVrG8Nhi8sSZ58z7qPfgTcTvP+AA8sAH5T6AuoI3ok7R h0CepOTF1n4t75fVoCZtQ3g4nNv6Y6no9cizORkNisoIqPw/kBTkpQxtNEeEWoTIMNlv00gtm FHA+E85T16MwsjkDsD5CA2j/6lehY4hSaluRu/J+yfaUu1OodR5xOvdCsvz+m05AQhpLAynA4 YPTlH5UVKUIYYgVRT8t7MSgC3c37EGdCe8mSTzWJtuoPtwwgDdK5VwD1FQCAi8VUYCeNvB7fr 9h/gJH3Re4dOH6b34U2WrreiVuT/M6iHMVqJRdtSEfw/oVOKHh82aE+Zr8X5LMsr6G4maWvo3 vTPytvkuIy35NuXz4+tQtSaDO/YMzAHXqBiAGHRjBOKW2K8/9zN2EJh4WCf5F1FolcYSJJo1H dunvvLC90NvqhFSbaPyGWZyMUg5H3VXtLb5C38sntJGhq77YHfYSK/XKfIhZQIG7B/e2tAoRE GgEjTsujtKJ+s4eeApOZfjNnPvKvQv8voTbgZeQcaUs3I9kQOew1jtZDL3oi83RPbI5d9zNRy 9MjthxTgXojmB8XRwY24SNefrCsoslAkQ9HTb2sTaHcxx6948ZJEMadkd3ZxvQ9rMvuGnGDb1 8P7r+fA8gtCkXtN8KWBg9sFWSs40NpORp8oIFm3v5XNUko+Jq+iHrl4g3ciVhtq1wdNrP0GSr Fx8iPUtxzMYHxG/shVcUSF08khsRXahNHhDz2aJVVTJof1MrvSbxWmJ0eZhR++RwgRnljmHSK uipmx1yk7aWwSeOoz1fMfkkCNoxo8JfqIDD51yAQt5pQA8w3M9jbOtsZBcb5H5ssNAbMMZv1h mP8/TKKUHaozwx+S60//9NjA8z3A1P1t2c90VVYV1dQZ3jmtnUICm0WBRHFUErVvootcY/2tE Gh++iT4Tz2Lyan4wd3jzchIMafnyiDaswOYn3lBSyYQ87mS6WGdnfrZdMuOnivv/7EpOs7FoL 5XdwVvvtSXqRYc= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable. --- gnu/packages/tree-sitter.scm | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index c37183e131..04747f47e5 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -595,3 +595,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 Sun May 15 18:38:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39405 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 84D9527BBEA; Sun, 15 May 2022 19:46:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB9CA27BBE9 for ; Sun, 15 May 2022 19:46:28 +0100 (BST) Received: from localhost ([::1]:48616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJG7-0006id-Tv for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:46:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJF6-0006hz-CA for guix-patches@gnu.org; Sun, 15 May 2022 14:45:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJEk-0001P7-JG for guix-patches@gnu.org; Sun, 15 May 2022 14:45:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJEk-0006qI-Fz for guix-patches@gnu.org; Sun, 15 May 2022 14:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 23/27] gnu: Add rust-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.165264024826223 (code B ref 49946); Sun, 15 May 2022 18:45:02 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:44:08 +0000 Received: from localhost ([127.0.0.1]:50747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDq-0006or-4S for submit@debbugs.gnu.org; Sun, 15 May 2022 14:44:08 -0400 Received: from mout.gmx.net ([212.227.17.20]:45367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDZ-0006nK-Jr for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:44:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652640223; bh=mYc4QxerQD6CZjWzT2A4030YAAjJX9gDMJigJNV1VaI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=U3ZHxMcR9TkIwtVHrjiPJcZ2abhygqd2chYtaXAQj4hO7Zjc71973uQEJr7HBrLQU Ju/4d+Pko3vuiUciYdfj5TqftrRAtgF6Ki7neLt1VOpM/LzPm10jFSdciEFWzs1gYg F9pkbFwowDW4tWUVLcvvhVQui+WqNB5WJqUOORP0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MyKHc-1ngUQB1qKy-00ygTe; Sun, 15 May 2022 20:38:43 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:30 +0100 Message-Id: <20220515183834.18771-23-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:i6vOMFocUJH1mPkdjDl+b4/VhA1bN6Piobd/Ziwg/5UUblr9A+S OmtZOzNHbbA5cGwW7YqncYih8fcy6S6sv46eI2A0NlbFXZHEt4U1jUfBDl6IcReaH5H/ug5 c7+9lmGEGh6Jo+Wcr9sdYXA79xfIDN63t3x9uDeHMPonkdD1C9Ss8vQzH0qdAyQUaiGLMD7 zoCiG2dqTvCo4BD0vOyow== X-UI-Out-Filterresults: notjunk:1;V03:K0:zr5IxEU0PUU=:MNqZbHVQ85dEmn8KTaFGvP JQVyOxa7rUaTUKzDVYsjIDLuJOIW5Sf7Ya67caXJP9ekaNJBMgZQOk5dnPwkqCo8km+fvZuPN rBD2AgePjg9y/bp6+ZZERe/mT/bi9nI8cCLtyp07VQ6gcmzIUG8+XIeCzyIDCu33sCqkVyHjo ruASCxX4s9p16joK9y+YbElxQxzv5sSb2qrWm44cZjaRzquMRYvrFksuv3rt9Qi40f0H6YUmo U9rZ6yxwn/GbBLw/b9aG08nJ6qmGfkpn9HJOefTdyT6Vj5y4lLWW2W9oQEnwA9KE6z/rzrZ+M AcgevSXEDs1FBkOJXPGY7pXr2ZkExR13X/gKb8RGoqdUG5tP7k+aiUxmEbT1ydKRCMwQR6gzM wkbMzgoBfiDATSPRZhWXTVhdMvBB5ec6DV9Zfe6kIMjEo6dVsoSppuTh1Xm4eqFigo30EfQqi jDncw+vHxERpo8bTUuwAuaicsvNWBb0zNvask8k3zcO3cnsrphZGYSk624c7YVFm7y97kWYx/ P2juUJe4FcM0wom3HXBWXkLBuPlet49esB9AYTdT0hsretDEnvePT89G8cmfNpfhKEiFv6d60 3HAd0p1Gds3RmRINK0VLbXf08zw1xpDp9n0gHEVaYfBnevA9LH4KPIRUB4pXOmaiNTib24IMi xuxCD2S50x2klwEhNf9GnFCrtk0T+vcN71A7Q3X7MwFMAXYR1rtMvWIaBDpd3nVki85MnpRpg CX7NK9XyIFRju5ehUuwk8I9r5arxYmdJ/D3SGimpW4ZsSDQu3UwGy5P7Lf309eUmEvOrUDAFR zMPneXPpNufCht1VS/9w6PWw1+1XvXJNhwumGD+cAekqzWbM/Oed3AqKHSWOYDp3b7gDkBQKH vumFYBL17qkrLs4mCuKUQArXe61APgkvS5QTBNz0PsU1/ey9Zp/2e5L3nf191WpRKzTiCcSiJ 2uS8pSUp/1FRz6z0hoCUML80JQE1m5fExFhad0RJKa0A9pw001GVXlW3mwxMS18CQqD1UyzAj wIwhb8vzboXoto8IlUtyizUKM8D40oCLkfNtCca1T+l92ttp6D8bFLfq1hVEvMa9d4V2uALGp 0urdueC2uToVcI= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (rust-tree-sitter): New variable. --- gnu/packages/tree-sitter.scm | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 04747f47e5..58ecc445a6 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -23,6 +23,7 @@ (define-module (gnu packages tree-sitter) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix build-system tree-sitter) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) @@ -157,6 +158,44 @@ (define-public tree-sitter-cli This package includes the @command{tree-sitter} command-line tool.") (license license:expat))) +(define-public rust-tree-sitter + (package + (name "rust-tree-sitter") + (version "0.20.6") + (source (origin + (method url-fetch) + (uri (crate-uri "tree-sitter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wcvxgnvj7ga1y7xa7wm0pmabkfj8936ifg8jacd4201cj0vgcq9")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove the runtime library code and dynamically link to + ;; it instead. + (delete-file-recursively "src") + (delete-file "binding_rust/build.rs") + (with-output-to-file "binding_rust/build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=tree-sitter\");~@ + }~%"))) + #t)))) + (build-system cargo-build-system) + (inputs (list tree-sitter)) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-spin" ,rust-spin-0.7)))) + (home-page "https://tree-sitter.github.io/tree-sitter/") + (synopsis "Rust bindings to the Tree-sitter parsing library") + (description "This package provides Rust bindings to the Tree-sitter +parsing library.") + (license license:expat))) + (define tree-sitter-delete-generated-files '(begin (delete-file "binding.gyp") From patchwork Sun May 15 18:38: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: 39404 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 A4F8327BBE9; Sun, 15 May 2022 19:44:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 092BA27BBE9 for ; Sun, 15 May 2022 19:44:26 +0100 (BST) Received: from localhost ([::1]:48196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJE9-0006M0-7E for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJDn-0006KU-5z for guix-patches@gnu.org; Sun, 15 May 2022 14:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJDm-0001I4-Tp for guix-patches@gnu.org; Sun, 15 May 2022 14:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJDm-0006oS-SN for guix-patches@gnu.org; Sun, 15 May 2022 14:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 24/27] gnu: Add rust-tree-sitter-for-emacs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:44: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.165264023726162 (code B ref 49946); Sun, 15 May 2022 18:44:02 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:43:57 +0000 Received: from localhost ([127.0.0.1]:50743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDg-0006nm-8u for submit@debbugs.gnu.org; Sun, 15 May 2022 14:43:57 -0400 Received: from mout.gmx.net ([212.227.17.20]:44473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJDZ-0006nM-S6 for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:43:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652640224; bh=y/ECVwaHOny3TmX/UyPrdkgjwEF4tIZfluzAOATGwr0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=HSIr0qLh9R6/mdDlqWGrFlIVgbY+mb7Q18V/Fvb38cssj/1L30L3RO7720sE2ZISg 5Jx8cIom68czDzPoB8xX8wAne17KRnq6/gA8EgFCq4YT6NgW7dFerH89p+5V8sH2H3 /+LkdqNgguX9nX9Uoc5VGeUTHFd1ZtvzxT252rMA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MOiDX-1oFpRE2yER-00QAbd; Sun, 15 May 2022 20:38:43 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:31 +0100 Message-Id: <20220515183834.18771-24-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6+sS+4eXz3wBz+G7eJ2I5PG5bZzluuXc89cugbHLuewkB+vDr0Q 0OvhgsHL8u6q1aWLhhcnQqd5syU3uXPPtDjKLGa6zXc48M5wuQ35Dlr/2x26GsDlxS+IUbz +fLweWwy+pSrTf/oSx4OC+Na3zvHmr1S5rwagLjAVr962WVCmxF8Ru0xHesGs28QDG1EXff Vco6a8S/mOQJskcnih3FA== X-UI-Out-Filterresults: notjunk:1;V03:K0:cAdn0MrGAIg=:IYqsPnPArKd1ye8QsJ/WjL ymVqh+S3MEASI3XL804bXkoqY0WyNZE3Q7sy7YEblgK1cSOgI1xqKAyRwTtgzJTI6se7cFhLG K2Ljip4gDTqExec0jGN3nEejG30XfDT7AumksVXTaDoiloP0VOXuwpb51sKSBGqOoqJrLwK8L pMRQqiwNeRljrlQ/bjrjdALq0Ma9lG4b4UM/UHO4mPugyZwPnLQf/FaFNAxTZgE7jWrIWnQ3U yI3MAAftCzTdNlQehtmXp9emjDQx/hKVChfEA6IMusgsyz/edWe5brRNYmZvZFR7UEf+IAcT3 kGqWNLImhVyG5PswkbdxNf4lC4z3zOSIL+LarfQF1u9l18WKBzwDO6XrcVuShi1J1Sx9GidAx x1mVw1AW+DsPXvEg+QO+GjuuVDhOOiZsYe88RC4rWqWFJPp/8gWpd+uFT42FfNJg8CtUrG6/0 6EcBIpqpfVkeZ3tD2UjMl2mUojE9yEClomJIyK5+o5keSXwnPDGwI40b97sB8M/1syYxcXYdG KclmdQb1YC7s7LMckbTr4gwXxy0hKn4Ku+DXERtpl1qZDd+nwLnRXJCRFjHyjs/ooN0O0CsXy U1Df7PfdEGVcf6Urg7OJH1uX1Wa03/SOEYWeWOEPQwENCj0OvJxqPk+a19mWirQ+6GaMKIbQE def88QOOyG+jqlaXeb5TEx2OCRmBAqEklK7drgvQdykG69zOLag16txli6I41XAGkHL8mxz6x XiPIghB/oHcndTEkM6RMv4ApFEO6D3togNXtSp2rVQh1g6WAaHoLeVDBWLZWoDgWykMyuQuNx U3DCIIvGcXcI1nm8PE7wFyEtE5gZA98LsSIPnnWcfJDZXYYGsxZbpHbyT1In8wuq4FpQy2IM3 cQiPasw+k88aFjMZGHeUhgjYN4wx/D94XwqvKiXmj1KPgDeY6LA8oTiHEet38WEoP7VUxzk2a VY11cnmh6m0lHsjnH9DMi5SP5kX5ya3Q9vZXlF+sQqulnoqXxtUF438rP/aDg66DuU3YPXzZF 88bZCynZhg0zfxWWW4UOw9JWuaXhgqxlgPbSU+OK5wPK1X5p14qoBlAg5JlrmYIpZ9L8LqKgK o82QKTdCn+w5SI= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (rust-tree-sitter-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 -- 2.36.0 diff --git a/gnu/local.mk b/gnu/local.mk index 429a0b577b..7681eda58d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1787,6 +1787,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-shell2batch-lint-fix.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 58ecc445a6..4d1d3b2177 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 Sun May 15 18:38: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: 39401 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 5907D27BBEA; Sun, 15 May 2022 19:41:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D5DF627BBE9 for ; Sun, 15 May 2022 19:41:32 +0100 (BST) Received: from localhost ([::1]:46648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJBM-0005DO-10 for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:41:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ97-0001pi-1f for guix-patches@gnu.org; Sun, 15 May 2022 14:39:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ96-0000CE-NJ for guix-patches@gnu.org; Sun, 15 May 2022 14:39:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ96-0006fH-LL for guix-patches@gnu.org; Sun, 15 May 2022 14:39:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 25/27] gnu: Add emacs-tree-sitter-core. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39: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.165263994825539 (code B ref 49946); Sun, 15 May 2022 18:39:12 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:08 +0000 Received: from localhost ([127.0.0.1]:50704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ91-0006db-KL for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:08 -0400 Received: from mout.gmx.net ([212.227.17.20]:33919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8j-0006Y6-PV for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639924; bh=xHOSSWPINNYi0eI7mVvQieRMCRpqcVSb2xGp9ucsqeQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=S1YcqnRAPreeK27xwtA0yI/zGMVhBk1O3qsCIucxW1UeBYOQZLWBuEQFVDBrb+0J4 JZJlvEwS/mQgdyp3DrmGe2Ner9mogmotZJwfdxM7rVlPZK8/ocXlaNPb9jNiLMZeiK uIjkjqBy7Jaz2YwGPjCLOXdBVlhsJRi9063SHDA0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MHoRK-1o5DMb47oU-00EvF6; Sun, 15 May 2022 20:38:44 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:32 +0100 Message-Id: <20220515183834.18771-25-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:tZY4NKm3Xfe5xiEq01Ayivu6b2xDwf8iCVbZjzE5WScCyYx+hW/ FeOgTYp07RK/aaXSxcrqqS80RWIcneF4XwuPC2e0yKzSdx/S6iBZe8MCfoT2N5/cXensOKv IGRtzcXzEQlEweZLiqSWS3O0yf5/1kaktR8bunI+SPjPjxGXn10z8NZtA21zstncNV4cXfd b2A3DlgEibx64sGiJn1Mg== X-UI-Out-Filterresults: notjunk:1;V03:K0:le14dKRT1Nw=:M4YmfSA/l3BgnYl6r2M6bT BF0T15OKO1Nb7SeNCkqHOtEloxeEvr1N9VF/uZXOnYv5GaFOEMX7lWRmg7koZ4xnyNDMPgJ2M c3BH2Ut6QQ4Ejt3r4+NZGIreqkRQYgcSNCtdn/WOlpPLEvblNyILxCkeviWzmnmvOLJT2O825 gcs/76SF+j8U9HzVzlCwqqPTOp1NGpp+4Rv/sxacj/ysKVG3E1EJxcxkT1UsAFQpRhZ57Y8K1 JBkC27U85zn1qsekj8uNB3qaaZdNlRZr2ptGuU8Cucx4ydK6oHOTgDhGzoWPU2enjBr+D3zpP 6RfC1JlKGqd0jXQZkmM1RpCQkyfxFLPqO0xHMFad2ubqgJuRantMIjL0SwRXfJhfStcPBlCz9 FfeF8QhfSP2fL0BbnDyz4SVHL0pdx8SoKECyHaciNk2whpX280FnkUh9Q2xs91lTXRXGkdqFQ rUtBPTmmTYe4SoDRp8azjiqAyNyiV9OL/70r2lqofcJpj2lEjxrZBTSz0MhbUjdYPq+OX7V/L o0quPFox6dp/bS9BmFVy0Hskif1JzMjmlYSUwCBHXVck/x+DN/UgokzXtzPHf4EX/ri8/52a0 j4Zo9XeY47LJZY5cyEPx6EogSqaauAsFHRSUCPu1GnrZpU8OqlXhOTSJwe3f4L3YfXlKh45W7 O3xSi8t577myhECFfTez/Bm2AOVU7ZMGTI3OaVHMaOjKSKBCokmH/PBZjFP23h+048c8MMDui oqDAnoVD6lKVcprt9o917JJXk01HbyOfTRPXmOzJZOKE6LouBQWhiGIOmmhWJdt953HqFvNED 4W1nIz1x0sVG8k8XXMLpvFkkbxZ8KYC2ToIpiHPCpiyzB7vN8zGhKPgEpGQeA4RpPY0sRapJI 5hPeL/1LhNeKsj4qOhZX4O1K5kF7JJj4MzOqzFzEMaYcJ+8JsTycpV921wyLEZ4TbGK0tesZ9 0KugFc9/ZwBsDHaSd3tYVA5nA1AmjgrYYBzBcl5/t7/i0EzRqZWksdfEbiUgFYzcws8g+XcXr Ny6LMfDdMdkRYRY6AC0q+/jVUqS/G22+OPQd52E80j/kSrwswpFhO2/sOuzW4Un9TAOxWALVa Nkk2FqI+vP0IeA= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local variable. (emacs-tree-sitter-core): New variable. --- gnu/packages/tree-sitter.scm | 84 ++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 4d1d3b2177..3e01474285 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) @@ -686,3 +687,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 Sun May 15 18:38: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: 39400 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 0337D27BBEA; Sun, 15 May 2022 19:41:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8EEAD27BBE9 for ; Sun, 15 May 2022 19:41:27 +0100 (BST) Received: from localhost ([::1]:46152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJBF-0004ma-P9 for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:41:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ97-0001rB-Eo for guix-patches@gnu.org; Sun, 15 May 2022 14:39:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ97-0000CS-3r for guix-patches@gnu.org; Sun, 15 May 2022 14:39:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ97-0006fO-1t for guix-patches@gnu.org; Sun, 15 May 2022 14:39:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 26/27] gnu: Add emacs-tree-sitter. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39:13 +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.165263994825554 (code B ref 49946); Sun, 15 May 2022 18:39:13 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:08 +0000 Received: from localhost ([127.0.0.1]:50708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ92-0006ds-8a for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:08 -0400 Received: from mout.gmx.net ([212.227.17.20]:35033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8k-0006YC-3M for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639924; bh=7NTaIGtcFq/iCfGpWV3zcOgFXnXsVcDerwnUrsVPyGI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=QSNoskom65OTe2wukvJwlaknoy/6Gqju4D7YppcgYkKnjt9r5Hxj2RkGOshI7fX0w 0LXQLZScGYKE4hAZwU/aoxFPHVNEX3y9uu+HxMeTTL/rkw8+vQjmIxfrbiAgi2kaxm 1suvwFV04J3jnelMMzlTl2AWM02k60MEmH83QQWw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M3UZG-1nqrN0163u-000fdI; Sun, 15 May 2022 20:38:44 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:33 +0100 Message-Id: <20220515183834.18771-26-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Az0wfarDMeEyomzrSEdUgfDSHzyIxyptFoU9B+JdQTyoXCcepko wTc53KdJFUesaAXKE4jjMdGcv20F1DUgZQ1nCLLEKJiEEZZUR4r7ZBZisw4tdFvZRpDbonV CzD9iHDTw+LTb2avNyl8H8S7aV16tGrEtu7gQCE/KVQj10Hom/I0GFNSXOKS52XH1jLt4pc Jk1NkSkoap0crF5jLTgHw== X-UI-Out-Filterresults: notjunk:1;V03:K0:j4/I1vKrxTY=:si2XHgSPhC+7jssWjtPzUA 8F2z5ezgq2e0g+kFuPZV8clS8frekgT/iUyHssgxGv4PDNyCZTezscAg+12cDn6v+prv7Aw0d Gitn83e3qkTsgGZEEBXCMbTb8CozeyX/bSBdNyaL5zWx94RBQyWkSzjBnXXHPa6KYZlO3ctzQ yaJnuuyvwAbz0rCHyFa7vvHam4RLwk0R2sklA5lppCIVepOZoowwgWnHH/3XPfa2lKCitEwkT srL/8DWVTUVA8OJZnXhDp+XbQpU0pifPE6V3qmasFkSJvSfI7dZMesQbVH+YuXKQDR6hHa439 w1vYoYqCL9uuQG4VK/OyndKDy8Bv6AQiVKRbm4fgFpX1EJ6Yl3RdSWNxZPNEZ6iOCYjk74gU6 XLJ3ShqpKwdGp0LLPV41F9PKxZesliBo5smYl374x8Z/5tg/ILz0LRPN52/n7N/2IS6UpTyaZ dQnrHK6bjy5ghh6skPF0d7NtxPxac82OWVc0KGzeBEtM+1L5zseH0ZjE0y5NtR+eoIShtDOZ/ pdAxtDkYhCefNhXSrsY5KimQqNRB4+eT29joXh0QuhzcHuxyyAotMu+V3gI9VKXmJxVYl5NTQ VanXH6FekGpwIXGvPTDsKC+VAk3UY6h6LOQce/TkzdMi1xI1xuj2yKCRdqZ/bP5WzaEHEtOeO BvbraB5ywf6n0KG9yqidj1qB8odhl1I4+rsyvy+9lcJDXkxRcjr7zzKyH66sTuutFtnwvZpkI aWU8lLSThxwiTcTzsiBzdLs/7/QSHzX0gzSnaSjK5x+8SotO7u9ByOqkgimwt+2Qsdron8agN S8LiuZp+mMW1w8eOOPZQsSUzIDzgWYPkmkOC8/aEz9uVa0VQbsLESN6Eqd2PEZ4eQfTKATqlK G73QB77YjgoXbhYNKuQqwP3yDL7RH9/e9B8+RiO9zUuVFRF6J3SQbPlQ9mBa3gdPe1hSMt2HT ZdnFODkMQPFYJjcggCcplzHSsqdYs3G4//dbhVJtUyg1lAkvHedf6K29MxwQXyUPDBxWZ7YRg EYpJ75Re87W0vhljaEc1E794j1RckmDs9OMYQ7TleSatI4aqY07HpT2Lx/fCQU8805rM/W63i nBPHna4wN6rAkw= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (emacs-tree-sitter): New variable. --- gnu/packages/tree-sitter.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 3e01474285..cb3f326367 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -770,3 +770,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 Sun May 15 18:38: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: 39396 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 6A80A27BBEA; Sun, 15 May 2022 19:40:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C8A3727BBE9 for ; Sun, 15 May 2022 19:40:05 +0100 (BST) Received: from localhost ([::1]:44842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqJ9w-0003tq-WB for patchwork@mira.cbaines.net; Sun, 15 May 2022 14:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqJ97-0001sw-R7 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqJ97-0000Ce-Gd for guix-patches@gnu.org; Sun, 15 May 2022 14:39:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqJ97-0006fW-E0 for guix-patches@gnu.org; Sun, 15 May 2022 14:39:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v6 27/27] gnu: Add emacs-tree-sitter-langs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 18:39:13 +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.165263994925566 (code B ref 49946); Sun, 15 May 2022 18:39:13 +0000 Received: (at 49946) by debbugs.gnu.org; 15 May 2022 18:39:09 +0000 Received: from localhost ([127.0.0.1]:50710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ92-0006e3-NJ for submit@debbugs.gnu.org; Sun, 15 May 2022 14:39:09 -0400 Received: from mout.gmx.net ([212.227.17.20]:48423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqJ8k-0006YD-DC for 49946@debbugs.gnu.org; Sun, 15 May 2022 14:38:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652639924; bh=rzjUKvyN2JiF/2ShQClfYtFdkOYOOpQkYHzaM+yOqTw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EcBfsyvTO6Fnt//3Q5FtqFwEA86RXdpB7HR+xAiv/CmJA4mxsgccSPahbGkjsLXNV OU3CtOZ9mai2eewU5DlYLgHbw4JCTCEorms2wBykSN4fIw7Q3lDo8y44Jfrc2peiOf J3wUbtlBvTRPS+uoB8lqmRYS3UielPpOppPPGlMw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MDQic-1o0nWE2GjG-00AXWO; Sun, 15 May 2022 20:38:44 +0200 From: Pierre Langlois Date: Sun, 15 May 2022 19:38:34 +0100 Message-Id: <20220515183834.18771-27-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515183834.18771-1-pierre.langlois@gmx.com> References: <87mtfi63ut.fsf@gmx.com> <20220515183834.18771-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:DRh/8TP3dGHfCCtrS61RCGkLTm0dYGvZf3Cq8kgL7kebeYBJy37 7MU5NdNVVyh+cPJl3h+vMjwIyyZxvxSjHn4TvqPk1HnzZ3OdUbnfHwZIlsgRxZtdQG07htu RRtzsyRuyNf+WDgJA15jPQ7jxaQgTQkOsPXmPT+Fc2QRHiNJlYzKmxcBIhfyKmKEywSPwAs tnO6/TH5pEd2i6Dv4yyxg== X-UI-Out-Filterresults: notjunk:1;V03:K0:nOUgpELOlNY=:qIM9NglQq9hk7Vwr3Nrz7T O1DgwRqOwfpOQp4TK2F7SV+4F5shZSsBURocBOKp3O4FN30AlDLiS4c0GGNBgx57GKdKNllOP Nui0J4Kk7bWE4p+SZ9CijE3KMannbjvPuqIiWiDJHW1kzNzoFSfn/1I116DUnAMK7DBCle2b2 BE72E1WAXXD9wH+k4zQ5zOpmf6lvV1iYRnKXGJ/tTe32Bjwovxc+l634bRpFK9OzhKwoS6e2j QDlSg5fhE1d7KjHzT26EMQhhVg9nZQscaGAd4zTpnH0loreLkeR+rMjVmXlA3VQjHgSCZD1uV o189ndJZHZXKjR4G2paIVgpv1ga9gY8mYDPZeF6rzcJUc14DhmkmQ9nKIO3exLJHyYM/aoGTy 6nJ74aNg0NpP/J34VHuV0wAurE2/fBCNiZ+g8P5KQ2RKwkKHyAKuFRa3ej6NWMBDyj2V1S5TS RM/+GOYyUAEZ6byAd4oQiavP53wxw9p/Nk4NOH8us4pcxlJJ7DGOj7hjOmbxnmK4VRp4cy9bx DiJf/ahNrXAifiTyS/SZ6gGhJwOhyzxOEv822Fnn6OeoJ/K1w1igsHlxA2cZMUwF4r98ztUJ2 /hE7wYrDx2iQmbNAxuBzMVllCuHUNN2z39gkPCiXSkr1s9F9ZanQOOMjLvgnJXXIeZvGa90IS GBnxbEdaazeOwnSo7ZjnQ/rSAqsRKLeFQfNF6703ZiCEYIbVtwGZ5TUaFOI7Vp6aUGs9Qwm94 Llh0+ZHL/dfPG5mKbs1fF8bYeYAXLLERazrDKCeddu7qhpQlLf3c1mFL9YCGSit+U8ymr4BFt GDyw3BBDKoL77UVGGtFwSFbWK/B5P3c8NkCHIXUoly2LFiQoWPvSlqomQw1FJAazpu71vPZQm K2BxXddy4pVR7ZkbHOePD2HLisAPDfIW8r8XG9FRqsgA0Zz01Ughxi97t4rIa3AXN0S5EqQB5 cJ0hCN1/Ys18FM9QWexPjwuyLLyAs1lJNbVTqkMMu7Bc9QAMWCAy6uegwuOU8n9puQRrgn3ud 6MIsn3f+akBbdH4TKFaxMm/3c6PjkHCus1ZnLDi3+K+NL1bon+rdloecFjIP5PKCVYvaaJu5e wVao6x0A8Npleo= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (make-emacs-tree-sitter-langs-grammar-bundle): New procedure. (emacs-tree-sitter-langs): New variable. --- gnu/packages/tree-sitter.scm | 148 +++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) -- 2.36.0 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index cb3f326367..b80d912bfc 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) @@ -797,3 +798,150 @@ (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-html + tree-sitter-java + tree-sitter-javascript + tree-sitter-json + tree-sitter-julia + tree-sitter-ocaml + tree-sitter-php + tree-sitter-python + 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.0") + (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 + "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp")))) + (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)))