From 7761ae9ec0568f3c87837b0b80737cbdfcc20871 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Aug 2022 23:49:01 +0000
Subject: [PATCH 1/2] python310Packages.defcon: 0.10.1 -> 0.10.2

---
 pkgs/development/python-modules/defcon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 12cbdf0a210d..8629a5bb1f84 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "defcon";
-  version = "0.10.1";
+  version = "0.10.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+nlk9xG3mOCS4xHzp54J/V+he7HNMg1aMgFeTFTrMHA=";
+    sha256 = "sha256-ruOW5taeRa5lyCZHgTktTCkRaTSyc3rXbYIwtAwYKkQ=";
     extension = "zip";
   };
 

From e3884e3c677a4235285cede0cf04ab4ec75b53a5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 12 Aug 2022 10:31:18 +0200
Subject: [PATCH 2/2] python310Packages.defcon: update disabled

- add pythonImportsCheck
- switch to pytestCheckHook
---
 .../python-modules/defcon/default.nix         | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 8629a5bb1f84..1cfa630337f5 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -1,17 +1,26 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
-, fonttools, setuptools-scm
-, pytest, pytest-runner, lxml, fs, unicodedata2, fontpens
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fontpens
+, fonttools
+, fs
+, lxml
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+, unicodedata2
 }:
 
 buildPythonPackage rec {
   pname = "defcon";
   version = "0.10.2";
+  format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ruOW5taeRa5lyCZHgTktTCkRaTSyc3rXbYIwtAwYKkQ=";
+    hash = "sha256-ruOW5taeRa5lyCZHgTktTCkRaTSyc3rXbYIwtAwYKkQ=";
     extension = "zip";
   };
 
@@ -24,18 +33,21 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
-    pytest-runner
-    lxml
-    fs
-    unicodedata2
     fontpens
+    fs
+    lxml
+    pytestCheckHook
+    unicodedata2
+  ];
+
+  pythonImportsCheck = [
+    "defcon"
   ];
 
   meta = with lib; {
     description = "A set of UFO based objects for use in font editing applications";
     homepage = "https://github.com/robotools/defcon";
     license = licenses.mit;
-    maintainers = [ maintainers.sternenseemann ];
+    maintainers = with maintainers; [ sternenseemann ];
   };
 }