nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209198 from erikarvstedt/tree-sitter-build-grammar

Browse Source 
tree-sitter: add `buildGrammar` to `passthru`
This commit is contained in:
figsoda 2023-01-23 18:10:27 -05:00 committed by GitHub
commit d811234cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 165 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

300
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
View File

@ -4,7 +4,7 @@ self: super:
let let
generatedGrammars = callPackage ./generated.nix { generatedGrammars = callPackage ./generated.nix {
buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { }; inherit (tree-sitter) buildGrammar;
}; };
generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;

2
pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
View File

@ -36,7 +36,7 @@ def generate_grammar(item):
generated = f""" {lang} = buildGrammar {{ generated = f""" {lang} = buildGrammar {{
language = "{lang}"; language = "{lang}";
version = "{rev[:7]}"; version = "{rev[:7]}";
source = """ src = """
generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True)
generated += ";" generated += ";"

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

@ -51,14 +51,17 @@ let
'' + (lib.concatStrings (lib.mapAttrsToList '' + (lib.concatStrings (lib.mapAttrsToList
(name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n")
(import ./grammars { inherit lib; })))); (import ./grammars { inherit lib; }))));
buildGrammar = callPackage ./grammar.nix { };
builtGrammars = builtGrammars =
let let
change = name: grammar: build = name: grammar:
callPackage ./grammar.nix { } { buildGrammar {
language = if grammar ? language then grammar.language else name; language = grammar.language or name;
inherit version; inherit version;
source = if grammar ? src then grammar.src else fetchGrammar grammar; src = grammar.src or fetchGrammar grammar;
location = if grammar ? location then grammar.location else null; location = grammar.location or null;
}; };
grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars' = import ./grammars { inherit lib; } // extraGrammars;
grammars = grammars' // grammars = grammars' //
@ -70,7 +73,7 @@ let
{ tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } //
{ tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }; { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; };
in in
lib.mapAttrs change (grammars); lib.mapAttrs build (grammars);
# Usage: # Usage:
# pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
@ -142,7 +145,7 @@ rustPlatform.buildRustPackage {
updater = { updater = {
inherit update-all-grammars; inherit update-all-grammars;
}; };
inherit grammars builtGrammars withPlugins allGrammars; inherit grammars buildGrammar builtGrammars withPlugins allGrammars;
tests = { tests = {
# make sure all grammars build # make sure all grammars build

8
pkgs/development/tools/parsing/tree-sitter/grammar.nix
View File

@ -9,10 +9,8 @@
{ {
# language name # language name
language language
# version of tree-sitter
, version , version
# source for the language grammar , src
, source
, location ? null , location ? null
, generate ? false , generate ? false
, ... , ...
@ -21,7 +19,7 @@
stdenv.mkDerivation ({ stdenv.mkDerivation ({
pname = "${language}-grammar"; pname = "${language}-grammar";
src = source; inherit src version;
nativeBuildInputs = lib.optionals generate [ nodejs tree-sitter ]; nativeBuildInputs = lib.optionals generate [ nodejs tree-sitter ];
@ -60,4 +58,4 @@ stdenv.mkDerivation ({
fi fi
runHook postInstall runHook postInstall
''; '';
} // removeAttrs args [ "language" "source" "location" "generate" ]) } // removeAttrs args [ "language" "location" "generate" ])