From 963db4ae44a48211ba1b6864536618328c1d42c2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 17 Aug 2026 12:39:36 +0300
Subject: [PATCH 1/2] docstrfmt: switch to `python3Packages`

Makes cross compilation a bit more accurate, see:
https://github.com/NixOS/nixpkgs/issues/211340
---
 pkgs/by-name/do/docstrfmt/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/do/docstrfmt/package.nix b/pkgs/by-name/do/docstrfmt/package.nix
index 2aeb29fae8fb..abc41b8c0ab9 100644
--- a/pkgs/by-name/do/docstrfmt/package.nix
+++ b/pkgs/by-name/do/docstrfmt/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
 }:
 
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "docstrfmt";
   version = "2.0.2";
   pyproject = true;
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   };
 
   build-system = [
-    python3.pkgs.flit-core
+    python3Packages.flit-core
   ];
 
   pythonRelaxDeps = [
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     "types-docutils"
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     black
     click
     coverage
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     types-docutils
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     pytest-aiohttp
   ];

From 1bb13929c51492170f6af3f181d7f178d4e76eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 17 Aug 2026 10:48:21 +0200
Subject: [PATCH 2/2] docstrfmt: 2.0.2 -> 2.2.0

---
 pkgs/by-name/do/docstrfmt/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/docstrfmt/package.nix b/pkgs/by-name/do/docstrfmt/package.nix
index abc41b8c0ab9..a574fc2e2e29 100644
--- a/pkgs/by-name/do/docstrfmt/package.nix
+++ b/pkgs/by-name/do/docstrfmt/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "docstrfmt";
-  version = "2.0.2";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LilSpazJoekp";
     repo = "docstrfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N2uPFOdDvAUL9eV4kn8MYM6OTMWJm24inlyY+k9Eqm8=";
+    hash = "sha256-DMeTrFHSJpUPBsE70dZ96WwQuY6C1POAGOJkSRfa2ho=";
   };
 
   build-system = [
@@ -45,6 +45,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pytest-aiohttp
   ];
 
+  disabledTests = [
+    # Failure due to different behavior of click, see:
+    # https://github.com/LilSpazJoekp/docstrfmt/issues/232
+    "test_invalid_line_length[tests/test_files/test_file.rst]"
+    "test_invalid_line_length[tests/test_files/py_file.py]"
+    "test_invalid_pyproject_toml"
+    "test_cache_single_file"
+  ];
+
   pythonImportsCheck = [
     "docstrfmt"
   ];