Compare commits

..

No commits in common. "1f19cc0a907328d8dbf467ee9fe216277628d366" and "5d2b1a868ecf3e583eff4accde89f1b863be5896" have entirely different histories.

3 changed files with 4 additions and 31 deletions

20
flake.lock generated
View file

@ -33,28 +33,10 @@
"type": "github" "type": "github"
} }
}, },
"nvim-treesitter-textobjects": {
"flake": false,
"locked": {
"lastModified": 1756368113,
"narHash": "sha256-+KmOpRi4JAqm6UqYdtk80jwFrJhLCs0lZM/Liofq0R4=",
"owner": "nvim-treesitter",
"repo": "nvim-treesitter-textobjects",
"rev": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931",
"type": "github"
},
"original": {
"owner": "nvim-treesitter",
"ref": "main",
"repo": "nvim-treesitter-textobjects",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nvim-treesitter": "nvim-treesitter", "nvim-treesitter": "nvim-treesitter"
"nvim-treesitter-textobjects": "nvim-treesitter-textobjects"
} }
} }
}, },

View file

@ -7,10 +7,6 @@
url = "github:nvim-treesitter/nvim-treesitter/main"; url = "github:nvim-treesitter/nvim-treesitter/main";
flake = false; flake = false;
}; };
nvim-treesitter-textobjects = {
url = "github:nvim-treesitter/nvim-treesitter-textobjects/main";
flake = false;
};
}; };
outputs = outputs =
@ -59,8 +55,7 @@
}; };
in in
rec { rec {
nvim-treesitter-textobjects = pkgs'.vimPlugins.nvim-treesitter-textobjects; nvim-treesitter = pkgs'.vimPlugins.nvim-treesitter.withAllGrammars;
nvim-treesitter = pkgs'.vimPlugins.nvim-treesitter;
default = nvim-treesitter; default = nvim-treesitter;
} }
); );

View file

@ -55,7 +55,7 @@ in
{ {
vimPlugins = prev.vimPlugins.extend ( vimPlugins = prev.vimPlugins.extend (
final': prev': { final': prev': {
nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (old: rec { nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (old: rec {
src = inputs.nvim-treesitter; src = inputs.nvim-treesitter;
name = "${old.pname}-${src.rev}"; name = "${old.pname}-${src.rev}";
postPatch = ""; postPatch = "";
@ -64,7 +64,7 @@ in
mkdir -p $out/queries mkdir -p $out/queries
cp -a $src/runtime/queries/* $out/queries cp -a $src/runtime/queries/* $out/queries
"; ";
passthru = (prev'.nvim-treesitter.passthru or { }) // { passthru = (prev.nvim-treesitter.passthru or { }) // {
inherit inherit
builtGrammars builtGrammars
allGrammars allGrammars
@ -77,10 +77,6 @@ in
}; };
nvimSkipModules = [ "nvim-treesitter._meta.parsers" ]; nvimSkipModules = [ "nvim-treesitter._meta.parsers" ];
}); });
nvim-treesitter-textobjects = prev'.nvim-treesitter-textobjects.overrideAttrs (old: {
version = inputs.nvim-treesitter-textobjects.rev;
src = inputs.nvim-treesitter-textobjects;
});
} }
); );