Skip to content

tree-sitter: 0.24.6 -> 0.25.1 #379367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ambroisie merged 2 commits into from
Feb 14, 2025
Merged

tree-sitter: 0.24.6 -> 0.25.1 #379367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5690ef0
tree-sitter: 0.24.6 -> 0.25.1
ambroisie Feb 4, 2025
53dbcdd
tree-sitter: fix grammar update doc comment
ambroisie Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/tools/parsing/tree-sitter/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ let
# to update:
# 1) change all these hashes
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
# 3) Set NIXPKGS_GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
# 4) run the ./result script that is output by that (it updates ./grammars)
version = "0.24.6";
hash = "sha256-L7F2/S22knqEdB2hxfqLe5Tcgk0WQqBdFQ7BvHFl4EI=";
version = "0.25.1";
hash = "sha256-xnUhiIeRxD4ZKMUQ6pNEetDqiFqiJsa57BRM2zqNFro=";

src = fetchFromGitHub {
owner = "tree-sitter";
Expand Down Expand Up @@ -171,7 +171,7 @@ rustPlatform.buildRustPackage {
inherit src version;

useFetchCargoVendor = true;
cargoHash = "sha256-wrMqeJxOj9Jp3luy6ir6UzNQClRglqP8pfoqWk+Ky+w=";
cargoHash = "sha256-YaXeApg0U97Bm+kBdFdmfnkgg9GBxxYdaDzgCVN2sbY=";

buildInputs = [ installShellFiles ];
nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ];
Expand Down
19 changes: 10 additions & 9 deletions pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index 4a00747e..e17d253b 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -5,7 +5,6 @@ pub mod highlight;
@@ -6,7 +6,6 @@ pub mod highlight;
pub mod init;
pub mod input;
pub mod logger;
pub mod parse;
-pub mod playground;
Expand All @@ -15,15 +16,15 @@ index 1758fada..4bc56cc2 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -23,7 +23,7 @@ use tree_sitter_cli::{
init::{generate_grammar_files, get_root_path, migrate_package_json, JsonConfigOpts},
input::{get_input, get_tmp_source_file, CliInput},
logger,
parse::{self, ParseFileOptions, ParseOutput},
- playground, query, tags,
+ query, tags,
test::{self, TestOptions},
test_highlight, test_tags, util, wasm,
};
@@ -1205,10 +1205,8 @@ impl Tags {
parse::{self, ParseDebugType, ParseFileOptions, ParseOutput, ParseTheme},
- playground, query,
+ query,
tags::{self, TagsOptions},
test::{self, TestOptions, TestStats},
test_highlight, test_tags, util, version, wasm,
@@ -1614,10 +1614,8 @@ impl Tags {

impl Playground {
fn run(self, current_dir: &Path) -> Result<()> {
Expand Down