diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/by-name/wh/whatstyle/package.nix
similarity index 69%
rename from pkgs/development/tools/misc/whatstyle/default.nix
rename to pkgs/by-name/wh/whatstyle/package.nix
index 07c78d872452..e0c5f90b5c5f 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/by-name/wh/whatstyle/package.nix
@@ -1,25 +1,29 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
-  clang-unwrapped,
+  llvmPackages,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  inherit (llvmPackages) clang-unwrapped;
+in
+
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "whatstyle";
   version = "0.2.0";
   format = "setuptools";
   src = fetchFromGitHub {
     owner = "mikr";
     repo = "whatstyle";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-4LCZAEUQFPl4CBPeuqsodiAlwd8uBg+SudF5d+Vz4Gc=";
   };
 
   # Fix references to previous version, to avoid confusion:
   postPatch = ''
-    substituteInPlace setup.py --replace-fail 0.1.9 ${version}
-    substituteInPlace whatstyle.py --replace-fail 0.1.9 ${version}
+    substituteInPlace setup.py --replace-fail 0.1.9 ${finalAttrs.version}
+    substituteInPlace whatstyle.py --replace-fail 0.1.9 ${finalAttrs.version}
   '';
 
   nativeCheckInputs = [
@@ -36,4 +40,4 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03c7ecfa0170..388b6df04a4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5861,10 +5861,6 @@ with pkgs;
       '';
     };
 
-  whatstyle = callPackage ../development/tools/misc/whatstyle {
-    inherit (llvmPackages) clang-unwrapped;
-  };
-
   whisper-cpp-vulkan = whisper-cpp.override {
     vulkanSupport = true;
   };