diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 3a50da15261b..bd61659c9ad0 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -7,6 +7,22 @@ "date": "2021-12-07", "new": "cmp-tmux" }, + "compe-conjure": { + "date": "2024-11-19", + "new": "cmp-conjure" + }, + "compe-latex-symbols": { + "date": "2024-11-19", + "new": "cmp-latex-symbols" + }, + "compe-tabnine": { + "date": "2024-11-19", + "new": "cmp-tabnine" + }, + "compe-zsh": { + "date": "2024-11-19", + "new": "cmp-zsh" + }, "fern-vim": { "date": "2024-05-12", "new": "vim-fern" @@ -43,6 +59,10 @@ "date": "2021-08-22", "new": "bufferline-nvim" }, + "nvim-compe": { + "date": "2024-11-19", + "new": "nvim-cmp" + }, "nvim-lsp": { "date": "2020-08-31", "new": "nvim-lspconfig" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 26f6d809af71..6974f36caa84 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2561,54 +2561,6 @@ final: prev: meta.homepage = "https://github.com/rhysd/committia.vim/"; }; - compe-conjure = buildVimPlugin { - pname = "compe-conjure"; - version = "2020-12-06"; - src = fetchFromGitHub { - owner = "hrsh7th"; - repo = "compe-conjure"; - rev = "8d00e1dcee861a296bab36c06511ae4e083d5a0c"; - sha256 = "1ral3rmzw96xsvjnlf65mvlnvm05jmy90abrgay6ilng20bfxjiz"; - }; - meta.homepage = "https://github.com/hrsh7th/compe-conjure/"; - }; - - compe-latex-symbols = buildVimPlugin { - pname = "compe-latex-symbols"; - version = "2021-05-14"; - src = fetchFromGitHub { - owner = "GoldsteinE"; - repo = "compe-latex-symbols"; - rev = "70f58e53e142e3c59fe0f673dd54ce690ae57367"; - sha256 = "0p4xss3zyp6002hsa6dx989zhp672mc30b57w5cjhcgbknw0iy1l"; - }; - meta.homepage = "https://github.com/GoldsteinE/compe-latex-symbols/"; - }; - - compe-tabnine = buildVimPlugin { - pname = "compe-tabnine"; - version = "2021-09-14"; - src = fetchFromGitHub { - owner = "tzachar"; - repo = "compe-tabnine"; - rev = "33e4af509c27da9ef2c9c3002c01e3ec031797d4"; - sha256 = "1lzyia2s66kcxpr6d3db4rcgxlcddfg6gpz8rbg333hdasly383w"; - }; - meta.homepage = "https://github.com/tzachar/compe-tabnine/"; - }; - - compe-zsh = buildVimPlugin { - pname = "compe-zsh"; - version = "2021-04-03"; - src = fetchFromGitHub { - owner = "tamago324"; - repo = "compe-zsh"; - rev = "1a46a0ee661242f6a015b2abead34b606bb97171"; - sha256 = "0m8fmsx4bwmgqgjpwpldckp68hpx6qfschwdg275xsxkzw8pdnbk"; - }; - meta.homepage = "https://github.com/tamago324/compe-zsh/"; - }; - competitest-nvim = buildVimPlugin { pname = "competitest.nvim"; version = "2024-11-16"; @@ -8731,18 +8683,6 @@ final: prev: meta.homepage = "https://github.com/terrortylor/nvim-comment/"; }; - nvim-compe = buildVimPlugin { - pname = "nvim-compe"; - version = "2021-10-02"; - src = fetchFromGitHub { - owner = "hrsh7th"; - repo = "nvim-compe"; - rev = "d186d739c54823e0b010feb205c6f97792322c08"; - sha256 = "1cl3c4cazzpjj2wmsi42czrklzngzm82bbb9ivmcsa40rfz2lsk3"; - }; - meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; - }; - nvim-completion-manager = buildVimPlugin { pname = "nvim-completion-manager"; version = "2018-07-27"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2ae4c214b0c0..4d20f448ec12 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -752,31 +752,6 @@ in nvimRequireCheck = "competitest"; }; - compe-conjure = super.compe-conjure.overrideAttrs { - dependencies = [ self.conjure ]; - }; - - compe-latex-symbols = super.compe-latex-symbols.overrideAttrs { - dependencies = [ self.nvim-compe ]; - }; - - compe-tabnine = super.compe-tabnine.overrideAttrs { - dependencies = [ self.nvim-compe ]; - buildInputs = [ tabnine ]; - - postFixup = '' - mkdir -p $target/binaries/${tabnine.version} - ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform} - ''; - }; - - compe-zsh = super.compe-zsh.overrideAttrs { - dependencies = with self; [ - nvim-compe - plenary-nvim - ]; - }; - compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; nvimRequireCheck = "compiler-explorer"; @@ -2618,7 +2593,8 @@ in }; tmux-complete-vim = super.tmux-complete-vim.overrideAttrs { - dependencies = with self; [ nvim-compe ]; + # Vim plugin with optional nvim-compe lua module + doCheck = false; }; todo-comments-nvim = super.todo-comments-nvim.overrideAttrs { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 69e446768c46..9e97c5921e81 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -212,10 +212,6 @@ https://github.com/wincent/command-t/,, https://github.com/LudoPinelli/comment-box.nvim/,HEAD, https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, -https://github.com/hrsh7th/compe-conjure/,, -https://github.com/GoldsteinE/compe-latex-symbols/,, -https://github.com/tzachar/compe-tabnine/,, -https://github.com/tamago324/compe-zsh/,, https://github.com/xeluxee/competitest.nvim/,HEAD, https://github.com/krady21/compiler-explorer.nvim/,HEAD, https://github.com/Zeioth/compiler.nvim/,HEAD, @@ -725,7 +721,6 @@ https://github.com/weilbith/nvim-code-action-menu/,, https://github.com/willothy/nvim-cokeline/,HEAD, https://github.com/nvchad/nvim-colorizer.lua/,, https://github.com/terrortylor/nvim-comment/,, -https://github.com/hrsh7th/nvim-compe/,, https://github.com/roxma/nvim-completion-manager/,, https://github.com/klen/nvim-config-local/,, https://github.com/andythigpen/nvim-coverage/,HEAD,