vimPlugins: remove explicit nvimRequireCheck pt2 (#373283)

NixOS · Jan 12, 2025 · 5d36278 · 5d36278
2 parents e8afe8d + 287f69e
commit 5d36278
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -72,8 +72,11 @@ vimUtils.buildVimPlugin {
     inherit avante-nvim-lib;
   };
 
-  doInstallCheck = true;
-  nvimRequireCheck = "avante";
+  nvimSkipModule = [
+    # Requires setup with corresponding provider
+    "avante.providers.azure"
+    "avante.providers.copilot"
+  ];
 
   meta = {
     description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -61,6 +61,9 @@ vimUtils.buildVimPlugin {
       redxtech
     ];
   };
-  doInstallCheck = true;
-  nvimRequireCheck = "blink-cmp";
+
+  nvimSkipModule = [
+    # Module for reproducing issues
+    "repro"
+  ];
 }
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix
@@ -51,9 +51,6 @@ vimUtils.buildVimPlugin {
       cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so
     '';
 
-  doInstallCheck = true;
-  nvimRequireCheck = "codesnap";
-
   passthru = {
     updateScript = nix-update-script {
       attrPath = "vimPlugins.codesnap-nvim.codesnap-lib";

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
@@ -54,9 +54,6 @@ vimUtils.buildVimPlugin {
     runHook postInstall
   '';
 
-  doInstallCheck = true;
-  nvimRequireCheck = "cord";
-
   passthru = {
     updateScript = nix-update-script {
       extraArgs = [ "--version=branch" ];

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
@@ -42,8 +42,6 @@ vimUtils.buildVimPlugin {
     ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so
   '';
 
-  nvimRequireCheck = "spectre";
-
   passthru = {
     updateScript = nix-update-script {
       extraArgs = [ "--version=branch" ];

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
@@ -43,13 +43,23 @@ vimUtils.buildVimPlugin {
   pname = "sg.nvim";
   inherit version src;
 
+  checkInputs = with vimPlugins; [
+    telescope-nvim
+    nvim-cmp
+  ];
+
   dependencies = [ vimPlugins.plenary-nvim ];
 
   postInstall = ''
     mkdir -p $out/target/debug
     ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
   '';
 
+  nvimSkipModule = [
+    # Dependent on active fuzzy search state
+    "sg.cody.fuzzy"
+  ];
+
   passthru = {
     updateScript = nix-update-script {
       extraArgs = [ "--version=branch" ];
@@ -59,7 +69,6 @@ vimUtils.buildVimPlugin {
     # needed for the update script
     inherit sg-nvim-rust;
   };
-  nvimRequireCheck = "sg";
 
   meta = {
     description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix
@@ -57,8 +57,6 @@ vimUtils.buildVimPlugin {
 
   propagatedBuildInputs = [ sniprun-bin ];
 
-  nvimRequireCheck = "sniprun";
-
   passthru = {
     updateScript = nix-update-script {
       attrPath = "vimPlugins.sniprun.sniprun-bin";