public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107197 from Profpatsch/tree-sitter-fixes

Browse Source 
Tree sitter fixes
This commit is contained in:
Gabriel Ebner 2020-12-19 13:50:19 +01:00 committed by GitHub
commit 70c07155d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/parsing/tree-sitter/default.nix
View File

@ -41,8 +41,10 @@ let
builtGrammars = let builtGrammars = let
change = name: grammar: change = name: grammar:
callPackage ./library.nix { callPackage ./library.nix {} {
language = name; inherit version; source = fetchGrammar grammar; language = name;
inherit version;
source = fetchGrammar grammar;
}; };
in in
# typescript doesn't have parser.c in the same place as others # typescript doesn't have parser.c in the same place as others
@ -60,10 +62,6 @@ in rustPlatform.buildRustPackage {
# needed for the tests # needed for the tests
rm -rf test/fixtures/grammars rm -rf test/fixtures/grammars
ln -s ${grammars} 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 # Compile web assembly with emscripten. The --debug flag prevents us from

10
pkgs/development/tools/parsing/tree-sitter/library.nix
View File

@ -1,7 +1,15 @@
{ stdenv { stdenv
, language
, tree-sitter , tree-sitter
}:
# Build a parser grammar and put the resulting shared object in `$out/parser`
{
# language name
language
# version of tree-sitter
, version , version
# source for the language grammar
, source , source
}: }: