From 07c767cd2f3389cb88aafe8ce9ff898714f0ec7c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 17:16:13 +0200
Subject: [PATCH] modules/dependencies: add ctags

---
 modules/dependencies.nix                      |  1 +
 plugins/by-name/tagbar/default.nix            | 20 +++++++++----------
 .../plugins/by-name/tagbar/default.nix        |  7 +++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 043d271f..c1e97d9b 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -8,6 +8,7 @@ let
   cfg = config.dependencies;
 
   packages = {
+    ctags.default = "ctags";
     curl.default = "curl";
     gcc.default = "gcc";
     git = {
diff --git a/plugins/by-name/tagbar/default.nix b/plugins/by-name/tagbar/default.nix
index 501136e4..b27d6368 100644
--- a/plugins/by-name/tagbar/default.nix
+++ b/plugins/by-name/tagbar/default.nix
@@ -1,6 +1,4 @@
 {
-  helpers,
-  pkgs,
   lib,
   ...
 }:
@@ -12,6 +10,14 @@ lib.nixvim.plugins.mkVimPlugin {
 
   # TODO introduced 2024-02-12: remove 2024-04-12
   deprecateExtraConfig = true;
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "tagbar";
+      packageName = "ctags";
+      oldPackageName = "tags";
+    })
+  ];
 
   settingsExample = {
     position = "right";
@@ -30,13 +36,7 @@ lib.nixvim.plugins.mkVimPlugin {
     };
   };
 
-  extraOptions = {
-    tagsPackage = lib.mkPackageOption pkgs "ctags" {
-      nullable = true;
-    };
-  };
-
-  extraConfig = cfg: {
-    extraPackages = [ cfg.tagsPackage ];
+  extraConfig = {
+    dependencies.ctags.enable = lib.mkDefault true;
   };
 }
diff --git a/tests/test-sources/plugins/by-name/tagbar/default.nix b/tests/test-sources/plugins/by-name/tagbar/default.nix
index 945b4230..9def8636 100644
--- a/tests/test-sources/plugins/by-name/tagbar/default.nix
+++ b/tests/test-sources/plugins/by-name/tagbar/default.nix
@@ -53,9 +53,8 @@
   };
 
   no-packages = {
-    plugins.tagbar = {
-      enable = true;
-      tagsPackage = null;
-    };
+    plugins.tagbar.enable = true;
+
+    dependencies.ctags.enable = false;
   };
 }