Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 13, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fc75e0
Revert "vimPlugins.nvim-treesitter: collate grammars"
PerchunPak Sep 10, 2024
98ca865
vimPlugins.nvim-treesitter: add workaround for #332580
PerchunPak Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down