From 5907bcadfadba6a57844eb0952486c535b3a2d82 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 13 Dec 2020 06:53:17 +0100 Subject: [PATCH 1/2] tree-sitter: exports.json was fixed in releases, remove sed These symbols do not exist anymore in the new tree-sitter releases, so we can remove the sed. --- pkgs/development/tools/parsing/tree-sitter/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index e3435061563..027d10c0572 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -60,10 +60,6 @@ in rustPlatform.buildRustPackage { # needed for the tests rm -rf test/fixtures/grammars ln -s ${grammars} test/fixtures/grammars - - # These functions do not appear in the source code - sed -i /_ts_query_context/d lib/binding_web/exports.json - sed -i /___assert_fail/d lib/binding_web/exports.json ''; # Compile web assembly with emscripten. The --debug flag prevents us from From cf817454041353a235f02d34245e0873a072f31a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 13 Dec 2020 06:54:25 +0100 Subject: [PATCH 2/2] tree-sitter: split arguments in library.nix & document --- pkgs/development/tools/parsing/tree-sitter/default.nix | 6 ++++-- pkgs/development/tools/parsing/tree-sitter/library.nix | 10 +++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 027d10c0572..37811943a6d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -41,8 +41,10 @@ let builtGrammars = let change = name: grammar: - callPackage ./library.nix { - language = name; inherit version; source = fetchGrammar grammar; + callPackage ./library.nix {} { + language = name; + inherit version; + source = fetchGrammar grammar; }; in # typescript doesn't have parser.c in the same place as others diff --git a/pkgs/development/tools/parsing/tree-sitter/library.nix b/pkgs/development/tools/parsing/tree-sitter/library.nix index 36245ff7d44..f78939b22ff 100644 --- a/pkgs/development/tools/parsing/tree-sitter/library.nix +++ b/pkgs/development/tools/parsing/tree-sitter/library.nix @@ -1,7 +1,15 @@ { stdenv -, language , tree-sitter +}: + +# Build a parser grammar and put the resulting shared object in `$out/parser` + +{ + # language name + language + # version of tree-sitter , version + # source for the language grammar , source }: