From 344752d02cdb580294e20f2bd8243b040e23ce75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 May 2022 12:28:07 +0200
Subject: [PATCH 1/2] python310Packages.fastjsonschema: 2.15.2 -> 2.15.3

---
 .../python-modules/fastjsonschema/default.nix   | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix
index 415f226b783c..23a552a9b4cd 100644
--- a/pkgs/development/python-modules/fastjsonschema/default.nix
+++ b/pkgs/development/python-modules/fastjsonschema/default.nix
@@ -1,24 +1,23 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "fastjsonschema";
-  version = "2.15.2";
+  version = "2.15.3";
   format = "setuptools";
 
-  disabled = pythonOlder "3.3";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "horejsek";
     repo = "python-fastjsonschema";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-zrdQVFfLZxZRr9qvss4CI3LJK97xl+bY+AcPzcweYeU=";
+    sha256 = "sha256-WKnjSlKtMGpWKPbPr7hpS6Dg0+9i/nWVYmar0N3Q9Pc=";
   };
 
   checkInputs = [
@@ -27,16 +26,6 @@ buildPythonPackage rec {
 
   dontUseSetuptoolsCheck = true;
 
-  patches = [
-    # Can be removed with the next release, https://github.com/horejsek/python-fastjsonschema/pull/134
-    (fetchpatch {
-      name = "fix-exception-name.patch";
-      url = "https://github.com/horejsek/python-fastjsonschema/commit/f639dcba0299926d688e1d8d08a6a91bfe70ce8b.patch";
-      sha256 = "sha256-yPV5ZNeyAobLrYf5QHanPsEomBPJ/7ZN2148R8NO4/U=";
-    })
-  ];
-
-
   disabledTests = [
     "benchmark"
     # these tests require network access

From 17cf602ea4ccd5da3650e622c172ec7b214c67fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 May 2022 14:34:10 +0200
Subject: [PATCH 2/2] python310Packages.typical: update check part

---
 .../python-modules/typical/default.nix        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix
index 96a07802b1c8..066c3f452ed1 100644
--- a/pkgs/development/python-modules/typical/default.nix
+++ b/pkgs/development/python-modules/typical/default.nix
@@ -14,7 +14,7 @@
 , pytestCheckHook
 , pythonOlder
 , sqlalchemy
-, typing-extensions
+, ujson
 }:
 
 buildPythonPackage rec {
@@ -22,7 +22,8 @@ buildPythonPackage rec {
   version = "2.8.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  # Support for typing-extensions >= 4.0.0 on Python < 3.10 is missing
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "seandstewart";
@@ -36,13 +37,12 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    inflection
-    pendulum
     fastjsonschema
-    orjson
     future-typing
-  ] ++ lib.optionals (pythonOlder "3.10") [
-    typing-extensions
+    inflection
+    orjson
+    pendulum
+    ujson
   ];
 
   checkInputs = [
@@ -63,13 +63,14 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # We use orjson
-    "test_ujson"
     # ConstraintValueError: Given value <{'key...
     "test_tagged_union_validate"
+    # TypeError: 'NoneType' object cannot be interpreted as an integer
+    "test_ujson"
   ];
 
   disabledTestPaths = [
+    # We don't care about benchmarks
     "benchmark/"
     # Tests are failing on Hydra
     "tests/mypy/test_mypy.py"