From 11919c49d3fbd072b2dcc0f6bbf862480ac45b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 15 Jun 2025 10:33:58 -0700
Subject: [PATCH] python3Packages.graphviz: 0.20.3 -> 0.21

Diff: https://github.com/xflr6/graphviz/compare/refs/tags/0.20.3...refs/tags/0.21

Changelog: https://github.com/xflr6/graphviz/blob/0.21/CHANGES.rst
---
 .../python-modules/graphviz/default.nix       | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index 9af39497f215..49d7d3d68b34 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   replaceVars,
   graphviz-nox,
@@ -11,24 +10,22 @@
   freefont_ttf,
   setuptools,
   mock,
-  pytest_7,
+  pytest-cov-stub,
   pytest-mock,
-  python,
+  pytest7CheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "graphviz";
-  version = "0.20.3";
+  version = "0.21";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  # patch does not apply to PyPI tarball due to different line endings
   src = fetchFromGitHub {
     owner = "xflr6";
     repo = "graphviz";
     tag = version;
-    hash = "sha256-IqjqcBEL4BK/VfRjdxJ9t/DkG8OMAoXJxbW5JXpALuw=";
+    hash = "sha256-o6woY+UhbsJtUqIzYGXlC0Pw3su7WG4xlAKSslSADwI=";
   };
 
   patches = [
@@ -38,10 +35,6 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = ''
-    sed -i "/--cov/d" setup.cfg
-  '';
-
   # Fontconfig error: Cannot load default config file
   FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
 
@@ -49,26 +42,20 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     mock
-    pytest_7
+    pytest-cov-stub
     pytest-mock
+    pytest7CheckHook
+    writableTmpDirAsHomeHook
   ];
 
-  checkPhase = ''
-    runHook preCheck
-
-    HOME=$TMPDIR ${python.interpreter} run-tests.py
-
-    runHook postCheck
-  '';
-
   # Too many failures due to attempting to connect to com.apple.fonts daemon
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  meta = with lib; {
+  meta = {
     description = "Simple Python interface for Graphviz";
     homepage = "https://github.com/xflr6/graphviz";
-    changelog = "https://github.com/xflr6/graphviz/blob/${src.rev}/CHANGES.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    changelog = "https://github.com/xflr6/graphviz/blob/${src.tag}/CHANGES.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }