Unverified Commit f929e5fe authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #225952 from figsoda/ts

parents b21862f9 9601701f
Loading
Loading
Loading
Loading
+23 −21
Original line number Diff line number Diff line
@@ -27,16 +27,7 @@ let
      })
    generatedDerivations;

  allGrammars = lib.attrValues generatedDerivations;

  # Usage:
  # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
  # or for all grammars:
  # pkgs.vimPlugins.nvim-treesitter.withAllGrammars
  withPlugins =
    f: self.nvim-treesitter.overrideAttrs (_: {
      passthru.dependencies = map
        (grammar:
  grammarToPlugin = grammar:
    let
      name = lib.pipe grammar [
        lib.getName
@@ -50,11 +41,20 @@ let
      ];
    in

          runCommand "nvim-treesitter-${name}-grammar" { } ''
    runCommand "nvim-treesitter-grammar-${name}" { } ''
      mkdir -p $out/parser
      ln -s ${grammar}/parser $out/parser/${name}.so
          ''
        )
    '';

  allGrammars = lib.attrValues generatedDerivations;

  # Usage:
  # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
  # or for all grammars:
  # pkgs.vimPlugins.nvim-treesitter.withAllGrammars
  withPlugins =
    f: self.nvim-treesitter.overrideAttrs (_: {
      passthru.dependencies = map grammarToPlugin
        (f (tree-sitter.builtGrammars // builtGrammars));
    });

@@ -67,7 +67,9 @@ in
  '';

  passthru = {
    inherit builtGrammars allGrammars withPlugins withAllGrammars;
    inherit builtGrammars allGrammars grammarToPlugin withPlugins withAllGrammars;

    grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations;

    tests.check-queries =
      let