Unverified Commit da841550 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

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

parents a1985804 98ca865c

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

+11 −17
Original line number Diff line number Diff line
@@ -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

      passthru.dependencies = 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);