From patchwork Thu Oct 19 15:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55035 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 B0A3E27BBE9; Thu, 19 Oct 2023 16: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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 0392727BBE2 for ; Thu, 19 Oct 2023 16:44:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtVBb-0004a9-O1; Thu, 19 Oct 2023 11:43:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtVBS-0004K1-Nt for guix-patches@gnu.org; Thu, 19 Oct 2023 11:43:39 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtVBS-0003FC-EF for guix-patches@gnu.org; Thu, 19 Oct 2023 11:43:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtVBq-0005tt-Ga; Thu, 19 Oct 2023 11:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64905] [PATCH v5 00/10] Update tree-sitter{, -{c{, pp, -sharp}, go, {java, type}script, python}}, Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, mail@cbaines.net, andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64905@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain , Christopher Baines , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Hilton Chain , Christopher Baines , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 64905-submit@debbugs.gnu.org id=B64905.169773022122647 (code B ref 64905); Thu, 19 Oct 2023 15:44:02 +0000 Received: (at 64905) by debbugs.gnu.org; 19 Oct 2023 15:43:41 +0000 Received: from localhost ([127.0.0.1]:37529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtVBV-0005tD-7M for submit@debbugs.gnu.org; Thu, 19 Oct 2023 11:43:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:39386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtVBR-0005t0-4L for 64905@debbugs.gnu.org; Thu, 19 Oct 2023 11:43:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1697730042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eYIKWT3BlrabJqE804jcno7TOoJkzgDCv3yOy67i+7U=; b=RnnvpeVogmJl+FOwy1plfvAhxw67DN0cZzP0X+1rovKCEmazFkyX+GOGvW9YwgSmnqfgWV r8Rw4SFLhh7NssMPPajh30TFZ3zvJfJJqUcDC5OvRgfHV/DrHKqJcBl2yq0Hs5LqZhVoxE kx8AxQ+unXyBSvpvcbQhpJAB2knBZh2AwSxQGiGtTgpYNt2edm+qPfg2IxTWdl2vuh667A ZsD+123Ad7CxYrzeQ+Tn00Xo/Iq5OdH2CXhmsFld+AK4hqkWAA5jnpEFqDruUl53/GPEVs mKKm0Ek65A8dqudpJiYyG0hqA5be3gadwblfw68Mt3nuZcYw6fj1zBsaZWKc7g== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Thu, 19 Oct 2023 23:41:10 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: + 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches V4 -> V5: - tree-sitter-bash@0.20.4, tree-sitter-javascript: Remove binary file from source. V3 -> V4: - tree-sitter-bash@0.20.0, tree-sitter-c@0.20.6, tree-sitter-cpp@0.20.3, tree-sitter-python@0.20.4, tree-sitter-rust@0.20.4. V2 -> V3: - tree-sitter-c@0.20.5. - Re-indent code in a separate commit to produce more readable diffs. V1 -> V2: - Merge tree-sitter-javascript and tree-sitter-typescript updates into one commit. - Merge tree-sitter-c and tree-sitter-cpp updates into one commit. Each case updating the former package breaks build of the latter's old version. Hilton Chain (10): gnu: tree-sitter: Update to 0.20.10. gnu: tree-sitter-bash: Update to 0.20.4. gnu: tree-sitter-c-sharp: Update to 0.20.0. gnu: tree-sitter-javascript: Update to 0.20.0-22.f772967. gnu: tree-sitter-typescript: Update to 0.20.3. gnu: tree-sitter-python: Update to 0.20.4. gnu: tree-sitter-cpp: Update to 0.20.3. gnu: tree-sitter-go: Update to 0.20.0. gnu: tree-sitter-rust: Update to 0.20.4. gnu: tree-sitter: Re-indent. gnu/packages/tree-sitter.scm | 110 +++++++++++++++++++---------------- 1 file changed, 59 insertions(+), 51 deletions(-) base-commit: c065da01ff956d3c2bdfc45a33d910e509a211d9 --- 2.41.0 v4...v5 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 29b180026c..41257d42f1 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -96,38 +96,36 @@ (define-public python-tree-sitter (license license:expat))) (define-public tree-sitter - ;; Untagged - (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad")) - (package - (name "tree-sitter") - (version "0.20.10") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tree-sitter/tree-sitter") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy")) - (modules '((guix build utils))) - (snippet #~(begin - ;; Remove bundled ICU parts - (delete-file-recursively "lib/src/unicode"))))) - (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 + (package + (name "tree-sitter") + (version "0.20.10") ;untagged + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter") + (commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy")) + (modules '((guix build utils))) + (snippet #~(begin + ;; Remove bundled ICU parts + (delete-file-recursively "lib/src/unicode"))))) + (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. @@ -142,7 +140,7 @@ (define-public tree-sitter @end itemize This package includes the @code{libtree-sitter} runtime library.") - (license license:expat)))) + (license license:expat))) (define-public tree-sitter-cli (package @@ -319,20 +317,35 @@ (define-public tree-sitter-html "0.19.0")) (define-public tree-sitter-javascript - ;; Required by tree-sitter-typescript. - (let ((commit "7a29d06274b7cf87d643212a433d970b73969016") - (revision "14")) + ;; Commit required by tree-sitter-typescript 0.20.3. + (let ((commit "f772967f7b7bc7c28f845be2420a38472b16a8ee") + (revision "22")) (tree-sitter-grammar "javascript" "JavaScript(JSX)" - "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw" + "0vp7z57scpbcvyxpya06lnpz9f5kjdb66wjlkrp684xwjjgq1wxd" (git-version "0.20.0" revision commit) - #:commit commit))) + #:commit commit + #:get-cleanup-snippet + (lambda (grammar-directories) + #~(begin + (use-modules (guix build utils)) + (delete-file "tree-sitter-javascript.wasm") + (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"))) + '#$grammar-directories)))))) (define-public tree-sitter-typescript (tree-sitter-grammar "typescript" "TypeScript and TSX" - "0934c35as3wgakqw20ilii8lvby5ns36mmqsxjwz8zg5zfsq14vj" - "0.20.2" + "08k785q3cy8byrb3zrg93mfidnj1pcx1ggm1xhd8rgmfs2v6jns5" + "0.20.3" #:inputs (list tree-sitter-javascript) #:grammar-directories '("typescript" "tsx"))) @@ -377,14 +390,14 @@ (define-public tree-sitter-elixir ;; No tags at all, version in the source code is 0.19.0 (let ((commit "b20eaa75565243c50be5e35e253d8beb58f45d56") (revision "0")) - (tree-sitter-grammar - "elixir" "Elixir" - "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" - (git-version "0.19.0" revision commit) - #:article "an" - #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" - #:commit commit - #:license (list license:asl2.0 license:expat)))) + (tree-sitter-grammar + "elixir" "Elixir" + "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" + (git-version "0.19.0" revision commit) + #:article "an" + #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" + #:commit commit + #:license (list license:asl2.0 license:expat)))) (define-public tree-sitter-heex (tree-sitter-grammar @@ -396,8 +409,8 @@ (define-public tree-sitter-heex (define-public tree-sitter-bash (tree-sitter-grammar "bash" "Bash" - "11gjjaf9hrsw3rd774c3gq27im2j9gxmkn59wcpg4nwni60p0vjh" - "0.20.0")) + "01sjympivwhr037c0gdx5fqw8fvzchq4fd4m8wlr8mdw50di0ag2" + "0.20.4")) (define-public tree-sitter-c-sharp (tree-sitter-grammar