diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/by-name/cm/cmake-language-server/package.nix
similarity index 88%
rename from pkgs/development/tools/misc/cmake-language-server/default.nix
rename to pkgs/by-name/cm/cmake-language-server/package.nix
index a94f24105328..c9efc80dbe2b 100644
--- a/pkgs/development/tools/misc/cmake-language-server/default.nix
+++ b/pkgs/by-name/cm/cmake-language-server/package.nix
@@ -1,23 +1,17 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
 
-  # build-system
-  pdm-backend,
-
   # dependencies
   cmake-format,
-  pygls,
 
   # tests
   cmake,
-  pytest-datadir,
-  pytestCheckHook,
   versionCheckHook,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cmake-language-server";
   version = "0.1.11";
   pyproject = true;
@@ -37,13 +31,12 @@ buildPythonApplication rec {
         "CALL_TIMEOUT = 10"
   '';
 
-  build-system = [
+  build-system = with python3Packages; [
     pdm-backend
   ];
   dontUseCmakeConfigure = true;
 
-  dependencies = [
-    cmake-format
+  dependencies = with python3Packages; [
     pygls
   ];
 
@@ -52,10 +45,12 @@ buildPythonApplication rec {
   nativeCheckInputs = [
     cmake
     cmake-format
+  ]
+  ++ (with python3Packages; [
     pytest-datadir
     pytestCheckHook
     versionCheckHook
-  ];
+  ]);
   versionCheckProgramArg = "--version";
 
   # version.py generated by pdm, no idea why it's not present in test phase
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 780faa072ac8..a4026f9f4022 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6788,12 +6788,6 @@ with pkgs;
 
   cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };
 
-  cmake-language-server =
-    python3Packages.callPackage ../development/tools/misc/cmake-language-server
-      {
-        inherit cmake cmake-format;
-      };
-
   # Does not actually depend on Qt 5
   inherit (plasma5Packages) extra-cmake-modules;