From 9cd025a377c3e3c58df271c181c6f4576b78c9ee Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 15 Jun 2026 09:25:20 -0500
Subject: [PATCH] vimPlugins.null-ls-nvim: remove

Upstream deleted the repository, and none-ls-nvim is the maintained fork for users that need null-ls-compatible functionality.
---
 pkgs/applications/editors/vim/plugins/aliases.nix  |  1 +
 .../applications/editors/vim/plugins/generated.nix | 14 --------------
 .../applications/editors/vim/plugins/overrides.nix | 11 ++---------
 .../editors/vim/plugins/vim-plugin-names           |  1 -
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 7dc05270b5c0..9bf4e706a40e 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -55,6 +55,7 @@ mapAliases (
     mind-nvim = throw "'vimPlugins.mind-nvim' has been removed: the upstream repository got deleted"; # Added 2026-05-03
     minsnip-nvim = throw "'vimPlugins.minsnip-nvim' has been removed: the upstream repository got deleted"; # Added 2025-08-30
     neuron-nvim = throw "'vimPlugins.neuron-nvim' has been removed: archived repository 2023-02-19"; # Added 2025-09-10
+    null-ls-nvim = throw "'vimPlugins.null-ls-nvim' has been removed: upstream deleted repository. Use none-ls-nvim instead."; # Added 2026-06-15
     nvim-gps = throw "'vimPlugins.nvim-gps' has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18
     nvim-ts-rainbow = throw "'vimPlugins.nvim-ts-rainbow' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
     nvim-ts-rainbow2 = throw "'vimPlugins.nvim-ts-rainbow2' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index ebb177a5b0fd..316a0db1aa27 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12183,20 +12183,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  null-ls-nvim = buildVimPlugin {
-    pname = "null-ls.nvim";
-    version = "0-unstable-2023-08-12";
-    src = fetchFromGitHub {
-      owner = "jose-elias-alvarez";
-      repo = "null-ls.nvim";
-      rev = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7";
-      hash = "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=";
-    };
-    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
-    meta.license = unfree;
-    meta.hydraPlatforms = [ ];
-  };
-
   numb-nvim = buildVimPlugin {
     pname = "numb.nvim";
     version = "1.1.0";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 08d0361c408b..5fbeef6c5535 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1656,7 +1656,7 @@ assertNoAdditions {
     ];
     checkInputs = with self; [
       luasnip
-      null-ls-nvim
+      none-ls-nvim
       plenary-nvim
     ];
     nvimSkipModules = [
@@ -2482,7 +2482,7 @@ assertNoAdditions {
   mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
     dependencies = with self; [
       mason-nvim
-      null-ls-nvim
+      none-ls-nvim
       plenary-nvim
     ];
   };
@@ -3096,13 +3096,6 @@ assertNoAdditions {
     dependencies = [ self.aniseed ];
   };
 
-  null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
-    dependencies = [ self.plenary-nvim ];
-    meta = old.meta // {
-      license = lib.licenses.unlicense;
-    };
-  });
-
   nvchad = super.nvchad.overrideAttrs {
     # You've signed up for a distro, providing dependencies.
     dependencies = with self; [
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 5b71424dab58..b88ffdcf9b7c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -868,7 +868,6 @@ https://github.com/shaunsingh/nord.nvim/,,
 https://github.com/alexvzyl/nordic.nvim/,,
 https://github.com/vigoux/notifier.nvim/,,
 https://github.com/jlesquembre/nterm.nvim/,,
-https://github.com/jose-elias-alvarez/null-ls.nvim/,,
 https://github.com/nacro90/numb.nvim/,,
 https://github.com/nvchad/nvchad/,,
 https://github.com/nvchad/ui/,,nvchad-ui