From 3baa9cf69d42931ebd62fccd5f3f88d0e0d4bbef Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 6 May 2026 16:45:36 -0500
Subject: [PATCH 1/2] whatstyle: migrate to by-name

---
 .../default.nix => by-name/wh/whatstyle/package.nix}        | 6 +++++-
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{development/tools/misc/whatstyle/default.nix => by-name/wh/whatstyle/package.nix} (93%)

diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/by-name/wh/whatstyle/package.nix
similarity index 93%
rename from pkgs/development/tools/misc/whatstyle/default.nix
rename to pkgs/by-name/wh/whatstyle/package.nix
index 07c78d872452..7002bcf7c055 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/by-name/wh/whatstyle/package.nix
@@ -2,9 +2,13 @@
   lib,
   python3,
   fetchFromGitHub,
-  clang-unwrapped,
+  llvmPackages,
 }:
 
+let
+  inherit (llvmPackages) clang-unwrapped;
+in
+
 python3.pkgs.buildPythonApplication rec {
   pname = "whatstyle";
   version = "0.2.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f9e52e654f5..fa646b8b371d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5891,10 +5891,6 @@ with pkgs;
       '';
     };
 
-  whatstyle = callPackage ../development/tools/misc/whatstyle {
-    inherit (llvmPackages) clang-unwrapped;
-  };
-
   whisper-cpp-vulkan = whisper-cpp.override {
     vulkanSupport = true;
   };

From 3626582a48cb82a173164ca744d64b751cd4d783 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 6 May 2026 16:46:47 -0500
Subject: [PATCH 2/2] whatstyle: switch to finalAttrs and python3Packages

---
 pkgs/by-name/wh/whatstyle/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wh/whatstyle/package.nix b/pkgs/by-name/wh/whatstyle/package.nix
index 7002bcf7c055..e0c5f90b5c5f 100644
--- a/pkgs/by-name/wh/whatstyle/package.nix
+++ b/pkgs/by-name/wh/whatstyle/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   llvmPackages,
 }:
@@ -9,21 +9,21 @@ let
   inherit (llvmPackages) clang-unwrapped;
 in
 
-python3.pkgs.buildPythonApplication rec {
+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 = [
@@ -40,4 +40,4 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})