From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 64905@debbugs.gnu.org
Cc: Hilton Chain <hako@ultrarare.space>,
Hilton Chain <hako@ultrarare.space>,
Christopher Baines <mail@cbaines.net>,
Andrew Tropin <andrew@trop.in>,
Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>,
Liliana Marie Prikler <liliana.prikler@gmail.com>
Subject: [bug#64905] [PATCH v5 00/10] Update tree-sitter{, -{c{, pp, -sharp}, go, {java, type}script, python}},
Date: Thu, 19 Oct 2023 23:41:10 +0800 [thread overview]
Message-ID: <cover.1697729704.git.hako@ultrarare.space> (raw)
In-Reply-To: <cover.1690476218.git.hako@ultrarare.space>
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
next prev parent reply other threads:[~2023-10-19 15:44 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-27 16:49 [bug#64905] [PATCH 00/10] Update tree-sitter{, -{c{, pp, -sharp}, go, java, {java, type}script, python}}, Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 01/10] gnu: Add rust-path-slash-0.2 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 02/10] gnu: tree-sitter: Update to 0.20.10 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 03/10] gnu: tree-sitter-c-sharp: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 04/10] gnu: tree-sitter-java: Update to 0.20.1 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 05/10] gnu: tree-sitter-javascript: Update to 0.20.0-14.7a29d06 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 06/10] gnu: tree-sitter-typescript: Update to 0.20.2 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 07/10] gnu: tree-sitter-python: Update to 0.20.3 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 08/10] gnu: tree-sitter-c: Update to 0.20.4 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 09/10] gnu: tree-sitter-go: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-07-27 16:51 ` [bug#64905] [PATCH 10/10] gnu: tree-sitter-cpp: Update to 0.20.2 Hilton Chain via Guix-patches via
2023-07-27 17:16 ` [bug#64905] [PATCH v2 0/8] Update tree-sitter{, -{c{, pp, -sharp}, go, java, {java, type}script, python}}, Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 1/8] gnu: Add rust-path-slash-0.2 Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 2/8] gnu: tree-sitter: Update to 0.20.10 Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 3/8] gnu: tree-sitter-c-sharp: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 4/8] gnu: tree-sitter-java: Update to 0.20.1 Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 5/8] gnu: tree-sitter-typescript: Update to 0.20.2 Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 6/8] gnu: tree-sitter-python: Update to 0.20.3 Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 7/8] gnu: tree-sitter-cpp: Update to 0.20.2 Hilton Chain via Guix-patches via
2023-07-27 17:17 ` [bug#64905] [PATCH v2 8/8] gnu: tree-sitter-go: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-08-10 6:17 ` [bug#64905] [PATCH v3 0/9] Update tree-sitter{, -{c{, pp, -sharp}, go, java, {java, type}script, python}}, Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 1/9] gnu: Add rust-path-slash-0.2 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 2/9] gnu: tree-sitter: Update to 0.20.10 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 3/9] gnu: tree-sitter-c-sharp: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 4/9] gnu: tree-sitter-java: Update to 0.20.1 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 5/9] gnu: tree-sitter-typescript: Update to 0.20.2 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 6/9] gnu: tree-sitter-python: Update to 0.20.3 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 7/9] gnu: tree-sitter-cpp: Update to 0.20.2 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 8/9] gnu: tree-sitter-go: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-08-10 6:19 ` [bug#64905] [PATCH v3 9/9] gnu: tree-sitter: Re-indent Hilton Chain via Guix-patches via
2023-08-20 13:58 ` [bug#64905] [PATCH v4 00/11] Update tree-sitter{, -{bash, c{, pp, -sharp}, go, java, {java, type}script, python, rust}}, Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 01/11] gnu: Add rust-path-slash-0.2 Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 02/11] gnu: tree-sitter: Update to 0.20.10 Hilton Chain via Guix-patches via
2023-09-27 10:40 ` Christopher Baines
2023-09-29 5:49 ` Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 03/11] gnu: tree-sitter-bash: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 04/11] gnu: tree-sitter-c-sharp: " Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 05/11] gnu: tree-sitter-java: Update to 0.20.1 Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 06/11] gnu: tree-sitter-typescript: Update to 0.20.2 Hilton Chain via Guix-patches via
2023-09-27 10:42 ` Christopher Baines
2023-09-29 5:50 ` Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 07/11] gnu: tree-sitter-python: Update to 0.20.4 Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 08/11] gnu: tree-sitter-cpp: Update to 0.20.3 Hilton Chain via Guix-patches via
2023-08-20 14:00 ` [bug#64905] [PATCH v4 09/11] gnu: tree-sitter-go: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-08-20 14:01 ` [bug#64905] [PATCH v4 10/11] gnu: tree-sitter-rust: Update to 0.20.4 Hilton Chain via Guix-patches via
2023-08-20 14:01 ` [bug#64905] [PATCH v4 11/11] gnu: tree-sitter: Re-indent Hilton Chain via Guix-patches via
2023-09-27 10:46 ` [bug#64905] [PATCH v4 00/11] Update tree-sitter{, -{bash, c{, pp, -sharp}, go, java, {java, type}script, python, rust}}, Christopher Baines
2023-10-19 15:41 ` Hilton Chain via Guix-patches via [this message]
2023-10-19 15:44 ` [bug#64905] [PATCH v5 01/10] gnu: tree-sitter: Update to 0.20.10 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 02/10] gnu: tree-sitter-bash: Update to 0.20.4 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 03/10] gnu: tree-sitter-c-sharp: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 04/10] gnu: tree-sitter-javascript: Update to 0.20.0-22.f772967 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 05/10] gnu: tree-sitter-typescript: Update to 0.20.3 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 06/10] gnu: tree-sitter-python: Update to 0.20.4 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 07/10] gnu: tree-sitter-cpp: Update to 0.20.3 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 08/10] gnu: tree-sitter-go: Update to 0.20.0 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 09/10] gnu: tree-sitter-rust: Update to 0.20.4 Hilton Chain via Guix-patches via
2023-10-19 15:44 ` [bug#64905] [PATCH v5 10/10] gnu: tree-sitter: Re-indent Hilton Chain via Guix-patches via
2023-10-20 8:52 ` bug#64905: [PATCH v5 00/10] Update tree-sitter{, -{c{, pp, -sharp}, go, {java, type}script, python}}, Andrew Tropin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1697729704.git.hako@ultrarare.space \
--to=guix-patches@gnu.org \
--cc=64905@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=cox.katherine.e+guix@gmail.com \
--cc=hako@ultrarare.space \
--cc=liliana.prikler@gmail.com \
--cc=mail@cbaines.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.