From 01830e7b6863e9f017f75c7c3b759b1d5a855ce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Feb 2023 03:00:48 +0000
Subject: [PATCH 1/5] python310Packages.rebulk: 3.1.0 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index 570654dc7e15..cfd1b83d0633 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "rebulk";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a";
+    sha256 = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw=";
   };
 
   # Some kind of trickery with imports that doesn't work.

From 80cfa1ecef185e6465a935a810f9b85a6e068d6b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 08:51:11 +0100
Subject: [PATCH 2/5] python310Packages.rebulk: add changelog to meta

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

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index cfd1b83d0633..49f12b9753c5 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -15,8 +15,10 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six regex ];
 
   meta = with lib; {
-    homepage = "https://github.com/Toilal/rebulk/";
-    license = licenses.mit;
     description = "Advanced string matching from simple patterns";
+    homepage = "https://github.com/Toilal/rebulk/";
+    changelog = "https://github.com/Toilal/rebulk/blob/v${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

From 499672e5979ad6376b6131a7d80e0922f0370e62 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 08:52:19 +0100
Subject: [PATCH 3/5] python310Packages.rebulk: add pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index 49f12b9753c5..f0162657f7b8 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -14,6 +14,10 @@ buildPythonPackage rec {
   buildInputs = [ pytest pytest-runner ];
   propagatedBuildInputs = [ six regex ];
 
+  pythonImportsCheck = [
+    "rebulk"
+  ];
+
   meta = with lib; {
     description = "Advanced string matching from simple patterns";
     homepage = "https://github.com/Toilal/rebulk/";

From 18964e09c99fdd9adb50766f9f8a1d4d1a9b8ade Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 08:53:43 +0100
Subject: [PATCH 4/5] python310Packages.rebulk: disable on unsupported Python
 releases

---
 pkgs/development/python-modules/rebulk/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index f0162657f7b8..4d2023ce2b44 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -1,8 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "rebulk";
   version = "3.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;

From cae59a67b0defa2c35bfd556d66eb02d4e654422 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 08:56:53 +0100
Subject: [PATCH 5/5] python310Packages.rebulk: adjust inputs and enable tests

---
 .../python-modules/rebulk/default.nix         | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index 4d2023ce2b44..cab55c3a29fe 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -1,4 +1,10 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex, pythonOlder }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, regex
+}:
 
 buildPythonPackage rec {
   pname = "rebulk";
@@ -9,13 +15,16 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw=";
+    hash = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw=";
   };
 
-  # Some kind of trickery with imports that doesn't work.
-  doCheck = false;
-  buildInputs = [ pytest pytest-runner ];
-  propagatedBuildInputs = [ six regex ];
+  propagatedBuildInputs = [
+    regex
+  ];
+
+  buildInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "rebulk"