From bac42af795923eeeb98557221f63edfce58382f8 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 19 Nov 2024 12:02:53 -0600
Subject: [PATCH 1/5] vimPlugins.compe-conjure: deprecate

nvim-compe has been replaced with nvim-cmp
---
 .../applications/editors/vim/plugins/deprecated.json |  4 ++++
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ------------
 pkgs/applications/editors/vim/plugins/overrides.nix  |  4 ----
 .../editors/vim/plugins/vim-plugin-names             |  1 -
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index 3a50da15261b..aad41914a483 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -7,6 +7,10 @@
         "date": "2021-12-07",
         "new": "cmp-tmux"
     },
+    "compe-conjure": {
+        "date": "2024-11-19",
+        "new": "cmp-conjure"
+    },
     "fern-vim": {
         "date": "2024-05-12",
         "new": "vim-fern"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index b2f16e1434ac..2e00feeef5f2 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2561,18 +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";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 7a299f346a4c..b58fd4d30e15 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -752,10 +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 ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2c69c1d78378..1ccdcd466a70 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -212,7 +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/,,

From b6b65d0cdabb4067fe0f0b80fa118fd7640b5f7f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 19 Nov 2024 12:03:31 -0600
Subject: [PATCH 2/5] vimPlugins.compe-latex-symbols: deprecate

nvim-compe has been replaced with nvim-cmp
---
 .../applications/editors/vim/plugins/deprecated.json |  4 ++++
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ------------
 pkgs/applications/editors/vim/plugins/overrides.nix  |  4 ----
 .../editors/vim/plugins/vim-plugin-names             |  1 -
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index aad41914a483..f6b9065f206b 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -11,6 +11,10 @@
         "date": "2024-11-19",
         "new": "cmp-conjure"
     },
+    "compe-latex-symbols": {
+        "date": "2024-11-19",
+        "new": "cmp-latex-symbols"
+    },
     "fern-vim": {
         "date": "2024-05-12",
         "new": "vim-fern"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 2e00feeef5f2..3529d211858f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2561,18 +2561,6 @@ final: prev:
     meta.homepage = "https://github.com/rhysd/committia.vim/";
   };
 
-  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";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b58fd4d30e15..2425f257b3a7 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -752,10 +752,6 @@ in
     nvimRequireCheck = "competitest";
   };
 
-  compe-latex-symbols = super.compe-latex-symbols.overrideAttrs {
-    dependencies = [ self.nvim-compe ];
-  };
-
   compe-tabnine = super.compe-tabnine.overrideAttrs {
     dependencies = [ self.nvim-compe ];
     buildInputs = [ tabnine ];
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 1ccdcd466a70..d0df8e7db2eb 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -212,7 +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/GoldsteinE/compe-latex-symbols/,,
 https://github.com/tzachar/compe-tabnine/,,
 https://github.com/tamago324/compe-zsh/,,
 https://github.com/xeluxee/competitest.nvim/,HEAD,

From d737d9acce6d93443b733b7f044a6d84b3dc778f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 19 Nov 2024 12:04:02 -0600
Subject: [PATCH 3/5] vimPlugins.compe-tabnine: deprecate

nvim-compe has been replaced with nvim-cmp
---
 .../applications/editors/vim/plugins/deprecated.json |  4 ++++
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ------------
 pkgs/applications/editors/vim/plugins/overrides.nix  | 10 ----------
 .../editors/vim/plugins/vim-plugin-names             |  1 -
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index f6b9065f206b..0a0896c827e9 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -15,6 +15,10 @@
         "date": "2024-11-19",
         "new": "cmp-latex-symbols"
     },
+    "compe-tabnine": {
+        "date": "2024-11-19",
+        "new": "cmp-tabnine"
+    },
     "fern-vim": {
         "date": "2024-05-12",
         "new": "vim-fern"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 3529d211858f..cbe1bb4559c7 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2561,18 +2561,6 @@ final: prev:
     meta.homepage = "https://github.com/rhysd/committia.vim/";
   };
 
-  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";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 2425f257b3a7..94bef748faa8 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -752,16 +752,6 @@ in
     nvimRequireCheck = "competitest";
   };
 
-  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
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index d0df8e7db2eb..ea2c538b7b3e 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -212,7 +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/tzachar/compe-tabnine/,,
 https://github.com/tamago324/compe-zsh/,,
 https://github.com/xeluxee/competitest.nvim/,HEAD,
 https://github.com/krady21/compiler-explorer.nvim/,HEAD,

From 026fb07f148bd49d657a820ec41e39789fbfe116 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 19 Nov 2024 12:04:34 -0600
Subject: [PATCH 4/5] vimPlugins.compe-zsh: deprecate

nvim-compe has been replaced with nvim-cmp
---
 .../applications/editors/vim/plugins/deprecated.json |  4 ++++
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ------------
 pkgs/applications/editors/vim/plugins/overrides.nix  |  7 -------
 .../editors/vim/plugins/vim-plugin-names             |  1 -
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index 0a0896c827e9..066e445b05c0 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -19,6 +19,10 @@
         "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"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index cbe1bb4559c7..e601e846e20a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2561,18 +2561,6 @@ final: prev:
     meta.homepage = "https://github.com/rhysd/committia.vim/";
   };
 
-  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";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 94bef748faa8..a694ea660fa5 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -752,13 +752,6 @@ in
     nvimRequireCheck = "competitest";
   };
 
-  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";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index ea2c538b7b3e..4a3544192be3 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -212,7 +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/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,

From f2ef8616ad1cc4457ed54fa58dd1a5b4170a9a6f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 19 Nov 2024 12:05:46 -0600
Subject: [PATCH 5/5] vimPlugins.nvim-compe: deprecate

nvim-compe has been replaced with nvim-cmp
---
 .../applications/editors/vim/plugins/deprecated.json |  4 ++++
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ------------
 pkgs/applications/editors/vim/plugins/overrides.nix  |  3 ++-
 .../editors/vim/plugins/vim-plugin-names             |  1 -
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index 066e445b05c0..bd61659c9ad0 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -59,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 e601e846e20a..04bb66693fbd 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8683,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 a694ea660fa5..82a519d08190 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2579,7 +2579,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 4a3544192be3..e66fa9686b75 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -721,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,