21 files changed, 41 insertions, 38 deletions
diff --git a/pkgs/development/tools/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix
index a1547675dc083..a1547675dc083 100644
--- a/pkgs/development/tools/ansible-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix
diff --git a/pkgs/development/tools/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix
index b415906eead76..b415906eead76 100644
--- a/pkgs/development/tools/beancount-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix
diff --git a/pkgs/development/tools/buf-language-server/default.nix b/pkgs/development/tools/language-servers/buf-language-server/default.nix
index 88da6eb944827..88da6eb944827 100644
--- a/pkgs/development/tools/buf-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/buf-language-server/default.nix
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix
index a401fc47eac9e..a401fc47eac9e 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/language-servers/ccls/default.nix
diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/language-servers/ccls/wrapper
index 294b60893a3f8..294b60893a3f8 100644
--- a/pkgs/development/tools/misc/ccls/wrapper
+++ b/pkgs/development/tools/language-servers/ccls/wrapper
diff --git a/pkgs/development/tools/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix
index 9aed276a63fa5..9aed276a63fa5 100644
--- a/pkgs/development/tools/fortls/default.nix
+++ b/pkgs/development/tools/language-servers/fortls/default.nix
diff --git a/pkgs/development/tools/fortran-language-server/default.nix b/pkgs/development/tools/language-servers/fortran-language-server/default.nix
index 2c606ab715b51..2c606ab715b51 100644
--- a/pkgs/development/tools/fortran-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/fortran-language-server/default.nix
diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix
index ca0a0b5638fe9..ca0a0b5638fe9 100644
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/language-servers/gopls/default.nix
diff --git a/pkgs/development/tools/jdt-language-server/default.nix b/pkgs/development/tools/language-servers/jdt-language-server/default.nix
index 1af69700152d2..1af69700152d2 100644
--- a/pkgs/development/tools/jdt-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/jdt-language-server/default.nix
diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix
index f35900ec41ad5..f35900ec41ad5 100644
--- a/pkgs/development/tools/jsonnet-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix
diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
index b3b1085273d10..b3b1085273d10 100644
--- a/pkgs/development/tools/kotlin-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix
index 5b275f82346b8..5b275f82346b8 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/language-servers/metals/default.nix
diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix
index ccc895b895694..ccc895b895694 100644
--- a/pkgs/development/tools/millet/default.nix
+++ b/pkgs/development/tools/language-servers/millet/default.nix
diff --git a/pkgs/development/tools/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix
index de87838105bfa..de87838105bfa 100644
--- a/pkgs/development/tools/nil/default.nix
+++ b/pkgs/development/tools/language-servers/nil/default.nix
diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/language-servers/rnix-lsp/default.nix
index a587f87b3da74..a587f87b3da74 100644
--- a/pkgs/development/tools/rnix-lsp/default.nix
+++ b/pkgs/development/tools/language-servers/rnix-lsp/default.nix
diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix
index bd9e704eef329..bd9e704eef329 100644
--- a/pkgs/development/tools/sumneko-lua-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix
diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix
index 5b5b87b0392f6..5b5b87b0392f6 100644
--- a/pkgs/development/tools/misc/svls/default.nix
+++ b/pkgs/development/tools/language-servers/svls/default.nix
diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/language-servers/vala-language-server/default.nix
index 52e33fee6b608..52e33fee6b608 100644
--- a/pkgs/development/tools/vala-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/vala-language-server/default.nix
diff --git a/pkgs/development/tools/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix
index d39b91180f98a..d39b91180f98a 100644
--- a/pkgs/development/tools/verible/default.nix
+++ b/pkgs/development/tools/language-servers/verible/default.nix
diff --git a/pkgs/development/tools/verible/remove-unused-deps.patch b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch
index 19d20309c106b..19d20309c106b 100644
--- a/pkgs/development/tools/verible/remove-unused-deps.patch
+++ b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2ae6cfc422f4..dc34a47dfa80b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -320,8 +320,6 @@ with pkgs;
 
   buf = callPackage ../development/tools/buf { };
 
-  buf-language-server = callPackage ../development/tools/buf-language-server { };
-
   cbfmt = callPackage ../development/tools/cbfmt { };
 
   cfn-nag = callPackage ../development/tools/cfn-nag { };
@@ -12678,8 +12676,6 @@ with pkgs;
 
   verco = callPackage ../applications/version-management/verco { };
 
-  verible = callPackage ../development/tools/verible { };
-
   verilator = callPackage ../applications/science/electronics/verilator {};
 
   verilog = callPackage ../applications/science/electronics/verilog {
@@ -14835,8 +14831,6 @@ with pkgs;
   kotlin = callPackage ../development/compilers/kotlin { };
   kotlin-native = callPackage ../development/compilers/kotlin/native.nix { };
 
-  kotlin-language-server = callPackage ../development/tools/kotlin-language-server {};
-
   lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
     fpc = fpc;
   };
@@ -15003,8 +14997,6 @@ with pkgs;
 
   microscheme = callPackage ../development/compilers/microscheme { };
 
-  millet = callPackage ../development/tools/millet {};
-
   mint = callPackage ../development/compilers/mint { };
 
   mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { };
@@ -15556,7 +15548,6 @@ with pkgs;
     coursier = coursier.override { jre = jdk8; };
   };
 
-  metals = callPackage ../development/tools/metals { };
   scalafix = callPackage ../development/tools/scalafix {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
@@ -16582,7 +16573,47 @@ with pkgs;
 
   ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
 
-  ansible-language-server = callPackage ../development/tools/ansible-language-server { };
+  ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
+
+  ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { };
+
+  beancount-language-server = callPackage ../development/tools/language-servers/beancount-language-server { };
+
+  buf-language-server = callPackage ../development/tools/language-servers/buf-language-server { };
+
+  ccls = callPackage ../development/tools/language-servers/ccls {
+    llvmPackages = llvmPackages_latest;
+  };
+
+  fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { };
+
+  fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { };
+
+  gopls = callPackage ../development/tools/language-servers/gopls { };
+
+  jdt-language-server = callPackage ../development/tools/language-servers/jdt-language-server { };
+
+  jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { };
+
+  kotlin-language-server = callPackage ../development/tools/language-servers/kotlin-language-server { };
+
+  metals = callPackage ../development/tools/language-servers/metals { };
+
+  millet = callPackage ../development/tools/language-servers/millet { };
+
+  nil = callPackage ../development/tools/language-servers/nil { };
+
+  rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { nix = nixVersions.nix_2_9; };
+
+  sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/sumneko-lua-language-server {
+    inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation;
+  };
+
+  svls = callPackage ../development/tools/language-servers/svls { };
+
+  vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { };
+
+  verible = callPackage ../development/tools/language-servers/verible { };
 
   ansible-later = with python3.pkgs; toPythonApplication ansible-later;
 
@@ -17070,10 +17101,6 @@ with pkgs;
 
   cpplint = callPackage ../development/tools/analysis/cpplint { };
 
-  ccls = callPackage ../development/tools/misc/ccls {
-    llvmPackages = llvmPackages_latest;
-  };
-
   credstash = with python3Packages; toPythonApplication credstash;
 
   creduce = callPackage ../development/tools/misc/creduce {
@@ -17313,10 +17340,6 @@ with pkgs;
 
   fprettify = callPackage ../development/tools/fprettify { };
 
-  fortls = python3.pkgs.callPackage ../development/tools/fortls { };
-
-  fortran-language-server = python3.pkgs.callPackage ../development/tools/fortran-language-server { };
-
   framac = callPackage ../development/tools/analysis/frama-c { };
 
   frame = callPackage ../development/libraries/frame { };
@@ -17749,8 +17772,6 @@ with pkgs;
 
   nap = callPackage ../development/tools/nap { };
 
-  nil = callPackage ../development/tools/nil { };
-
   ninja = callPackage ../development/tools/build-managers/ninja { };
 
   nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };
@@ -17996,8 +18017,6 @@ with pkgs;
 
   rman = callPackage ../development/tools/misc/rman { };
 
-  rnix-lsp = callPackage ../development/tools/rnix-lsp { nix = nixVersions.nix_2_9; };
-
   rnginline = with python3Packages; toPythonApplication rnginline;
 
   rolespec = callPackage ../development/tools/misc/rolespec { };
@@ -18174,8 +18193,6 @@ with pkgs;
 
   svlint = callPackage ../development/tools/analysis/svlint { };
 
-  svls = callPackage ../development/tools/misc/svls { };
-
   swarm = callPackage ../development/tools/analysis/swarm { };
 
   swiftformat = callPackage ../development/tools/swiftformat { };
@@ -18302,8 +18319,6 @@ with pkgs;
 
   vagrant = callPackage ../development/tools/vagrant {};
 
-  vala-language-server = callPackage ../development/tools/vala-language-server {};
-
   bashdb = callPackage ../development/tools/misc/bashdb { };
 
   gdb = callPackage ../development/tools/misc/gdb {
@@ -20090,8 +20105,6 @@ with pkgs;
 
   jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
 
-  jsonnet-language-server = callPackage ../development/tools/jsonnet-language-server { };
-
   jrsonnet = callPackage ../development/compilers/jrsonnet { };
 
   go-jsonnet = callPackage ../development/compilers/go-jsonnet { };
@@ -25864,8 +25877,6 @@ with pkgs;
 
   gomodifytags = callPackage ../development/tools/gomodifytags { };
 
-  gopls = callPackage ../development/tools/gopls { };
-
   gops = callPackage ../development/tools/gops { };
 
   gore = callPackage ../development/tools/gore { };
@@ -26772,8 +26783,6 @@ with pkgs;
 
   iwona = callPackage ../data/fonts/iwona { };
 
-  jdt-language-server = callPackage ../development/tools/jdt-language-server {};
-
   jetbrains-mono = callPackage ../data/fonts/jetbrains-mono { };
 
   jost = callPackage ../data/fonts/jost { };
@@ -34003,8 +34012,6 @@ with pkgs;
 
   beancount-black = with python3.pkgs; toPythonApplication beancount-black;
 
-  beancount-language-server = callPackage ../development/tools/beancount-language-server {};
-
   bean-add = callPackage ../applications/office/beancount/bean-add.nix { };
 
   bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench;
@@ -37545,10 +37552,6 @@ with pkgs;
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/sumneko-lua-language-server {
-    inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation;
-  };
-
   sysz = callPackage  ../tools/misc/sysz { };
 
   go-swag = callPackage ../development/tools/go-swag { };