From 09daa2cb8377de50d1afc1e769edaefd90ae7bc0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 14 Dec 2024 15:07:46 +0100 Subject: [PATCH] plugins/efmls-configs: move from lsp to by-name --- .../efmls-configs.nix => by-name/efmls-configs/default.nix} | 2 +- .../efmls-configs/packages.nix} | 0 plugins/lsp/language-servers/default.nix | 1 - tests/generated.nix | 4 ++-- .../efmls-configs.nix => by-name/efmls-configs/default.nix} | 0 5 files changed, 3 insertions(+), 4 deletions(-) rename plugins/{lsp/language-servers/efmls-configs.nix => by-name/efmls-configs/default.nix} (98%) rename plugins/{lsp/language-servers/efmls-configs-pkgs.nix => by-name/efmls-configs/packages.nix} (100%) rename tests/test-sources/plugins/{lsp/efmls-configs.nix => by-name/efmls-configs/default.nix} (100%) diff --git a/plugins/lsp/language-servers/efmls-configs.nix b/plugins/by-name/efmls-configs/default.nix similarity index 98% rename from plugins/lsp/language-servers/efmls-configs.nix rename to plugins/by-name/efmls-configs/default.nix index 8542ceb2..82b2e875 100644 --- a/plugins/lsp/language-servers/efmls-configs.nix +++ b/plugins/by-name/efmls-configs/default.nix @@ -7,7 +7,7 @@ }: let tools = import ../../../generated/efmls-configs.nix; - inherit (import ./efmls-configs-pkgs.nix lib) packaged; + inherit (import ./packages.nix lib) packaged; in { options.plugins.efmls-configs = { diff --git a/plugins/lsp/language-servers/efmls-configs-pkgs.nix b/plugins/by-name/efmls-configs/packages.nix similarity index 100% rename from plugins/lsp/language-servers/efmls-configs-pkgs.nix rename to plugins/by-name/efmls-configs/packages.nix diff --git a/plugins/lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix index 0faeaf3f..f1bc3511 100644 --- a/plugins/lsp/language-servers/default.nix +++ b/plugins/lsp/language-servers/default.nix @@ -217,7 +217,6 @@ in ++ renameModules ++ [ ./ccls.nix - ./efmls-configs.nix ./hls.nix ./pylsp.nix ./rust-analyzer.nix diff --git a/tests/generated.nix b/tests/generated.nix index ed4d388e..bd4ac548 100644 --- a/tests/generated.nix +++ b/tests/generated.nix @@ -79,11 +79,11 @@ let ) ++ checkDeclarations ( let - inherit (import ../plugins/lsp/language-servers/efmls-configs-pkgs.nix lib) packaged unpackaged; + inherit (import ../plugins/by-name/efmls-configs/packages.nix lib) packaged unpackaged; in { name = "efmls"; - declarationFile = "efmls-configs-pkgs.nix"; + declarationFile = "plugins/by-name/efmls-configs/packages.nix"; packages = builtins.attrValues packaged; diff --git a/tests/test-sources/plugins/lsp/efmls-configs.nix b/tests/test-sources/plugins/by-name/efmls-configs/default.nix similarity index 100% rename from tests/test-sources/plugins/lsp/efmls-configs.nix rename to tests/test-sources/plugins/by-name/efmls-configs/default.nix