From 1d49c42c9424d0eb88c28b3bb44c528c12143558 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 12:10:29 +0100
Subject: [PATCH 1/7] python311Packages.typish: add changelog to meta

---
 pkgs/development/python-modules/typish/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix
index c0942c701683..c2f343c1e843 100644
--- a/pkgs/development/python-modules/typish/default.nix
+++ b/pkgs/development/python-modules/typish/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for checking types of objects";
     homepage = "https://github.com/ramonhagenaars/typish";
+    changelog = "https://github.com/ramonhagenaars/typish/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fmoda3 ];
   };

From 76121747a663cbe12afecbcdcbfda2b5542a01e9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 12:15:53 +0100
Subject: [PATCH 2/7] python311Packages.typish: disable on unsupported Python
 releases

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

diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix
index c2f343c1e843..0bad77767013 100644
--- a/pkgs/development/python-modules/typish/default.nix
+++ b/pkgs/development/python-modules/typish/default.nix
@@ -3,11 +3,15 @@
 , fetchFromGitHub
 , numpy
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "typish";
   version = "1.9.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ramonhagenaars";

From 486df414530d0ee2218c754a2337efd35e058946 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 12:53:33 +0100
Subject: [PATCH 3/7] python310Packages.typish: use tag

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

diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix
index 0bad77767013..63fce293d671 100644
--- a/pkgs/development/python-modules/typish/default.nix
+++ b/pkgs/development/python-modules/typish/default.nix
@@ -16,8 +16,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramonhagenaars";
     repo = "typish";
-    rev = "7875850f55e2df8a9e2426e2d484ab618e347c7f";
-    sha256 = "0mc5hw92f15mwd92rb2q9isc4wi7xq76449w7ph5bskcspas0wrf";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LnOg1dVs6lXgPTwRYg7uJ3LCdExYrCxS47UEJxKHhVU=";
   };
 
   nativeCheckInputs = [

From 60ba095d7b34d4fd8f74b95fd1ff24fc53cab4ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 13:13:36 +0100
Subject: [PATCH 4/7] python310Packages.jsons: add changelog to meta

---
 pkgs/development/python-modules/jsons/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/jsons/default.nix b/pkgs/development/python-modules/jsons/default.nix
index 457bcf4f6525..29d5e8c27aaa 100644
--- a/pkgs/development/python-modules/jsons/default.nix
+++ b/pkgs/development/python-modules/jsons/default.nix
@@ -41,6 +41,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Turn Python objects into dicts or json strings and back";
     homepage = "https://github.com/ramonhagenaars/jsons";
+    changelog = "https://github.com/ramonhagenaars/jsons/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fmoda3 ];
   };

From ee1dcddd159c9d12bebabe3c7033c786222d1543 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 13:14:30 +0100
Subject: [PATCH 5/7] python310Packages.jsons: disable on unsupported Python
 releases

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

diff --git a/pkgs/development/python-modules/jsons/default.nix b/pkgs/development/python-modules/jsons/default.nix
index 29d5e8c27aaa..416ab8d9cbc5 100644
--- a/pkgs/development/python-modules/jsons/default.nix
+++ b/pkgs/development/python-modules/jsons/default.nix
@@ -1,8 +1,9 @@
 { lib
+, attrs
 , buildPythonPackage
 , fetchFromGitHub
-, attrs
 , pytestCheckHook
+, pythonOlder
 , typish
 , tzdata
 }:
@@ -10,6 +11,9 @@
 buildPythonPackage rec {
   pname = "jsons";
   version = "1.6.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ramonhagenaars";

From 348edf4ff97648e7e6ac75c3b887132b7e91e210 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 13:17:16 +0100
Subject: [PATCH 6/7] python310Packages.jsons: disable failing test on Python
 3.11

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

diff --git a/pkgs/development/python-modules/jsons/default.nix b/pkgs/development/python-modules/jsons/default.nix
index 416ab8d9cbc5..9a5116c94d6a 100644
--- a/pkgs/development/python-modules/jsons/default.nix
+++ b/pkgs/development/python-modules/jsons/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
+, pythonAtLeast
 , pythonOlder
 , typish
 , tzdata
@@ -18,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramonhagenaars";
     repo = "jsons";
-    rev = "v${version}";
-    sha256 = "0sdwc57f3lwzhbcapjdbay9f8rn65rlspxa67a2i5apcgg403qpc";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-7OIByHvsqhKFOkb1q2kuxmbkkleryavYgp/T4U5hvGk=";
   };
 
   propagatedBuildInputs = [
@@ -38,6 +39,11 @@ buildPythonPackage rec {
     "tests/test_performance.py"
   ];
 
+  disabledTests = lib.optionals (pythonAtLeast "3.11") [
+    # https://github.com/ramonhagenaars/jsons/issues/187
+    "test_dump_load_parameterized_collections"
+  ];
+
   pythonImportsCheck = [
     "jsons"
   ];

From c9fb0b33d722be28a53bb07deeb34bfef96ced37 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 12:51:22 +0100
Subject: [PATCH 7/7] python310Packages.typish: disable failing test on Python
 3.11

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

diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix
index 63fce293d671..c05518c257f0 100644
--- a/pkgs/development/python-modules/typish/default.nix
+++ b/pkgs/development/python-modules/typish/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , numpy
 , pytestCheckHook
+, pythonAtLeast
 , pythonOlder
 }:
 
@@ -31,6 +32,11 @@ buildPythonPackage rec {
     "tests/functions/test_instance_of.py"
   ];
 
+  disabledTests = lib.optionals (pythonAtLeast "3.11") [
+    # https://github.com/ramonhagenaars/typish/issues/32
+    "test_get_origin"
+  ];
+
   pythonImportsCheck = [
     "typish"
   ];