diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index 17e03b7dd76d3..ab31ac6539b92 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -7,7 +7,7 @@ let inherit (vimUtils.override {inherit vim;}) - buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook; + buildVimPluginFrom2Nix; inherit (lib) extends; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 01e3a868ceb2b..3f63eefb6e879 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6177,6 +6177,18 @@ final: prev: meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; + nvim-teal-maker = buildVimPluginFrom2Nix { + pname = "nvim-teal-maker"; + version = "2022-04-09"; + src = fetchFromGitHub { + owner = "svermeulen"; + repo = "nvim-teal-maker"; + rev = "4d7ef05fa47de4bd9d02c4578d66b7cdc6848807"; + sha256 = "1axz6znqs9p9a9vzqwm0znp7parn6msl2vwrmg5q6javcvzldym4"; + }; + meta.homepage = "https://github.com/svermeulen/nvim-teal-maker/"; + }; + nvim-terminal-lua = buildVimPluginFrom2Nix { pname = "nvim-terminal.lua"; version = "2019-10-17"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 849c152fbaf0d..de8f0c1a5bcdf 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -673,6 +673,14 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + nvim-teal-maker = super.nvim-teal-maker.overrideAttrs (old: { + postPatch = '' + substituteInPlace lua/tealmaker/init.lua \ + --replace cyan ${luaPackages.cyan}/bin/cyan + ''; + vimCommandCheck = "TealBuild"; + }); + nvim-treesitter = super.nvim-treesitter.overrideAttrs (old: callPackage ./nvim-treesitter/overrides.nix { } self super ); @@ -1042,6 +1050,10 @@ self: super: { }); }); + vim-dadbod-ui = super.vim-dadbod-ui.overrideAttrs (old: { + dependencies = with self; [ vim-dadbod ]; + }); + vim-dasht = super.vim-dasht.overrideAttrs (old: { preFixup = '' substituteInPlace $out/autoload/dasht.vim \ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index de1e008f3895d..946bc6afeacfd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -520,6 +520,7 @@ https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, https://github.com/nvim-pack/nvim-spectre/,, https://github.com/kylechui/nvim-surround/,main, +https://github.com/svermeulen/nvim-teal-maker/,HEAD, https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/kyazdani42/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,,