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

Revert "vimPlugins.nvim-treesitter: collate grammars" (#341079)

Browse Source
This commit is contained in:
Gaétan Lepage 2024-09-13 13:38:38 +02:00 committed by GitHub
commit da8415506f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,17 @@ self: super:
let
inherit (neovimUtils) grammarToPlugin;
generatedGrammars = callPackage ./generated.nix {
initialGeneratedGrammars = callPackage ./generated.nix {
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;
@ -36,22 +44,8 @@ let
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
withPlugins =
f: self.nvim-treesitter.overrideAttrs {
passthru.dependencies =
let
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}
'')
];
passthru.dependencies = map grammarToPlugin
(f (tree-sitter.builtGrammars // builtGrammars));
};
withAllGrammars = withPlugins (_: allGrammars);