From 112f4ba4f3d7f96567ea710531e12a7e62652f38 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:12:35 +0000
Subject: [PATCH 1/3] python3Packages.ufmt: cleanup

---
 .../python-modules/ufmt/default.nix           | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 7f55664ad786..91e01ec1beff 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -1,20 +1,28 @@
 {
   lib,
-  black,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
+
+  # build-system
   flit-core,
+
+  # dependencies
+  black,
+  click,
   libcst,
   moreorless,
-  pygls,
-  pythonOlder,
   tomlkit,
   trailrunner,
-  ruff-api,
   typing-extensions,
-  unittestCheckHook,
   usort,
+
+  # optional-dependencies
+  pygls,
+  ruff-api,
+
+  # tests
+  unittestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -22,8 +30,6 @@ buildPythonPackage rec {
   version = "2.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "ufmt";
@@ -51,17 +57,19 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     unittestCheckHook
+    versionCheckHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
+  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "ufmt" ];
 
-  meta = with lib; {
+  meta = {
     description = "Safe, atomic formatting with black and usort";
     homepage = "https://github.com/omnilib/ufmt";
     changelog = "https://github.com/omnilib/ufmt/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ufmt";
   };
 }

From 644dcf5ebb3b7d4c56d698abd32cf170271fe78d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:13:15 +0000
Subject: [PATCH 2/3] python3Packages.ufmt: skip tests broken by click update

https://github.com/NixOS/nixpkgs/pull/448189
---
 pkgs/development/python-modules/ufmt/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 91e01ec1beff..2b1e370f697d 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -37,6 +37,13 @@ buildPythonPackage rec {
     hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw=";
   };
 
+  # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+  # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+  postPatch = ''
+    substituteInPlace ufmt/tests/__init__.py \
+      --replace-fail "from .cli import CliTest" ""
+  '';
+
   build-system = [ flit-core ];
 
   dependencies = [

From 032a192de6910eba9b12ed520ca9b7eaa2861264 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:14:36 +0000
Subject: [PATCH 3/3] ufmt: move to by-name

---
 pkgs/by-name/uf/ufmt/package.nix | 1 +
 pkgs/top-level/all-packages.nix  | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/uf/ufmt/package.nix

diff --git a/pkgs/by-name/uf/ufmt/package.nix b/pkgs/by-name/uf/ufmt/package.nix
new file mode 100644
index 000000000000..6c1728c35114
--- /dev/null
+++ b/pkgs/by-name/uf/ufmt/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication ufmt
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65617f48b5d..01f43f329f73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4204,8 +4204,6 @@ with pkgs;
     libjpeg_turbo = libjpeg_turbo.override { enableJava = true; };
   };
 
-  ufmt = with python3Packages; toPythonApplication ufmt;
-
   unbound-with-systemd = unbound.override {
     withSystemd = true;
   };