From ed3e3d8aa36fb381566a018dfee193e696924903 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 May 2023 06:12:39 +0000
Subject: [PATCH 1/3] python310Packages.pyjnius: 1.4.2 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix
index 5d8d7f7da01c..786312ae9379 100644
--- a/pkgs/development/python-modules/pyjnius/default.nix
+++ b/pkgs/development/python-modules/pyjnius/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pyjnius";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/AY3zaSuEo7EqWrDJ9NS6H6oZnZLAdliZyhwvlOana4=";
+    hash = "sha256-ZjRuJk8eIghrh8XINonqvP7xRQrGR2/YVr6kmLLhNz4=";
   };
   propagatedBuildInputs = [
     six

From a98b9e251bf191c4de9a12b0490472779a3dd334 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 17 May 2023 09:53:25 +0200
Subject: [PATCH 2/3] python310Packages.pyjnius: add changelog to meta

---
 .../python-modules/pyjnius/default.nix            | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix
index 786312ae9379..52915a7c4a95 100644
--- a/pkgs/development/python-modules/pyjnius/default.nix
+++ b/pkgs/development/python-modules/pyjnius/default.nix
@@ -1,8 +1,8 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , cython
 , fetchPypi
 , jdk
-, lib
 , six
 }:
 
@@ -14,17 +14,24 @@ buildPythonPackage rec {
     inherit pname version;
     hash = "sha256-ZjRuJk8eIghrh8XINonqvP7xRQrGR2/YVr6kmLLhNz4=";
   };
+
   propagatedBuildInputs = [
     six
   ];
 
-  nativeBuildInputs = [ jdk cython ];
+  nativeBuildInputs = [
+    jdk
+    cython
+  ];
 
-  pythonImportsCheck = [ "jnius" ];
+  pythonImportsCheck = [
+    "jnius"
+  ];
 
   meta = with lib; {
     description = "A Python module to access Java classes as Python classes using the Java Native Interface (JNI)";
     homepage = "https://github.com/kivy/pyjnius";
+    changelog = "https://github.com/kivy/pyjnius/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ ifurther ];
   };

From d52c763b99ca324c10c91d245b9b57a81d6d342b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 17 May 2023 09:55:01 +0200
Subject: [PATCH 3/3]  python310Packages.pyjnius: disable on unsupported Python
 releases

- add format
---
 pkgs/development/python-modules/pyjnius/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix
index 52915a7c4a95..292c5f1c116a 100644
--- a/pkgs/development/python-modules/pyjnius/default.nix
+++ b/pkgs/development/python-modules/pyjnius/default.nix
@@ -3,22 +3,21 @@
 , cython
 , fetchPypi
 , jdk
-, six
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "pyjnius";
   version = "1.5.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ZjRuJk8eIghrh8XINonqvP7xRQrGR2/YVr6kmLLhNz4=";
   };
 
-  propagatedBuildInputs = [
-    six
-  ];
-
   nativeBuildInputs = [
     jdk
     cython