Revert "vimPlugins.nvim-treesitter: collate grammars" (#341079)
This commit is contained in:
commit
da8415506f
@ -4,9 +4,17 @@ self: super:
|
|||||||
|
|
||||||
let
|
let
|
||||||
inherit (neovimUtils) grammarToPlugin;
|
inherit (neovimUtils) grammarToPlugin;
|
||||||
generatedGrammars = callPackage ./generated.nix {
|
|
||||||
|
initialGeneratedGrammars = callPackage ./generated.nix {
|
||||||
inherit (tree-sitter) buildGrammar;
|
inherit (tree-sitter) buildGrammar;
|
||||||
};
|
};
|
||||||
|
grammarOverrides = final: prev: {
|
||||||
|
nix = prev.nix.overrideAttrs {
|
||||||
|
# workaround for https://github.com/NixOS/nixpkgs/issues/332580
|
||||||
|
prePatch = "rm queries/highlights.scm";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
generatedGrammars = lib.fix (lib.extends grammarOverrides (_: initialGeneratedGrammars));
|
||||||
|
|
||||||
generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
|
generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
|
||||||
|
|
||||||
@ -36,22 +44,8 @@ let
|
|||||||
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
|
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
|
||||||
withPlugins =
|
withPlugins =
|
||||||
f: self.nvim-treesitter.overrideAttrs {
|
f: self.nvim-treesitter.overrideAttrs {
|
||||||
passthru.dependencies =
|
passthru.dependencies = map grammarToPlugin
|
||||||
let
|
(f (tree-sitter.builtGrammars // builtGrammars));
|
||||||
grammars = map grammarToPlugin
|
|
||||||
(f (tree-sitter.builtGrammars // builtGrammars));
|
|
||||||
copyGrammar = grammar:
|
|
||||||
let name = lib.last (lib.splitString "-" grammar.name); in
|
|
||||||
"ln -sf ${grammar}/parser/${name}.so $out/parser/${name}.so";
|
|
||||||
in
|
|
||||||
[
|
|
||||||
(runCommand "vimplugin-treesitter-grammars"
|
|
||||||
{ meta.platforms = lib.platforms.all; }
|
|
||||||
''
|
|
||||||
mkdir -p $out/parser
|
|
||||||
${lib.concatMapStringsSep "\n" copyGrammar grammars}
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
withAllGrammars = withPlugins (_: allGrammars);
|
withAllGrammars = withPlugins (_: allGrammars);
|
||||||
|
Loading…
Reference in New Issue
Block a user