From eee3d03b714913922697c5a6635d99af26f7a953 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Mar 2022 22:21:52 +0000
Subject: [PATCH 1/2] python310Packages.pybindgen: 0.22.0 -> 0.22.1

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

diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix
index 18d688c3db3d..cb497c87ac06 100644
--- a/pkgs/development/python-modules/pybindgen/default.nix
+++ b/pkgs/development/python-modules/pybindgen/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, isPy3k, setuptools-scm, pygccxml }:
 buildPythonPackage rec {
   pname = "PyBindGen";
-  version = "0.22.0";
+  version = "0.22.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b4837d3138ac56863d93fe462f1dac39fb87bd50898e0da4c57fefd645437ac";
+    sha256 = "sha256-jH8iORpJqEUY9aKtBuOlseg50Q402nYxUZyKKPy6N2Q=";
   };
 
   buildInputs = [ setuptools-scm ];

From 52bd410a123b7d2ec966629666095926655afe22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 31 Mar 2022 09:42:09 +0200
Subject: [PATCH 2/2] python310Packages.pybindgen: add pythonImportsCheck

---
 .../python-modules/pybindgen/default.nix      | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix
index cb497c87ac06..ab18b4886bda 100644
--- a/pkgs/development/python-modules/pybindgen/default.nix
+++ b/pkgs/development/python-modules/pybindgen/default.nix
@@ -1,22 +1,44 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools-scm, pygccxml }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pygccxml
+, pythonOlder
+, setuptools-scm
+}:
+
 buildPythonPackage rec {
-  pname = "PyBindGen";
+  pname = "pybindgen";
   version = "0.22.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-jH8iORpJqEUY9aKtBuOlseg50Q402nYxUZyKKPy6N2Q=";
+    pname = "PyBindGen";
+    inherit version;
+    hash = "sha256-jH8iORpJqEUY9aKtBuOlseg50Q402nYxUZyKKPy6N2Q=";
   };
 
-  buildInputs = [ setuptools-scm ];
+  buildInputs = [
+    setuptools-scm
+  ];
 
-  checkInputs = [ pygccxml ];
-  doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k
+  checkInputs = [
+    pygccxml
+  ];
+
+  pythonImportsCheck = [
+    "pybindgen"
+  ];
+
+  # Fails to import module 'cxxfilt' from pygccxml on Py3k
+  doCheck = (!isPy3k);
 
   meta = with lib; {
-    homepage = "https://github.com/gjcarneiro/pybindgen";
     description = "Python Bindings Generator";
-    license = licenses.lgpl2;
+    homepage = "https://github.com/gjcarneiro/pybindgen";
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ teto ];
   };
 }