From d524dbd333a24b06afa87eda9aefb1da088de522 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 15 Dec 2025 09:54:35 +0100
Subject: [PATCH] plugins/gitgutter: drop grep

https://github.com/airblade/vim-gitgutter/commit/0acb772e76064cc406664ab595b58b3fac76488a
---
 plugins/by-name/gitgutter/default.nix         |  9 ++++----
 .../plugins/by-name/gitgutter/default.nix     | 22 +------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/plugins/by-name/gitgutter/default.nix b/plugins/by-name/gitgutter/default.nix
index 55d227fc..4d749741 100644
--- a/plugins/by-name/gitgutter/default.nix
+++ b/plugins/by-name/gitgutter/default.nix
@@ -9,14 +9,13 @@ lib.nixvim.plugins.mkVimPlugin {
 
   dependencies = [
     "git"
-    "grep"
   ];
 
   imports = [
-    (lib.nixvim.mkRemovedPackageOptionModule {
-      plugin = "gitgutter";
-      packageName = "grep";
-    })
+    # Added 2025-12-15, remove after 26.05
+    (lib.mkRemovedOptionModule [ "plugins" "gitgutter" "grepPackage" ] ''
+      Gitgutter no longer requires grep.
+    '')
   ];
 
   extraOptions = {
diff --git a/tests/test-sources/plugins/by-name/gitgutter/default.nix b/tests/test-sources/plugins/by-name/gitgutter/default.nix
index cea12ffa..89f38d9c 100644
--- a/tests/test-sources/plugins/by-name/gitgutter/default.nix
+++ b/tests/test-sources/plugins/by-name/gitgutter/default.nix
@@ -15,7 +15,6 @@
         diff_args = "";
         diff_relative_to = "index";
         diff_base = "";
-        grep = "grep";
         signs = true;
         highlight_lines = false;
         highlight_linenrs = false;
@@ -63,21 +62,6 @@
     };
   };
 
-  grep-command =
-    { config, ... }:
-    {
-      plugins.gitgutter = {
-        enable = true;
-      };
-      assertions = [
-        {
-          assertion =
-            config.extraPackages != [ ] && lib.any (x: x.pname or null == "gnugrep") config.extraPackages;
-          message = "gnugrep wasn't found when it was expected";
-        }
-      ];
-    };
-
   no-packages =
     { config, ... }:
     {
@@ -85,14 +69,10 @@
         enable = true;
         settings = {
           git_executable = lib.getExe pkgs.git;
-          grep = lib.getExe pkgs.gnugrep;
         };
       };
 
-      dependencies = {
-        git.enable = false;
-        grep.enable = false;
-      };
+      dependencies.git.enable = false;
 
       assertions = [
         {