From f3b298708e2f18dd06daf4ff6567dd7df6ed15f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 11 Sep 2022 23:16:25 +0200
Subject: [PATCH 001/403] python3Packages.setuptools: 63.2.0 -> 65.3.0

---
 .../python-modules/setuptools/default.nix     | 16 +++-------
 .../setuptools/setuptools-distutils-C++.patch | 30 +++++++++----------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 2d3c06d602f1..9fab8747b67f 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , python
 , bootstrapped-pip
 , lib
@@ -11,7 +10,7 @@
 
 let
   pname = "setuptools";
-  version = "63.2.0";
+  version = "65.3.0";
 
   # Create an sdist of setuptools
   sdist = stdenv.mkDerivation rec {
@@ -20,22 +19,14 @@ let
     src = fetchFromGitHub {
       owner = "pypa";
       repo = pname;
-      rev = "v${version}";
-      hash = "sha256-GyQjc0XulUxl3Btpj7Q6KHTpd1FDZnXCYviYjjgK7tY=";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-LPguGVWvwEMZpJFuXWLVFzIlzw+/QSMjVi2oYh0cI0s=";
       name = "${pname}-${version}-source";
     };
 
     patches = [
       ./tag-date.patch
       ./setuptools-distutils-C++.patch
-      # Fix cross compilation of extension modules
-      # https://github.com/pypa/distutils/pull/173
-      (fetchpatch {
-        url = "https://github.com/pypa/distutils/commit/22b9bcf2e2d2a66f7dc96661312972e2f6bd9e01.patch";
-        hash = "sha256-IVb1LLgLIHO6HPn2911uksrLB1jG0MyQetdxkq5wcG4=";
-        stripLen = 2;
-        extraPrefix = "setuptools/_distutils/";
-      })
     ];
 
     buildPhase = ''
@@ -86,5 +77,6 @@ in buildPythonPackage rec {
     license = with licenses; [ psfl zpl20 ];
     platforms = python.meta.platforms;
     priority = 10;
+    maintainers = teams.python.members;
   };
 }
diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
index ae844ecd2d3f..1dfaf8c6d5f7 100644
--- a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
+++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
@@ -1,8 +1,8 @@
 diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py
-index 445e2e51..2fdbdcca 100644
+index 2c4da5b5..e2cd8803 100644
 --- a/setuptools/_distutils/cygwinccompiler.py
 +++ b/setuptools/_distutils/cygwinccompiler.py
-@@ -131,14 +131,19 @@ class CygwinCCompiler(UnixCCompiler):
+@@ -97,14 +97,19 @@ class CygwinCCompiler(UnixCCompiler):
          self.cxx = os.environ.get('CXX', 'g++')
  
          self.linker_dll = self.cc
@@ -15,14 +15,14 @@ index 445e2e51..2fdbdcca 100644
              compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
 +            compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx,
              linker_exe='%s -mcygwin' % self.cc,
-             linker_so=('%s -mcygwin %s' % (self.linker_dll, shared_option)),
+             linker_so=('{} -mcygwin {}'.format(self.linker_dll, shared_option)),
 +            linker_exe_cxx='%s -mcygwin' % self.cxx,
 +            linker_so_cxx=('%s -mcygwin %s' %
 +                (self.linker_dll_cxx, shared_option)),
          )
  
          # Include the appropriate MSVC runtime library if Python was built
-@@ -170,9 +175,12 @@ class CygwinCCompiler(UnixCCompiler):
+@@ -136,9 +141,12 @@ class CygwinCCompiler(UnixCCompiler):
                  raise CompileError(msg)
          else:  # for other files use the C-compiler
              try:
@@ -38,24 +38,24 @@ index 445e2e51..2fdbdcca 100644
              except DistutilsExecError as msg:
                  raise CompileError(msg)
  
-@@ -323,9 +331,12 @@ class Mingw32CCompiler(CygwinCCompiler):
+@@ -275,9 +283,12 @@ class Mingw32CCompiler(CygwinCCompiler):
          self.set_executables(
              compiler='%s -O -Wall' % self.cc,
              compiler_so='%s -mdll -O -Wall' % self.cc,
 +            compiler_so_cxx='%s -mdll -O -Wall' % self.cxx,
              compiler_cxx='%s -O -Wall' % self.cxx,
              linker_exe='%s' % self.cc,
-             linker_so='%s %s' % (self.linker_dll, shared_option),
+             linker_so='{} {}'.format(self.linker_dll, shared_option),
 +            linker_exe_cxx='%s' % self.cxx,
 +            linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option)
          )
  
          # Maybe we should also append -mthreads, but then the finished
 diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
-index e41d51ee..f7ded14b 100644
+index 3dd8185f..cb374a94 100644
 --- a/setuptools/_distutils/sysconfig.py
 +++ b/setuptools/_distutils/sysconfig.py
-@@ -280,6 +280,7 @@ def customize_compiler(compiler):
+@@ -289,6 +289,7 @@ def customize_compiler(compiler):  # noqa: C901
              cflags,
              ccshared,
              ldshared,
@@ -63,7 +63,7 @@ index e41d51ee..f7ded14b 100644
              shlib_suffix,
              ar,
              ar_flags,
-@@ -289,11 +290,14 @@ def customize_compiler(compiler):
+@@ -298,11 +299,14 @@ def customize_compiler(compiler):  # noqa: C901
              'CFLAGS',
              'CCSHARED',
              'LDSHARED',
@@ -78,7 +78,7 @@ index e41d51ee..f7ded14b 100644
          if 'CC' in os.environ:
              newcc = os.environ['CC']
              if 'LDSHARED' not in os.environ and ldshared.startswith(cc):
-@@ -305,19 +309,27 @@ def customize_compiler(compiler):
+@@ -314,19 +318,27 @@ def customize_compiler(compiler):  # noqa: C901
              cxx = os.environ['CXX']
          if 'LDSHARED' in os.environ:
              ldshared = os.environ['LDSHARED']
@@ -107,7 +107,7 @@ index e41d51ee..f7ded14b 100644
          if 'AR' in os.environ:
              ar = os.environ['AR']
          if 'ARFLAGS' in os.environ:
-@@ -326,13 +338,17 @@ def customize_compiler(compiler):
+@@ -335,13 +347,17 @@ def customize_compiler(compiler):  # noqa: C901
              archiver = ar + ' ' + ar_flags
  
          cc_cmd = cc + ' ' + cflags
@@ -127,10 +127,10 @@ index e41d51ee..f7ded14b 100644
          )
  
 diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py
-index 4be74fdf..66f95aef 100644
+index 4ab771a4..17abac83 100644
 --- a/setuptools/_distutils/unixccompiler.py
 +++ b/setuptools/_distutils/unixccompiler.py
-@@ -112,9 +112,12 @@ class UnixCCompiler(CCompiler):
+@@ -116,9 +116,12 @@ class UnixCCompiler(CCompiler):
          'preprocessor': None,
          'compiler': ["cc"],
          'compiler_so': ["cc"],
@@ -144,7 +144,7 @@ index 4be74fdf..66f95aef 100644
          'archiver': ["ar", "-cr"],
          'ranlib': None,
      }
-@@ -174,8 +177,13 @@ class UnixCCompiler(CCompiler):
+@@ -182,8 +185,13 @@ class UnixCCompiler(CCompiler):
  
      def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
          compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs)
@@ -159,7 +159,7 @@ index 4be74fdf..66f95aef 100644
          except DistutilsExecError as msg:
              raise CompileError(msg)
  
-@@ -243,7 +251,8 @@ class UnixCCompiler(CCompiler):
+@@ -251,7 +259,8 @@ class UnixCCompiler(CCompiler):
                  # building an executable or linker_so (with shared options)
                  # when building a shared library.
                  building_exe = target_desc == CCompiler.EXECUTABLE

From 2686f7782e78c5d22cfea56fbe9f9be7d392f45a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 03:01:25 +0200
Subject: [PATCH 002/403] python3Packages.pip: 22.1.2 -> 22.2.2

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

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 9956b6038d14..1287ec7017e3 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pip";
-  version = "22.1.2";
+  version = "22.2.2";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Id/oz0e59WWpafR1cIYIogvOgxKGKVqrwNON32BU9zU=";
+    sha256 = "sha256-SLjmxFUFmvgy8E8kxfc6lxxCRo+GN4L77pqkWkRR8aE=";
     name = "${pname}-${version}-source";
   };
 

From a89d7bfe17b5c39f62c6304e6256f9b8a48c9159 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 03:37:03 +0200
Subject: [PATCH 003/403] python3Packages.poetry-core: 1.0.8 -> 1.1.0

---
 .../python-modules/poetry-core/default.nix      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index ee9340ef9d5a..9c61c527c98a 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -1,27 +1,30 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, build
 , git
 , importlib-metadata
 , intreehooks
-, pathlib2
 , pep517
 , pytest-mock
 , pytestCheckHook
 , setuptools
 , tomlkit
-, typing ? null
 , virtualenv
 }:
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "1.0.8";
+  version = "1.1.0";
   format = "pyproject";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
     rev = version;
-    sha256 = "sha256-cs9SMGD9RdW8Wx/IAMq6gkOUBsney5r19hyGva98grk=";
+    sha256 = "sha256-WUgBrO9h1E7N2SVFD47UPv39DMx1yQviV5tcNPmR+/g=";
   };
 
   postPatch = lib.optionalString (pythonOlder "3.8") ''
@@ -37,12 +40,10 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
     importlib-metadata
-  ] ++ lib.optionals isPy27 [
-    pathlib2
-    typing
   ];
 
   checkInputs = [
+    build
     git
     pep517
     pytest-mock

From 0fcb93d85a12fe5ba86a47ee44e0f7dafe7ac0e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 02:58:52 +0200
Subject: [PATCH 004/403] python3Packages.pytest: 7.1.2 -> 7.1.3

https://github.com/pytest-dev/pytest/releases/tag/7.1.3
---
 pkgs/development/python-modules/pytest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 1523326de0bf..7690b84fd3fa 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -20,12 +20,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "7.1.2";
+  version = "7.1.3";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-oGoEJUU4ZKJwvEXnH3gzMKdCje+0Iw+15qcx/eBuzUU=";
+    sha256 = "sha256-TzZf7C3/nBFi+DTZ8YrxuhMGLbDHCL97lG+KXHYYDDk=";
   };
 
   outputs = [
@@ -69,7 +69,7 @@ buildPythonPackage rec {
     # - files are not needed after tests are finished
     pytestRemoveBytecodePhase () {
         # suffix is defined at:
-        #    https://github.com/pytest-dev/pytest/blob/7.1.2/src/_pytest/assertion/rewrite.py#L51-L53
+        #    https://github.com/pytest-dev/pytest/blob/7.1.3/src/_pytest/assertion/rewrite.py#L51-L53
         find $out -name "*-pytest-*.py[co]" -delete
     }
     preDistPhases+=" pytestRemoveBytecodePhase"

From 66c6242371a9fdfe686ebb32b566fd57fa76d5b3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 03:33:43 +0200
Subject: [PATCH 005/403] python3Packages.hypothesis: 6.50.1 -> 6.54.5

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

diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 1e8afe9e543a..59c758b25aa6 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "hypothesis";
-  version = "6.50.1";
+  version = "6.54.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "hypothesis-python-${version}";
-    hash = "sha256-G7OXlYaCPBfdXtmX/f/6i2LRCZZk5yvzhLc6sissuRo=";
+    hash = "sha256-mr8ctmAzRgWNVpW+PZlOhaQ0l28P0U8PxvjoVjfHX78=";
   };
 
   postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";

From c6d042ea3692f184f81b10e6d743adc343e03d52 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 03:36:45 +0200
Subject: [PATCH 006/403] python3Packages.exceptiongroup: 1.0.0rc8 -> 1.0.0rc9

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

diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index 5fe9e716ddb6..1475b44e0016 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "exceptiongroup";
-  version = "1.0.0rc8";
+  version = "1.0.0rc9";
   format = "flit";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aZDCTwa40zyAZc/kPl6KS/o4TgNYvgNq+cxgtjIb0Ro=";
+    hash = "sha256-kIakoh75sxxyGBx3wECgdLoIie5Wp7KJ/wr7DZdlX5Y=";
   };
 
   nativeBuildInputs = [

From d7977ef9e9f3c66e9c025af48db8d680e3bab62a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 13:19:17 +0200
Subject: [PATCH 007/403] python3Packages.numpy: 1.23.1 -> 1.23.3

https://github.com/numpy/numpy/releases/tag/v1.23.2
https://github.com/numpy/numpy/releases/tag/v1.23.3
---
 pkgs/development/python-modules/numpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 86bf008adc97..7b4c5178d66b 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -45,7 +45,7 @@ in buildPythonPackage rec {
   # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so
   # build both to verify they don't break.
   # https://github.com/scipy/scipy/issues/15414
-  version = "1.23.1";
+  version = "1.23.3";
 
   format = "pyproject";
   disabled = pythonOlder "3.7";
@@ -53,7 +53,7 @@ in buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "tar.gz";
-    hash = "sha256-10jvNJv+8uEZS1naN+1aKcGeqNfmNCAZkhuiuk/YtiQ=";
+    hash = "sha256-Ub9JwM0dUr4KJAqmbzRYr8S5XYmT0tBPDZH6YMEK9s0=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [

From 7f310b505ccd7a41f2549bf40a746357a8f5a972 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 13:28:15 +0200
Subject: [PATCH 008/403] python3Packages.orjson: 3.7.12 -> 3.8.0

https://github.com/ijl/orjson/releases/tag/3.8.0
---
 pkgs/development/python-modules/orjson/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 599efa2f50a2..d649d6ccbbac 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -16,20 +16,20 @@
 
 buildPythonPackage rec {
   pname = "orjson";
-  version = "3.7.12";
+  version = "3.8.0";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ijl";
     repo = pname;
     rev = version;
-    hash = "sha256-ImFISSn4FZqUgxQhVbyyTsC1xNpBoJhb/+BvvQkv5gE=";
+    hash = "sha256-P1n0r5181Wt4tml2SKMI7pDNh2YakCp1I+cvQM6RRWg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-uQJtATSCYSdVBeQocmiGapeAIYL+iYBGLgL8YjUn/3U=";
+    hash = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc=";
   };
 
   format = "pyproject";

From eed7179cd728f3380081925b87fa5236c22a09a5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Sep 2022 13:32:36 +0200
Subject: [PATCH 009/403] python3Packages.cryptography: 37.0.4 -> 38.0.1

https://cryptography.io/en/latest/changelog/#v38-0-1
---
 pkgs/development/python-modules/cryptography/default.nix | 6 +++---
 pkgs/development/python-modules/cryptography/vectors.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 873d1b99356a..c80e9a119941 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -27,19 +27,19 @@ let
 in
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "37.0.4"; # Also update the hash in vectors.nix
+  version = "38.0.1"; # Also update the hash in vectors.nix
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Y/nBfA4kdMy+vJMCzi8HtVs7P8shHe0YpC1XZPXBCoI=";
+    hash = "sha256-HbPYB6FJMfoxf5ZDVpXZ7Dhr57hLYYzGHPpdCLCuM9c=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${pname}-${version}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI=";
+    hash = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q=";
   };
 
   cargoRoot = "src/rust";
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 3059d01a4091..7f33c6cb84f3 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cryptography_vectors";
     inherit version;
-    hash = "sha256-WmFABRDiiTelZUtAxupOPlk8Wq8MIIHFuRLw58+IPqg=";
+    hash = "sha256-BDH9EHwfutA3dwSnBRlFs7ORFp/dxPb6C9TtxrbiNd0=";
   };
 
   # No tests included

From 3038f1715dbfa21b5b786ccc0083bec9fd3acec0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 03:44:01 +0200
Subject: [PATCH 010/403] python3Packages.poetry-plugin-export: init at 1.0.6

---
 .../poetry-plugin-export/default.nix          | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/poetry-plugin-export/default.nix

diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/development/python-modules/poetry-plugin-export/default.nix
new file mode 100644
index 000000000000..bd953fb61278
--- /dev/null
+++ b/pkgs/development/python-modules/poetry-plugin-export/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+}:
+
+buildPythonPackage rec {
+  pname = "poetry-plugin-export";
+  version = "1.0.6";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "python-poetry";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-wZbXIAGKTvbcYN1Sx9MCPVIiHxHzdpbLOVShHBEWUVU=";
+  };
+
+  postPatch = ''
+    sed -i '/poetry =/d' pyproject.toml
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  # infinite recursion with poetry
+  doCheck = false;
+  pythonImportsCheck = [];
+
+  meta = with lib; {
+    description = "Poetry plugin to export the dependencies to various formats";
+    license = licenses.mit;
+    homepage = "https://github.com/python-poetry/poetry-plugin-export";
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9071957820bd..dd6534158ec3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7108,6 +7108,8 @@ in {
 
   poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { };
 
+  poetry-plugin-export = callPackage ../development/python-modules/poetry-plugin-export { };
+
   poetry-semver = callPackage ../development/python-modules/poetry-semver { };
 
   poetry2conda = callPackage ../development/python-modules/poetry2conda { };

From abebdcdd59f0d18104ed15f7397625835994e1d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 04:10:54 +0200
Subject: [PATCH 011/403] python3Packages.cleo: 0.8.1 -> 1.0.0a5

---
 .../python-modules/cleo/default.nix           | 53 ++++++++++++++-----
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix
index e79983b1bb29..e81ff175d533 100644
--- a/pkgs/development/python-modules/cleo/default.nix
+++ b/pkgs/development/python-modules/cleo/default.nix
@@ -1,26 +1,53 @@
-{ lib, buildPythonPackage, fetchPypi
-, clikit }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, crashtest
+, poetry-core
+, pylev
+, pytest-mock
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "cleo";
-  version = "0.8.1";
+  version = "1.0.0a5";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f";
+  src = fetchFromGitHub {
+    owner = "python-poetry";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-FtGGIRF/tA2OWEjkCFwa1HHg6VY+5E5mAiJC/zjUC1g=";
   };
 
-  propagatedBuildInputs = [
-    clikit
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'crashtest = "^0.3.1"' 'crashtest = "*"'
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
   ];
 
-  # The Pypi tarball doesn't include tests, and the GitHub source isn't
-  # buildable until we bootstrap poetry, see
-  # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665
-  doCheck = false;
+  propagatedBuildInputs = [
+    crashtest
+    pylev
+  ];
+
+  pythonImportsCheck = [
+    "cleo"
+    "cleo.application"
+    "cleo.commands.command"
+    "cleo.helpers"
+  ];
+
+  checkInputs = [
+    pytest-mock
+    pytestCheckHook
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/sdispater/cleo";
+    homepage = "https://github.com/python-poetry/cleo";
     description = "Allows you to create beautiful and testable command-line interfaces";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];

From eeaaa4536ebb9347d9cca4ab53c542fd89060a9b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 04:12:47 +0200
Subject: [PATCH 012/403] python3Packages.shellingham: 1.4.0 -> 1.5.0

https://github.com/sarugaku/shellingham/releases/tag/1.5.0
---
 pkgs/development/python-modules/shellingham/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
index a072f16b23d3..341d3f3c32e3 100644
--- a/pkgs/development/python-modules/shellingham/default.nix
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -9,15 +9,15 @@
 
 buildPythonPackage rec {
   pname = "shellingham";
-  version = "1.4.0";
+  version = "1.5.0";
   format = "pyproject";
-  disabled = pythonOlder "3.4";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = pname;
-    rev = version;
-    sha256 = "0f686ym3ywjffis5jfqkhsshjgii64060hajysczflhffrjn9jcp";
+    rev = "refs/tags/${version}";
+    hash = "sha256-CIO5mBFph+5cO7U4NRjMRtQCTbopJDEGlAGBkxjieFw=";
   };
 
   nativeBuildInputs = [

From b465fcfef3fdbace3f6e3d5a27a4b5833a71b7fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 04:31:28 +0200
Subject: [PATCH 013/403] python3Packages.cython: 0.29.30 -> 0.29.32

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

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 15ddfbe9f7a5..4a6c14b5709b 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -24,12 +24,12 @@ let
 
 in buildPythonPackage rec {
   pname = "cython";
-  version = "0.29.30";
+  version = "0.29.32";
 
   src = fetchPypi {
     pname = "Cython";
     inherit version;
-    sha256 = "sha256-IjW2Laj+b6i5lCLI5YPy+5XhQ4Z9M3tcdeS5oahl+eM=";
+    hash = "sha256-hzPPR1i3kwTypOOev6xekjQbzke8zrJsElQ5iy+MGvc=";
   };
 
   nativeBuildInputs = [

From f1ebf7751e2ab62dfea5cdb7f51fc9fe06111c06 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 13:51:32 +0200
Subject: [PATCH 014/403] python3Packages.pandas: 1.4.3 -> 1.4.4

https://github.com/pandas-dev/pandas/releases/tag/v1.4.4
---
 pkgs/development/python-modules/pandas/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 2c4f20478339..9125b96a014c 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , fetchPypi
 , python
+, pythonOlder
 , cython
 , numpy
 , python-dateutil
@@ -27,12 +28,13 @@
 
 buildPythonPackage rec {
   pname = "pandas";
-  version = "1.4.3";
+  version = "1.4.4";
   format = "setuptools";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-L/d4hGjnWRdXTwgM1GgbJ+GnvzZGH+lotJqHtaVNAHw=";
+    hash = "sha256-q2wNc4YXtnUYPl8o2zK1FItpStm7oKQMPqJtlrQx22c=";
   };
 
   nativeBuildInputs = [ cython ];

From f63960a83ef4acf8ab01785bd04bd7372cca5998 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 14:32:13 +0200
Subject: [PATCH 015/403] python3Packages.clevercsv: 0.7.1 -> 0.7.4

https://github.com/alan-turing-institute/CleverCSV/blob/v0.7.4/CHANGELOG.md\#version-074
---
 .../python-modules/clevercsv/default.nix        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index 5384fb01c5cb..a144a51e2ca7 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -9,19 +9,19 @@
 , regex
 , tabview
 , python
-, unittestCheckHook
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "clevercsv";
-  version = "0.7.1";
+  version = "0.7.4";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "CleverCSV";
     rev = "v${version}";
-    sha256 = "sha256-ynS3G2ZcEqVlC2d6n5ZQ1Em5lh/dWESj9jEO8C4WzZQ=";
+    sha256 = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U=";
   };
 
   propagatedBuildInputs = [
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     tabview
   ];
 
-  checkInputs = [ unittestCheckHook ];
+  checkInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [
     "clevercsv"
@@ -48,7 +48,14 @@ buildPythonPackage rec {
   '';
 
   # their ci only runs unit tests, there are also integration and fuzzing tests
-  unittestFlagsArray = [ "-v" "-f" "-s" "./tests/test_unit" ];
+  pytestFlagsArray = [
+    "./tests/test_unit"
+  ];
+
+  disabledTestPaths = [
+    # ModuleNotFoundError: No module named 'wilderness'
+    "tests/test_unit/test_console.py"
+  ];
 
   meta = with lib; {
     description = "CleverCSV is a Python package for handling messy CSV files";

From bb1864a88a72058773449d909a5738c4b77901c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 14:32:59 +0200
Subject: [PATCH 016/403] python3Packages.dulwich: 0.20.45 -> 0.20.46

- Move from implicit testing to pytestCheckHook.
- Inherit gnupg instead of passing pkgs around
- Disable three failing tests
- Disable test paths where test inputs are missing from the package
---
 .../python-modules/dulwich/default.nix        | 24 +++++++++++++++----
 pkgs/top-level/python-packages.nix            |  4 +++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index d95fef43fad0..412009cc637a 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -8,16 +8,17 @@
 , geventhttpclient
 , git
 , glibcLocales
+, gnupg
 , gpgme
 , mock
-, pkgs
 , urllib3
 , paramiko
+, pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
-  version = "0.20.45";
+  version = "0.20.46";
   pname = "dulwich";
   format = "setuptools";
 
@@ -25,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cHEN2coqRCGQx+UGiS2wdMMYrHYuIh91KbjONIAgQbc=";
+    hash = "sha256-Tw6I//9dsVI9k9kvFSX+X6FhMY/7qtUCwbmzvnoGcXI=";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -42,13 +43,28 @@ buildPythonPackage rec {
     git
     glibcLocales
     gpgme
-    pkgs.gnupg
+    gnupg
     mock
     paramiko
+    pytestCheckHook
   ];
 
   doCheck = !stdenv.isDarwin;
 
+  disabledTests = [
+    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0'
+    "test_no_decode_encode"
+    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01'
+    "test_cyrillic"
+    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0'
+    "test_commit_no_encode_decode"
+  ];
+
+  disabledTestPaths = [
+    # missing test inputs
+    "dulwich/contrib/test_swift_smoke.py"
+  ];
+
   pythonImportsCheck = [
     "dulwich"
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd6534158ec3..3e732e442297 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2816,7 +2816,9 @@ in {
 
   dugong = callPackage ../development/python-modules/dugong { };
 
-  dulwich = callPackage ../development/python-modules/dulwich { };
+  dulwich = callPackage ../development/python-modules/dulwich {
+    inherit (pkgs) gnupg;
+  };
 
   dunamai = callPackage ../development/python-modules/dunamai { };
 

From f2a71e956b04db5cd94fff527c4bb780ee8dde8a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 15:21:50 +0200
Subject: [PATCH 017/403] python3Packages.poetry: 1.1.14 -> 1.2.0

https://github.com/python-poetry/poetry/releases/tag/1.2.0
---
 .../python-modules/poetry/default.nix         | 73 +++++++++----------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 22de7d71bcc8..07dcb96f4074 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -1,99 +1,104 @@
 { lib
+, backports-cached-property
 , buildPythonPackage
 , cachecontrol
 , cachy
 , cleo
-, clikit
 , crashtest
 , dataclasses
-, entrypoints
+, deepdiff
+, dulwich
 , fetchFromGitHub
-, fetchpatch
+, flatdict
 , html5lib
 , httpretty
 , importlib-metadata
+, installShellFiles
 , intreehooks
+, jsonschema
 , keyring
 , lockfile
 , packaging
 , pexpect
 , pkginfo
+, platformdirs
 , poetry-core
+, poetry-plugin-export
 , pytest-mock
+, pytest-xdist
 , pytestCheckHook
 , pythonAtLeast
 , pythonOlder
 , requests
 , requests-toolbelt
 , shellingham
+, stdenv
 , tomlkit
+, urllib3
 , virtualenv
+, xattr
 }:
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.1.14";
+  version = "1.2.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-n/GZOUoIMxWlULDqOe59Gt7Hz/+Mc4QcZT+1+HtQovs=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-+Nsg7oPh9tAHEKt1R9C+nY9UPy+9vbf/+A6vQWgTi+4=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \
-       'importlib-metadata = {version = ">=1.6", python = "<3.8"}' \
-      --replace 'version = "^21.2.0"' 'version = ">=21.2"' \
-      --replace 'packaging = "^20.4"' 'packaging = "*"'
-  '';
-
   nativeBuildInputs = [
-    intreehooks
+    installShellFiles
   ];
 
   propagatedBuildInputs = [
     cachecontrol
     cachy
     cleo
-    clikit
     crashtest
-    entrypoints
+    dulwich
     html5lib
+    jsonschema
     keyring
-    lockfile
     packaging
     pexpect
     pkginfo
+    platformdirs
     poetry-core
+    poetry-plugin-export
     requests
     requests-toolbelt
     shellingham
     tomlkit
     virtualenv
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    dataclasses
-  ] ++ lib.optionals (pythonOlder "3.8") [
+  ] ++ lib.optionals (stdenv.isDarwin) [
+    xattr
+  ] ++ lib.optionals (pythonOlder "3.10") [
     importlib-metadata
-  ];
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    backports-cached-property
+  ] ++ cachecontrol.optional-dependencies.filecache;
 
   postInstall = ''
-    mkdir -p "$out/share/bash-completion/completions"
-    "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry"
-    mkdir -p "$out/share/zsh/vendor-completions"
-    "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry"
-    mkdir -p "$out/share/fish/vendor_completions.d"
-    "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
+    installShellCompletion --cmd poetry \
+      --bash <($out/bin/poetry completions bash) \
+      --fish <($out/bin/poetry completions fish) \
+      --zsh <($out/bin/poetry completions zsh) \
   '';
 
   checkInputs = [
+    deepdiff
+    flatdict
     pytestCheckHook
     httpretty
     pytest-mock
+    pytest-xdist
   ];
 
   preCheck = ''
@@ -119,16 +124,6 @@ buildPythonPackage rec {
     "test_info_setup_complex_pep517_error"
   ];
 
-  patches = [
-    # The following patch addresses a minor incompatibility with
-    # pytest-mock. This is addressed upstream in
-    # https://github.com/python-poetry/poetry/pull/3457
-    (fetchpatch {
-      url = "https://github.com/python-poetry/poetry/commit/8ddceb7c52b3b1f35412479707fa790e5d60e691.diff";
-      sha256 = "yHjFb9xJBLFOqkOZaJolKviTdtST9PMFwH9n8ud2Y+U=";
-    })
-  ];
-
   # Allow for package to use pep420's native namespaces
   pythonNamespaces = [
     "poetry"

From 3b269688f14f4b6f154fc53cbb2a5daff9a40f6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 15:25:05 +0200
Subject: [PATCH 018/403] python3Packages.cython_3: 3.0.0a10 -> 3.0.0a11

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e732e442297..38401379a6cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2197,10 +2197,10 @@ in {
   cython = callPackage ../development/python-modules/Cython { };
 
   cython_3 = self.cython.overridePythonAttrs (old: rec {
-    version = "3.0.0a10";
+    version = "3.0.0a11";
     src = old.src.override {
       inherit version;
-      sha256 = "342e95121a3d1a67cbcf7b340391eb40cc5ce3d2a79d7873e005e8783353d89d";
+      hash = "sha256-5GckkfsxVGuau2Nnf2OOc4CF3JMhOYFwlW72+/wOFyY=";
     };
     patches = [ ];
   });

From d4c5945064970dd51601bd73c74b7b3be811d4f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 18:29:39 +0200
Subject: [PATCH 019/403] python3Packages.sphinxcontrib-asyncio: init at 0.3.0

---
 .../sphinxcontrib-asyncio/default.nix         | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix

diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix
new file mode 100644
index 000000000000..2da9c2d92f6a
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, sphinx
+}:
+
+buildPythonPackage rec {
+  pname = "sphinxcontrib-asyncio";
+  version = "0.3.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-mf0m4P5+34ckSnGpnDFv0Mm1CFbCUZrMqSfr50EAci4=";
+  };
+
+  propagatedBuildInputs = [
+    sphinx
+  ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [
+    "sphinxcontrib.asyncio"
+  ];
+
+  meta = with lib; {
+    description = "Sphinx extension to add asyncio-specific markups";
+    homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38401379a6cc..341ddd2d5dfc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10371,6 +10371,8 @@ in {
 
   sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
 
+  sphinxcontrib-asyncio = callPackage ../development/python-modules/sphinxcontrib-asyncio { };
+
   sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { };
 
   sphinxcontrib-bayesnet = callPackage ../development/python-modules/sphinxcontrib-bayesnet { };

From 22217650964394fa87c36d2845386a34c989de39 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 21:20:59 +0200
Subject: [PATCH 020/403] python3Packages.dbus-fast: init at 1.4.0

---
 .../python-modules/dbus-fast/default.nix      | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/dbus-fast/default.nix

diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix
new file mode 100644
index 000000000000..58cde9e14e05
--- /dev/null
+++ b/pkgs/development/python-modules/dbus-fast/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "dbus-fast";
+  version = "1.4.0";
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "Bluetooth-Devices";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-vbsigiUSGeetY+1MEeQ/cO3Oj8Ah0Yg9BUPo2Gc06KU=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "--cov=dbus_fast --cov-report=term-missing:skip-covered" ""
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  pythonImportsCheck = [
+    "dbus_fast"
+    "dbus_fast.aio"
+    "dbus_fast.service"
+    "dbus_fast.message"
+  ];
+
+  # requires a running dbus daemon
+  doCheck = false;
+
+  meta = with lib; {
+    changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}";
+    description = "A faster version of dbus-next";
+    homepage = "https://github.com/Bluetooth-Devices/dbus-fast";
+    license = licenses.mit;
+    maintainers = lib.teams.home-assistant.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 341ddd2d5dfc..47d42b98953a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2301,6 +2301,8 @@ in {
 
   dbus-client-gen = callPackage ../development/python-modules/dbus-client-gen { };
 
+  dbus-fast = callPackage ../development/python-modules/dbus-fast { };
+
   dbus-next = callPackage ../development/python-modules/dbus-next { };
 
   dbus-python = callPackage ../development/python-modules/dbus {

From ee0ba2e1d8f20658af21ba79358da0955efbd580 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 21:43:27 +0200
Subject: [PATCH 021/403] python3Packages.bleak: 0.16.0 -> 0.17.0

https://github.com/hbldh/bleak/releases/tag/v0.17.0
---
 .../python-modules/bleak/default.nix          | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 74b199d21e44..283cc88ab965 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -2,33 +2,35 @@
 , async-timeout
 , bluez
 , buildPythonPackage
-, dbus-next
-, fetchPypi
+, dbus-fast
+, fetchFromGitHub
+, poetry-core
 , pytestCheckHook
 , pythonOlder
 , typing-extensions
-, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "bleak";
-  version = "0.16.0";
+  version = "0.17.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-pUn0PjxdjeRkxytLkFU0w/R4F0bpgV7NUxtyVd4uGcc=";
+  src = fetchFromGitHub {
+    owner = "hbldh";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-AnH23AWrLw2jq6gSbx9VoGD8QXeCH5dN7FSVVdj4b3w=";
   };
 
   nativeBuildInputs = [
-    setuptools
+    poetry-core
   ];
 
   propagatedBuildInputs = [
     async-timeout
-    dbus-next
+    dbus-fast
     typing-extensions
   ];
 

From 7e7a2ddd218b0c30e1a767a70520489b996122b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 21:52:12 +0200
Subject: [PATCH 022/403] python3Packages.bleak-retry-connector: 1.11.0 ->
 1.16.0

Apparently we skipped a few releases here and there.

https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.11.1
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.0
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.1
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.2
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.3
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.13.0
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.13.1
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.13.2
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.14.0
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.15.0
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.15.1
https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.16.0
---
 .../bleak-retry-connector/default.nix         | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index d62167fa1051..6a0ee020e6d4 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -1,6 +1,7 @@
 { lib
 , async-timeout
 , bleak
+, dbus-fast
 , buildPythonPackage
 , fetchFromGitHub
 , poetry-core
@@ -11,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "bleak-retry-connector";
-  version = "1.11.0";
+  version = "1.16.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,10 +20,15 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-I9nXLzy+OmfaQJBTeBSL/yhhrdNnldd42d5QwRDK9Q4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-IDfamUZB9WJH+ybZ0ULBSEd1koMHTZ1/DaFTf6oviM8=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" ""
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];
@@ -30,6 +36,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     async-timeout
     bleak
+    dbus-fast
   ];
 
   checkInputs = [
@@ -37,10 +44,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" ""
-  '';
+  disabledTests = [
+    # broken mocking
+    "test_establish_connection_can_cache_services_services_missing"
+    "test_establish_connection_with_dangerous_use_cached_services"
+    "test_establish_connection_without_dangerous_use_cached_services"
+  ];
 
   pythonImportsCheck = [
     "bleak_retry_connector"

From 91f513601decbbc26d307dc3aacfaf50f4cd3165 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 21:57:53 +0200
Subject: [PATCH 023/403] python3Packages.pyswitchbot: 0.18.27 -> 0.19.8

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

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 24f7c6bde6d9..497b516a6636 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.18.27";
+  version = "0.19.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     rev = "refs/tags/${version}";
-    hash = "sha256-80GzOKZRsjWHLEGhNrYIWdUMiel5ztcobwRhrlyjzpY=";
+    hash = "sha256-1vzHd6ouWZrc951a5s0OsjeMbEluP/kS7LDiZ3YOUqk=";
   };
 
   propagatedBuildInputs = [
@@ -30,6 +30,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # mismatch in expected data structure
+    "test_parse_advertisement_data_curtain"
+  ];
+
   pythonImportsCheck = [
     "switchbot"
   ];

From ea569071ad80a9ab679d995621e9e1a6273ce7fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 22:55:54 +0200
Subject: [PATCH 024/403] python3Packages.scipy: 1.8.1 -> 1.9.1

https://github.com/scipy/scipy/releases/tag/v1.9.1
https://github.com/scipy/scipy/releases/tag/v1.9.0
---
 pkgs/development/python-modules/scipy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index e69506f6746e..c1d13ca73501 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "scipy";
-  version = "1.8.1";
+  version = "1.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-nj+xsOiW8UqFqpoo1fdV2q7rVMiXt0bfelXMsCs0DzM=";
+    sha256 = "sha256-JtKMRokA5tX9s30oEqtG2wzNIsY7qglQV4cfqjpJi8k=";
   };
 
   nativeBuildInputs = [ cython gfortran pythran ];

From a26911d0cba282214e57177afad9c6efe6c6a047 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:29:34 +0200
Subject: [PATCH 025/403] python3Packages.uvloop: 0.16.0 -> 0.17.0

https://github.com/MagicStack/uvloop/releases/tag/v0.17.0
---
 .../python-modules/uvloop/default.nix         | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index da17c78a5eb9..c7b1d8103dd2 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -3,10 +3,12 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
+, cython
 , libuv
 , CoreServices
 , ApplicationServices
-  # Check Inputs
+
+# Check Inputs
 , aiohttp
 , psutil
 , pyopenssl
@@ -15,14 +17,19 @@
 
 buildPythonPackage rec {
   pname = "uvloop";
-  version = "0.16.0";
+  version = "0.17.0";
+  format = "setuptools";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228";
+    hash = "sha256-Dd9rr5zxGhoixxSH858Vss9461vefltF+7meip2RueE=";
   };
 
+  nativeBuildInputs = [
+    cython
+  ];
+
   buildInputs = [
     libuv
   ] ++ lib.optionals stdenv.isDarwin [
@@ -32,9 +39,10 @@ buildPythonPackage rec {
 
   dontUseSetuptoolsCheck = true;
   checkInputs = [
-    aiohttp
     pytestCheckHook
     psutil
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    aiohttp
   ];
 
   LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config;
@@ -46,16 +54,21 @@ buildPythonPackage rec {
     "--strict"
     "--tb=native"
     # Depend on pyopenssl
-    "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown"
-    "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation"
+    "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown"
+    "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation"
     # test gets stuck in epoll_pwait on hydras aarch64 builders
     # https://github.com/MagicStack/uvloop/issues/412
-    "--deselect tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data"
+    "--deselect=tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data"
+    # Tries to import cythonized file for which the .pyx file is not shipped via PyPi
+    "--deselect=tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr"
+    # Tries to run "env", but fails to find it
+    "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2"
+    "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2"
   ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
     # Flaky test: https://github.com/MagicStack/uvloop/issues/412
-    "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set"
+    "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set"
     # Broken: https://github.com/NixOS/nixpkgs/issues/160904
-    "--deselect tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost"
+    "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost"
   ];
 
   disabledTestPaths = [

From 9623e1d07a64c5ee2bbca7c1ef8ef6283ed05262 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:00 +0200
Subject: [PATCH 026/403] python3Packages.absl-py: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 402fab32f55a..e2facc919347 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-OqOfiYMpwhVv9SXfppznCeQtd6qxi/SRdxnW8mCqagg=";
+    sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc=";
   };
 
   propagatedBuildInputs = [

From 665b17847a0dba1c9d2fd4ea9aeec46fc7ccbd1f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:00 +0200
Subject: [PATCH 027/403] python3Packages.aeppl: 0.0.33 -> 0.0.35

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

diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix
index 73c2da783d58..2edf88c4cf4a 100644
--- a/pkgs/development/python-modules/aeppl/default.nix
+++ b/pkgs/development/python-modules/aeppl/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aeppl";
-  version = "0.0.33";
+  version = "0.0.35";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "aesara-devs";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-P4QgEt/QfIeCx/wpaCncXtjrDM2uiOIuObxPlTtn1CY=";
+    hash = "sha256-HUcLa/9fTUBJYszo1SiG08t7DQiNSd8EsINkJpAeLsY=";
   };
 
   propagatedBuildInputs = [

From feeeab92637e96e15ab0091709fa5462ff89051b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:00 +0200
Subject: [PATCH 028/403] python3Packages.aesara: 2.7.9 -> 2.8.4

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

diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix
index 5d91bc4de885..d4f3c1160517 100644
--- a/pkgs/development/python-modules/aesara/default.nix
+++ b/pkgs/development/python-modules/aesara/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aesara";
-  version = "2.7.9";
+  version = "2.8.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "aesara-devs";
     repo = "aesara";
     rev = "refs/tags/rel-${version}";
-    hash = "sha256-s7qqFSY4teL2uiGg6CkpPtr7lNNAj61nCn83Zr7/JaQ=";
+    hash = "sha256-Mt1IweQkPqxv+ynezdFHTJXU/oTOwhPkY49GzFJpPaM=";
   };
 
   nativeBuildInputs = [

From 246216e599eefe157169d2deaec801206fd735d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:00 +0200
Subject: [PATCH 029/403] python3Packages.afdko: 3.9.0 -> 3.9.1

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

diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index 29593503252a..9eb1f35c4315 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "afdko";
-  version = "3.9.0";
+  version = "3.9.1";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fjsaz6bp028fbmry6fzfcih78mdzycqmky1wsz5y0bg4kfk4shh";
+    sha256 = "sha256-AtRNaZzn9BoNIjvKhS7rsYVfHw26JKKUFqO/6TcBIkw=";
   };
 
   format = "pyproject";

From d4579920f807231bdc73201c8838ffc1d28eb325 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:00 +0200
Subject: [PATCH 030/403] python3Packages.aiobotocore: 2.3.4 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 81977915fd52..6bc62a3854d3 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "aiobotocore";
-  version = "2.3.4";
+  version = "2.4.0";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ZVTr6ldk9m9L5USk/KoJU+6A5gDde9gYukiT1yvxK/s=";
+    sha256 = "sha256-+f4GmMxJeGG9tUzRYWHIBAMfdYralIDDVUDyDAwHg4U=";
   };
 
   # relax version constraints: aiobotocore works with newer botocore versions

From 53c0dcf2d38b51ff2ddb29b25cae533f7b9f828d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 031/403] python3Packages.aioserial: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/aioserial/default.nix b/pkgs/development/python-modules/aioserial/default.nix
index c8c521edbe65..2d15e2794da8 100644
--- a/pkgs/development/python-modules/aioserial/default.nix
+++ b/pkgs/development/python-modules/aioserial/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "aioserial";
-  version = "1.3.0";
+  version = "1.3.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "080j3ws3j2arj2f16mzqn1qliy0bzmb0gzk5jvm5ldkhsf1s061h";
+    sha256 = "sha256-cCvwOw64S47y2NrFy5JeHmhdzpj3exJVabxv0rO1gig=";
   };
 
   propagatedBuildInputs = [

From 73ddd6270127e65a509c05649d80be29e2cc5f3f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 032/403] python3Packages.aliyun-python-sdk-cdn: 3.7.2 -> 3.7.4

---
 .../python-modules/aliyun-python-sdk-cdn/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
index 9303f985022a..f8b1751f290e 100644
--- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-cdn";
-  version = "3.7.2";
+  version = "3.7.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wbVkoNu9ffMpuivUGg+PAya099xMbU0Ehvl0++ud+WE=";
+    hash = "sha256-7ZDhsu5XDE7hDVaG4RdEWcKfVrC2tPwLPdGB+uDXRpA=";
   };
 
   propagatedBuildInputs = [

From d8472b9205d2353236024f395a0564ddd081c0bc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 033/403] python3Packages.aliyun-python-sdk-iot: 8.42.0 ->
 8.43.0

---
 .../python-modules/aliyun-python-sdk-iot/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
index 6dde44e4ba5a..d4cce9bb5f70 100644
--- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-iot";
-  version = "8.42.0";
+  version = "8.43.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pp1objaT0Galxz91V1OoMfogYQyZ1lZC6XGFd4wSTq8=";
+    hash = "sha256-KYmxcm5523MeHhMD5tdlowezhgXSolywHUBOlVkjsp0=";
   };
 
   propagatedBuildInputs = [

From ca8e47fba0ddc327b15f54afb26421f03156ee2d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 034/403] python3Packages.ansible: 6.2.0 -> 6.3.0

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

diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index d2f7dba38669..f90085431718 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -20,7 +20,7 @@
 
 let
   pname = "ansible";
-  version = "6.2.0";
+  version = "6.3.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -30,7 +30,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-va8rL9km/xifveL+/nI0cz8yw2/EEwM/pdk5RfvcBqY=";
+    sha256 = "sha256-1fqfwVqNRcjVJHqWRbC0j5ldc1sSxNplVmbUhQYnNSY=";
   };
 
   postPatch = ''

From bc6e37cbf4adb493c46b87b761d2d40fca1bf51b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 035/403] python3Packages.ansible-lint: 6.4.0 -> 6.5.2

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

diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index 90da98520120..d8a3e2e674dc 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -4,7 +4,9 @@
 , setuptools-scm
 , ansible-compat
 , ansible-core
+, black
 , enrich
+, filelock
 , flaky
 , jsonschema
 , pythonOlder
@@ -20,13 +22,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-lint";
-  version = "6.4.0";
+  version = "6.5.2";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-xadjBsrpBqJgz3KGyofE0DukSSsu17/qIa0R/fPH6NE=";
+    sha256 = "sha256-9EMsdMDyiyhwoYi0mZWS9jOAQvMNDG9O4RsyRAyp/+Q=";
   };
 
   postPatch = ''
@@ -42,7 +44,9 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     ansible-compat
     ansible-core
+    black
     enrich
+    filelock
     jsonschema
     pytest # yes, this is an actual runtime dependency
     pyyaml

From b13af2a001ffd6f90d16ad88610e93032607fa94 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 036/403] python3Packages.arrow: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index c09610c3be1f..ff626a5b4813 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "arrow";
-  version = "1.2.2";
+  version = "1.2.3";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Bcrx/T2aEaETWytvCYh0IRU7lFWOXvTQkLVntHFzrCs=";
+    sha256 = "sha256-OTSzDKG58pI3bZ2xWxlEYIjRLsWGKbw/DaKP1V+2M6E=";
   };
 
   postPatch = ''

From f2816124016cc043ffc0e7684ca31816c71d2426 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 037/403] python3Packages.asttokens: 2.0.5 -> 2.0.8

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

diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix
index 3d78ae7690b3..4a07d2ac96ec 100644
--- a/pkgs/development/python-modules/asttokens/default.nix
+++ b/pkgs/development/python-modules/asttokens/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "asttokens";
-  version = "2.0.5";
+  version = "2.0.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU=";
+    sha256 = "sha256-xh4WJG7Pss3ilYQGtMjrwEPJ5tc6qoPJQWc7NeXTp2s=";
   };
 
   nativeBuildInputs = [

From a3b847e55241d32224dbd5439b1b518d92fe9ef2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 038/403] python3Packages.atpublic: 3.0.1 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix
index 16f0f0ddffd9..286b79bcb675 100644
--- a/pkgs/development/python-modules/atpublic/default.nix
+++ b/pkgs/development/python-modules/atpublic/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "atpublic";
-  version = "3.0.1";
+  version = "3.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf";
+    sha256 = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg=";
   };
 
   nativeBuildInputs = [

From fbf427f1de47d90a91316b4b97561dc2e6b7fcc2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:01 +0200
Subject: [PATCH 039/403] python3Packages.autobahn: 22.6.1 -> 22.7.1

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

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 57e09385f8a6..a6e6de722744 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -48,14 +48,14 @@
 
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "22.6.1";
+  version = "22.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+2PpRtXC3Q32gIUehOZWJKSUzofJmfKklE5PLYG/RJg=";
+    sha256 = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k=";
   };
 
   postPatch = ''

From 9595c927ab1dca1e0fb6d596e0cea1654655fd3c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 040/403] python3Packages.autopep8: 1.6.0 -> 1.7.0

---
 .../python-modules/autopep8/default.nix       | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 80c57ef732c2..59dfac756b5d 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -1,31 +1,39 @@
-{ lib, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pycodestyle
+, glibcLocales
 , toml
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "autopep8";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979";
+    sha256 = "sha256-ypsag+U6f61l1zHceiotUKpI9DhQQHxZ9qGjBsQgEUI=";
   };
 
   propagatedBuildInputs = [ pycodestyle toml ];
 
-  # One test fails:
-  # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
-#   doCheck = false;
+  checkInputs = [
+    glibcLocales
+    pytestCheckHook
+  ];
 
-  checkInputs = [ glibcLocales ];
+  disabledTests = [
+    # missing tox.ini file from pypi package
+    "test_e101_skip_innocuous"
+  ];
 
   LC_ALL = "en_US.UTF-8";
 
   meta = with lib; {
     description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
-    homepage = "https://pypi.python.org/pypi/autopep8/";
+    homepage = "https://pypi.org/project/autopep8/";
     license = licenses.mit;
-    platforms = platforms.all;
     maintainers = with maintainers; [ bjornfor ];
   };
 }

From 82e553aeba701a06160cca89ae2fb505ba7f76c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 041/403] python3Packages.azure-core: 1.24.2 -> 1.25.1

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

diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index 352fd019cf94..2db4ac2208fb 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -18,14 +18,14 @@
 , typing-extensions }:
 
 buildPythonPackage rec {
-  version = "1.24.2";
+  version = "1.25.1";
   pname = "azure-core";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-Dzog0kVlm/gfs2cAcKVBDI1KQymNWpgeYtzjkwAKkIQ=";
+    sha256 = "sha256-PBzzaGUOduwAnAfNEXSpXNy0cbJHu3LRgkX31WwYCbI=";
   };
 
   propagatedBuildInputs = [

From 7bcb7289c137a0302bff319846384b297a92a50b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 042/403] python3Packages.azure-eventhub: 5.10.0 -> 5.10.1

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

diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix
index a177f824fa2e..e6d36a87c982 100644
--- a/pkgs/development/python-modules/azure-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-eventhub/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "azure-eventhub";
-  version = "5.10.0";
+  version = "5.10.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8c83fbe96a420813599a9a3c66adc315b7208f56d5a50a20aa04a8aa7062b074";
+    sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ=";
   };
 
   propagatedBuildInputs = [

From 5d12551cd29ead0b68d95c2f19406ac0e74acd64 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 043/403] python3Packages.azure-mgmt-appconfiguration: 2.1.0 ->
 2.2.0

---
 .../python-modules/azure-mgmt-appconfiguration/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
index 650b54c9dd15..51f5985e84d0 100644
--- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.1.0";
+  version = "2.2.0";
   pname = "azure-mgmt-appconfiguration";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6s3KfWOlzkoq7uxuDbFMYmW22rOYHtgQgYQ6RMFQiQ8=";
+    sha256 = "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ=";
     extension = "zip";
   };
 

From 479a8b2f834b9e983b4ef647ee090640c53bdd55 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 044/403] python3Packages.azure-mgmt-containerinstance: 9.2.0
 -> 10.0.0

---
 .../python-modules/azure-mgmt-containerinstance/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index 83e1163df467..b2e9c6e3adf5 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerinstance";
-  version = "9.2.0";
+  version = "10.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-3rElVUvbGqF99ppZanUUrwFGtCAXak2zhMVOd6n9bkY=";
+    sha256 = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA=";
   };
 
   propagatedBuildInputs = [

From 03c546433ac8ffe5f3fdc643112e8c1cf916b31f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 045/403] python3Packages.azure-mgmt-containerservice: 20.2.0
 -> 20.3.0

---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index de3bca44c5cf..77c1ece09b29 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "20.2.0";
+  version = "20.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-+XNJbI4LTxx8kcNr6dDlcaGujrqriKaEPb0deo6YbkM=";
+    sha256 = "sha256-p2q1fzpPrwYKUAilPTGzRDlkT9OKqnjZVN2jslY/WSw=";
   };
 
   propagatedBuildInputs = [

From 25b4b57233369fe44100384794e96fe17f33a6de Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 046/403] python3Packages.azure-mgmt-core: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix
index 2a4b00432f19..c250246af26a 100644
--- a/pkgs/development/python-modules/azure-mgmt-core/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.3.1";
+  version = "1.3.2";
   pname = "azure-mgmt-core";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-yJ6/GMInvJih7sypVGC4p+IwWQ1FbI+pwtWs3GcPeAg=";
+    sha256 = "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE=";
   };
 
   propagatedBuildInputs = [

From 9d7379f3e04b03449df1be8547347ad9fd3c3b36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 047/403] python3Packages.azure-mgmt-cosmosdb: 7.0.0 -> 8.0.0

---
 .../python-modules/azure-mgmt-cosmosdb/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index d1a717802432..db6df3583b68 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cosmosdb";
-  version = "7.0.0";
+  version = "8.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-NMwcqgvxwma+aXUhL8OQm+tpH+MCCjHMALf0Ii8bQlo=";
+    hash = "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo=";
   };
 
   propagatedBuildInputs = [

From 220579518ab8f4e576627a6b63166e75f0578d2a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 048/403] python3Packages.azure-mgmt-datafactory: 2.7.0 ->
 2.8.0

---
 .../python-modules/azure-mgmt-datafactory/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index c6907efc9977..915b2bf96330 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datafactory";
-  version = "2.7.0";
+  version = "2.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-g7av5MFy4QNg+81PqDGznHXUZsHhnaauaJV/B6GMy4A=";
+    hash = "sha256-LH2YdWuRC5mzImF6ImkOixHBcgc7Yoi0Rai5m64/aiU=";
   };
 
   propagatedBuildInputs = [

From 26c3674b89d5e5677b2a02594c50c6657b57f202 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:02 +0200
Subject: [PATCH 049/403] python3Packages.azure-mgmt-iothub: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index ea5fbd1c1020..feefdabc1e79 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-iothub";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM=";
+    sha256 = "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A=";
   };
 
   propagatedBuildInputs = [

From bfb4df79393dd578f18669c0c1ff7ba488c0e870 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 050/403] python3Packages.azure-mgmt-media: 10.0.0 -> 10.1.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix
index 57ccffcf997f..9d0f2a216873 100644
--- a/pkgs/development/python-modules/azure-mgmt-media/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-media";
-  version = "10.0.0";
+  version = "10.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-KKUeibEAUqKsjjjqpzYBFaQUGniY3rbe+lfCnL0+lpY=";
+    hash = "sha256-lm3rL9x+R4FCqrIyZG7jc3Yro6xUcDs1wRNNo1XQJIk=";
   };
 
   propagatedBuildInputs = [

From 3eb5885907416b39ec149530072ac39356b172ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 051/403] python3Packages.azure-mgmt-redis: 13.1.0 -> 14.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
index c7890b55b04c..9d476dfc8074 100644
--- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-redis";
-  version = "13.1.0";
+  version = "14.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "ece913e5fc7f157e945809e557443f79ff7691cabca4bbc5ecb266352f843179";
+    sha256 = "sha256-WErNQiinmxBNyaOAqbHWGk2OLxtM9o63wDEQGf+iL6Q=";
   };
 
   propagatedBuildInputs = [

From de95e5952b212d10d11e199143e3a0a9baa3fa21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 052/403] python3Packages.azure-mgmt-subscription: 3.0.0 ->
 3.1.1

---
 .../python-modules/azure-mgmt-subscription/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index 71257c46c4f2..5094dc3ec6a8 100644
--- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-subscription";
-  version = "3.0.0";
+  version = "3.1.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "157bd9123a5814473a9cd131832ea614c478548722ec01f47b35d778dc307d55";
+    sha256 = "sha256-TiVbTOm5JDV7uMUAmzyIogFNMgOySV4iVvoCe/hOgA4=";
   };
 
   propagatedBuildInputs = [

From fb34aec664a3e4055e36f15c457ed2abf0755f37 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 053/403] python3Packages.azure-storage-blob: 12.13.0 ->
 12.13.1

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

diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix
index 6a3caa03e649..3b3499a780f0 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-blob";
-  version = "12.13.0";
+  version = "12.13.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-U/DUzTKXCsn/m5dT+D3S+z+aww4dAecWOMQ2xQm/2IQ=";
+    sha256 = "sha256-iZxLjiZxgS0s948QdVaifbsSjKqiuwYJTnKj1YNnQK8=";
   };
 
   propagatedBuildInputs = [

From ee39677406f7bbdc19ae333d3ec8c7d736cea680 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 054/403] python3Packages.bcrypt: 3.2.2 -> 4.0.0

---
 .../python-modules/bcrypt/default.nix         | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index 592b5b22d47d..46771906d7cc 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -1,32 +1,45 @@
 { lib
 , buildPythonPackage
+, rustPlatform
 , setuptools
+, setuptools-rust
 , isPyPy
 , fetchPypi
 , pythonOlder
 , cffi
 , pytestCheckHook
-, six
 }:
 
 buildPythonPackage rec {
   pname = "bcrypt";
-  version = "3.2.2";
+  version = "4.0.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-QzxBDCF3BXcF2iqfLNAd0VdJOyp6wUyFk6FrPatra/s=";
+    hash = "sha256-xZwXD8kiX6rQTd4bph2FtBOUbozi5fX1/zDf1nKD8xk=";
+  };
+
+  cargoRoot = "src/_bcrypt";
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    sourceRoot = "${pname}-${version}/${cargoRoot}";
+    name = "${pname}-${version}";
+    hash = "sha256-HvfRLyUhlXVuvxWrtSDKx3rMKJbjvuiMcDY6g+pYFS0=";
   };
 
   nativeBuildInputs = [
     setuptools
-  ];
+    setuptools-rust
+    rustPlatform.cargoSetupHook
+  ] ++ (with rustPlatform; [
+    rust.cargo
+    rust.rustc
+  ]);
 
   propagatedBuildInputs = [
-    six
     cffi
   ];
 

From 102116aa42a3f301c0a107365d9d3abf83113bfe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 055/403] python3Packages.biliass: 1.3.4 -> 1.3.5

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

diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix
index fe2cd731a1ce..617b87bc12f1 100644
--- a/pkgs/development/python-modules/biliass/default.nix
+++ b/pkgs/development/python-modules/biliass/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "biliass";
-  version = "1.3.4";
+  version = "1.3.5";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4=";
+    sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU=";
   };
 
   propagatedBuildInputs = [ protobuf ];

From e21f3eacf34a220d192ace9a5002da2af624e839 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 056/403] python3Packages.billiard: 4.0.0 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 303d334936c6..919c5daba2f4 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "billiard";
-  version = "4.0.0";
+  version = "4.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k=";
+    sha256 = "sha256-jUFd+FrDG5dXlxJaxIZJL+TF5OJx07DfdWHrI0YsmwM=";
   };
 
   checkInputs = [

From dfb3c87ef930dca0a6cdfefbebfec3bd6e97b884 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 057/403] python3Packages.bincopy: 17.10.3 -> 17.11.0

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

diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix
index df6f31450d6f..7af89c7aed87 100644
--- a/pkgs/development/python-modules/bincopy/default.nix
+++ b/pkgs/development/python-modules/bincopy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bincopy";
-  version = "17.10.3";
+  version = "17.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HDSqwrCXf2U0uzfa4Vb9Euu9ZSm6eFD9bcMf6eieicY=";
+    sha256 = "sha256-rk7jYr9jUz7TUckoYkv74rr5D9fJLD3h7UFBH0XeleE=";
   };
 
   propagatedBuildInputs = [

From e07985cd7cdb019fb38dfca390f9837bb58def0b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:03 +0200
Subject: [PATCH 058/403] python3Packages.bitarray: 2.5.1 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index 7ee76f2f2fe8..f49c4c9de47d 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "2.5.1";
+  version = "2.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jTj2B1EAgJmmWdWs+zXvQVAYPv/Vsr+mwQGZJw3fTJw=";
+    hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0=";
   };
 
   checkPhase = ''

From 16370b1e7a903e2e044fb59ece5295c4464c2ce9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 059/403] python3Packages.bitbox02: 6.0.0 -> 6.1.1

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

diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix
index 358a4d163f3e..d11db2c8457d 100644
--- a/pkgs/development/python-modules/bitbox02/default.nix
+++ b/pkgs/development/python-modules/bitbox02/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitbox02";
-  version = "6.0.0";
+  version = "6.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0=";
+    sha256 = "sha256-mVA0CdbGGJn44R6xHnophmsnVMsCwDrPNM3vmXVa7dg=";
   };
 
   propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ];

From 31bed7b63576358bab27da28802bb5c793f9af96 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 060/403] python3Packages.bitcoin-utils-fork-minimal: 0.4.11.4
 -> 0.4.11.6

---
 .../python-modules/bitcoin-utils-fork-minimal/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix
index 868641641fc9..c548ce0bbf32 100644
--- a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix
+++ b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "bitcoin-utils-fork-minimal";
-  version = "0.4.11.4";
+  version = "0.4.11.6";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-n3tEQkl6KBAno4LY67lZme3TIvsm35VA2yyfWYuIE1c=";
+    hash = "sha256-DzibvC8qr/5ync59cfFB7tBmZWkPs/hKh+e5OC4lcEw=";
   };
 
   propagatedBuildInputs = [

From 4421425e6f0ea4a1fb42540001fa57a628a6294f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 061/403] python3Packages.blis: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index 290e1928414f..c935c3728b01 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "blis";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-aZ4coUlnFjcLS5tSfFjYQr+JKGPY2UTNoy+HIO08tCk=";
+    sha256 = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8=";
   };
 
   nativeBuildInputs = [

From 534d5f169d8bc40ebb2291949f657051b41bd812 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 062/403] python3Packages.block-io: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix
index 64ffc5ff4b3e..5ac33d77cf14 100644
--- a/pkgs/development/python-modules/block-io/default.nix
+++ b/pkgs/development/python-modules/block-io/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "block-io";
-  version = "2.0.5";
+  version = "2.0.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af70c3be444f2f2d07c0603cef547b51bbd9f4fbd4aadebd8f1e8ee73ccbc5e5";
+    sha256 = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I=";
   };
 
   propagatedBuildInputs = [

From 5ed928e0d7181efe8d0044ecefc2819a982b7887 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 063/403] python3Packages.boto3: 1.24.42 -> 1.24.75

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

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 834df14102f0..698f252909ef 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "boto3";
-  version = "1.24.42"; # N.B: if you change this, change botocore and awscli to a matching version
+  version = "1.24.75"; # N.B: if you change this, change botocore and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-3z1u8CMEvXw3EQkJNsCS1dtzXdoQneysHiNsPvf9t68=";
+    sha256 = "sha256-e/oiQt+bH6c+F/TX959rIlYPVdXaLifleOWF725LFKc=";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

From f4335622ae47d59e1ef5f75cabf39a34e174f547 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 064/403] python3Packages.botocore: 1.27.42 -> 1.27.75

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index d7e525897604..c6905d2de667 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.27.42"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.27.75"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-OKGApmZsWpsGmnXsPPN0/ypkw+kMnySpFoWLzesERW0=";
+    sha256 = "sha256-+LHaK0HojFjbUdsMbv9spWQliUjOSlrH6WrDWkabDU8=";
   };
 
   propagatedBuildInputs = [

From c43cb4306a3128a1c8998c786c9c500475e053ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 065/403] python3Packages.bottle: 0.12.21 -> 0.12.23

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

diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix
index 6532312ab71b..ebcf03652605 100644
--- a/pkgs/development/python-modules/bottle/default.nix
+++ b/pkgs/development/python-modules/bottle/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "bottle";
-  version = "0.12.21";
+  version = "0.12.23";
 
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "787c61b6cc02b9c229bf2663011fac53dd8fc197f7f8ad2eeede29d888d7887e";
+    sha256 = "sha256-aD3jqjmfsm6HsnTbz3CxplE4XUWRMXFjh6vcN5LgQWc=";
   };
 
   checkInputs = [

From 3c50c3b69f899a6665a24f5e04c2647575b44b11 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 066/403] python3Packages.boxx: 0.10.5 -> 0.10.6

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

diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix
index 469f2af96f72..37cb627b1288 100644
--- a/pkgs/development/python-modules/boxx/default.nix
+++ b/pkgs/development/python-modules/boxx/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "boxx";
-  version = "0.10.5";
+  version = "0.10.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6qO/aPegHk+1PAu8qzIkC3fULh2WjgJcqNui+XEaLQw=";
+    hash = "sha256-npPwYhDTujBpTnPyhvZbA+EK4jU8nnHSBgSw9xlTcJM=";
   };
 
   propagatedBuildInputs = [

From ef1cb88551c1744c88f7423191c86fa2f94df1d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:04 +0200
Subject: [PATCH 067/403] python3Packages.bpython: 0.22.1 -> 0.23

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

diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index b66f81d032e2..f919d5cabe29 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "bpython";
-  version = "0.22.1";
+  version = "0.23";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H7HgpSMyV5/E49z3XiF5avZ6rivkYBeez8zpUwpJogA=";
+    hash = "sha256-nwB4q8iHxIrwiGkeL2R5fWyplKwPS8A8ONBvZX18BSo=";
   };
 
   propagatedBuildInputs = [

From 5a7c3d2322e79dbcb5fddecc302ce22c08398ee5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 068/403] python3Packages.cartopy: 0.20.3 -> 0.21.0

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

diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 7a2407950576..5d635d5a52b2 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "cartopy";
-  version = "0.20.3";
+  version = "0.21.0";
 
   src = fetchPypi {
     inherit version;
     pname = "Cartopy";
-    sha256 = "sha256-DWD6Li+9d8TR9rH507WIlmFH8HwbF50tNFcKweG0kAY=";
+    sha256 = "sha256-zh06KKEy6UyJrDN2mlD4H2VjSrK9QFVjF+Fb1srRzkI=";
   };
 
   postPatch = ''

From 01b6f56f4c13ffaa4533bcccb641a5bf8474f8e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 069/403] python3Packages.cherrypy: 18.7.0 -> 18.8.0

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

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index bf963ce16aa1..d18d75bd3720 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "cherrypy";
-  version = "18.7.0";
+  version = "18.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "CherryPy";
     inherit version;
-    hash = "sha256-cpRS95jKdWOQBG7zGAQ8roZKRoFN6vPmvTTclZrxmN4=";
+    hash = "sha256-m0jPuoovFtW2QZzGV+bVHbAFujXF44JORyi7A7vH75s=";
   };
 
   postPatch = ''

From 06619ade5f30e1b76cd65dfe37e07699c63115d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 070/403] python3Packages.cliff: 3.10.1 -> 4.0.0

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

diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix
index 39c5a497c8d8..d8ff545c848e 100644
--- a/pkgs/development/python-modules/cliff/default.nix
+++ b/pkgs/development/python-modules/cliff/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , autopage
 , cmd2
+, importlib-metadata
 , installShellFiles
 , openstackdocstheme
 , pbr
@@ -16,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "cliff";
-  version = "3.10.1";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-BFruPzxkRxll161QfOhHSk4vIIFfu1QFp3D4WWoqAKA=";
+    sha256 = "sha256-Ow0w56z1DjwhSjnuPmaqLytZV+Kh3jc+F7uo6Yx1AaU=";
   };
 
   postPatch = ''
@@ -38,6 +39,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     autopage
     cmd2
+    importlib-metadata
     pbr
     prettytable
     pyparsing

From faac1657275298e1e4737c9e44c27a808748ea0a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 071/403] python3Packages.cloudpickle: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index d33f4dbee358..13f99462da53 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "cloudpickle";
-  version = "2.1.0";
+  version = "2.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uyM+h2pYSR2VkKZ2+Tx6VHOgj3R9Wrnff5zlZLPnk44=";
+    hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8=";
   };
 
   checkInputs = [

From 0c5026f18b92ff4481efcf589c970445c931b795 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 072/403] python3Packages.cloudsmith-api: 1.61.3 -> 1.120.3

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

diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix
index 1d5a2047a7c3..9e7ecae4450b 100644
--- a/pkgs/development/python-modules/cloudsmith-api/default.nix
+++ b/pkgs/development/python-modules/cloudsmith-api/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "cloudsmith-api";
-  version = "1.61.3";
+  version = "1.120.3";
 
   format = "wheel";
 
   src = fetchPypi {
     pname = "cloudsmith_api";
     inherit format version;
-    sha256 = "sha256-Y8CnbX9rhtk8sebJKo5kyqFwCkJgBjz3dgm58VHRPhY=";
+    sha256 = "sha256-rtOpA0yTEiSvzUgG1IuaIXlLrdqVT85vnR5yOdi44c0=";
   };
 
   propagatedBuildInputs = [

From bbd66905e5dccaccab3d5393010f15b909f7ee59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 073/403] python3Packages.cocotb: 1.6.2 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index 83ed76ac8669..104fe1de99df 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.6.2";
+  version = "1.7.0";
 
   # - we need to use the tarball from PyPi
   #   or the full git checkout (with .git)
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   #   because it does not include required metadata
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-SY+1727DbWMg6CnmHw8k/VP0dwBRYszn+YyyvZXgvUs=";
+    sha256 = "sha256-CF/ZXkEQDDPwTN2+ngyUKy55XwShR6/Fr5az/aYcY/Q=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 7f92259b8553da0030cc4a44dd3ab3dc68f3f7c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 074/403] python3Packages.colorlog: 6.6.0 -> 6.7.0

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

diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index 690a54813f41..9c1be8c68333 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "colorlog";
-  version = "6.6.0";
+  version = "6.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NE9zIEAJ5Mg8W2vrALPEXccPza48gNuRngpBcdAG/eg=";
+    sha256 = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU=";
   };
 
   checkInputs = [ pytestCheckHook ];

From 5db734c002ca251e2f070bdf002b74d2f08d9d0b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:05 +0200
Subject: [PATCH 075/403] python3Packages.commoncode: 30.2.0 -> 31.0.0

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

diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 42bf9d15a675..6b1d873069a8 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "commoncode";
-  version = "30.2.0";
+  version = "31.0.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7kcDWfw4M7boe0ABO4ob1d+XO1YxS924mtGETvHoNf0=";
+    sha256 = "sha256-iX7HjsbW9rUgG35XalqfXh2+89vEiwish90FGOpkzRo=";
   };
 
   postPatch = ''
@@ -57,7 +57,15 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
-  disabledTests = lib.optionals stdenv.isDarwin [
+  disabledTests = [
+    # chinese character translates different into latin
+    "test_safe_path_posix_style_chinese_char"
+    # OSError: [Errno 84] Invalid or incomplete multibyte or wide character
+    "test_os_walk_can_walk_non_utf8_path_from_unicode_path"
+    "test_resource_iter_can_walk_non_utf8_path_from_unicode_path"
+    "test_walk_can_walk_non_utf8_path_from_unicode_path"
+    "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs"
+  ] ++ lib.optionals stdenv.isDarwin [
     # expected result is tailored towards the quirks of upstream's
     # CI environment on darwin
     "test_searchable_paths"

From 41c50f2587671a9bd5059012c5f34646be829885 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 076/403] python3Packages.configparser: 5.2.0 -> 5.3.0

---
 .../python-modules/configparser/default.nix       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 9467003e9dd9..3c130acdc2fc 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -1,26 +1,27 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, setuptools-scm }:
 
 buildPythonPackage rec {
   pname = "configparser";
-  version = "5.2.0";
+  version = "5.3.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b35798fdf1713f1c3139016cfcbc461f09edbf099d1fb658d4b7479fcaa3daa";
+    sha256 = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA=";
   };
 
-  # No tests available
-  doCheck = false;
-
   nativeBuildInputs = [ setuptools-scm ];
 
+  checkInputs = [ pytestCheckHook ];
+
   preConfigure = ''
     export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8
   '';
 
   meta = with lib; {
     description = "Updated configparser from Python 3.7 for Python 2.6+.";
-    license = licenses.mit;
     homepage = "https://github.com/jaraco/configparser";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

From 6e04511d8b2858b7eb3b5a35ea7153823429f5b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 077/403] python3Packages.coverage: 6.4.2 -> 6.4.4

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

diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 6893458d5cc7..b96929640806 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "6.4.2";
+  version = "6.4.4";
   # uses f strings
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bDzP6Jw28+W5g3ue5QdHIxAWTzUsn+MyEgt2TJ1grb4=";
+    sha256 = "sha256-4WxFtyast4Dh5viLKG08ELORSrA0OPMhF8SqUtfzDVg=";
   };
 
   # No tests in archive

From f30f2148a4ec0964d14589a5aea0d37469152058 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 078/403] python3Packages.crashtest: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix
index 5b084cdd8c84..da01d77cd072 100644
--- a/pkgs/development/python-modules/crashtest/default.nix
+++ b/pkgs/development/python-modules/crashtest/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "crashtest";
-  version = "0.3.1";
+  version = "0.4.0";
   disabled = !(pythonAtLeast "3.6");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd";
+    sha256 = "sha256-1imwDx1OecMWkJ9Ot2O7yym1ENZfveE2Whzrk6t/pMg=";
   };
 
   # has tests, but only on GitHub, however the pyproject build fails for me

From 773c11ad12a9b4789afe651e5ff8ed8a4d434f13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 079/403] python3Packages.cupy: 10.6.0 -> 11.1.0

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

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index ffe017698df1..aba974e02704 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -9,12 +9,12 @@ let
   inherit (cudaPackages) cudatoolkit cudnn cutensor nccl;
 in buildPythonPackage rec {
   pname = "cupy";
-  version = "10.6.0";
+  version = "11.1.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-9jWpfd4l4LSptJewdQaaurm/huHcKv48+XOZDCLTJV8=";
+    sha256 = "sha256-4TtvmQrd172HCQWvQp+tUQhNCFf4YA3TIGod9aRoTt0=";
   };
 
   # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both

From 5b94561d92ff22811f4ceecba9d470cfa8ae16c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 080/403] python3Packages.curtsies: 0.3.10 -> 0.4.0

---
 .../python-modules/curtsies/default.nix       | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
index b05cb770a4bd..80b80e32b75b 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -1,21 +1,35 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}:
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, blessed
+, backports-cached-property
+, pyte
+, pytestCheckHook
+, cwcwidth
+}:
 
 buildPythonPackage rec {
   pname = "curtsies";
-  version = "0.3.10";
+  version = "0.4.0";
+  format = "pyproject";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11efbb153d9cb22223dd9a44041ea0c313b8411e246e7f684aa843f6aa9c1600";
+    hash = "sha256-yynvzjP+85WinvpWjyf1kTF4Rp+zqrEUCA1spiZBQv4=";
   };
 
-  propagatedBuildInputs = [ blessings cwcwidth ]
-    ++ lib.optionals (pythonOlder "3.5") [ typing ];
+  propagatedBuildInputs = [
+    backports-cached-property
+    blessed
+    cwcwidth
+  ];
 
-  checkInputs = [ mock pyte nose ];
-
-  checkPhase = ''
-    nosetests tests
-  '';
+  checkInputs = [
+    pyte
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     broken = stdenv.isDarwin;

From 17978a97530a178842cffd05dadcb0442e865923 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 081/403] python3Packages.dask-jobqueue: 0.7.4 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index cc56413eea39..0eaebec17784 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "dask-jobqueue";
-  version = "0.7.4";
+  version = "0.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XoQwazgJuFvhoEezhhGu2YvIp+VFAe7dhGIEVnuQ5kM=";
+    hash = "sha256-VCD6Oos9aSkbrzymQnqm2RV5uFzTj05VgPuhJ5PpyAk=";
   };
 
   propagatedBuildInputs = [

From bf3375dd6c3d6baba42ef4376c461f1ef1f45037 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 082/403] python3Packages.databricks-connect: 10.4.6 -> 10.4.12

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

diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix
index 7a494e55d8c6..92bbb9f54db2 100644
--- a/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/pkgs/development/python-modules/databricks-connect/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "databricks-connect";
-  version = "10.4.6";
+  version = "10.4.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Dezqn6rZysRhDQFUuTgXdoJL9dn21Bx2QlryBG9MtR0=";
+    sha256 = "sha256-T5KGJQryiE2+x9u+AcvTm6dLpU3kh20sCu0CTwpeJao=";
   };
 
   sourceRoot = ".";

From 341a7c890054d9499956190acf721e750955515e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 083/403] python3Packages.devpi-common: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 7e2a315b413e..bb1aae2e8e50 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc14aa6b74d4d9e27dc2e9cbff000ed9be5cd723d3ac9672e66e4e8fce797227";
+    sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM=";
   };
 
   propagatedBuildInputs = [

From c876b71f61a87186d13e15fd92027798ea6de8a0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:06 +0200
Subject: [PATCH 084/403] python3Packages.distributed: 2022.7.0 -> 2022.9.0

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

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 646899d36cf8..a1a3449d8ac5 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2022.7.0";
+  version = "2022.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5oq6i+PiDl0RIKvKyEGQn/GAIXCKhBKvpY/xU8T6sKw=";
+    hash = "sha256-uRXwWgWbVVW8B96gzwVwWfdR6eTn+1XFR3Y4PKDjYb8=";
   };
 
   postPatch = ''

From d469728bf891ae0a78774c9c26f9e311a901b3d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 085/403] python3Packages.dj-database-url: 0.5.0 -> 1.0.0

---
 .../python-modules/dj-database-url/default.nix    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
index 698e2a0c3052..a28c9dd05a58 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -1,14 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, django
+}:
 
 buildPythonPackage rec {
   pname = "dj-database-url";
-  version = "0.5.0";
+  version = "1.0.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163";
+    hash = "sha256-zPPocY913dFHoeIS/KiO7NqnIXWe5I44tIVIHHe8o9w=";
   };
 
+  propagatedBuildInputs = [
+    django
+  ];
+
   # Tests access a DB via network
   doCheck = false;
 

From e7cc94a20a6e59f561defac1a7d7b4653138248a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 086/403] python3Packages.docformatter: 1.4 -> 1.5.0

---
 .../python-modules/docformatter/default.nix        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix
index 7c659c4173f7..0523678bb074 100644
--- a/pkgs/development/python-modules/docformatter/default.nix
+++ b/pkgs/development/python-modules/docformatter/default.nix
@@ -1,22 +1,25 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, fetchPypi
+, fetchFromGitHub
 , untokenize
+, mock
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "docformatter";
-  version = "1.4";
+  version = "1.5.0";
 
   disabled = pythonOlder "3.6";
 
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "064e6d81f04ac96bc0d176cbaae953a0332482b22d3ad70d47c8a7f2732eef6f";
+  src = fetchFromGitHub {
+    owner = "PyCQA";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GSfsM6sPSLOIH0YJYFVTB3SigI62/ps51mA2iZ7GOEg=";
   };
 
   propagatedBuildInputs = [
@@ -24,6 +27,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    mock
     pytestCheckHook
   ];
 

From 20d4ce6981af1ad90d4ea4aa4ff84d8aab12c814 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 087/403] python3Packages.docker: 5.0.3 -> 6.0.0

---
 .../python-modules/docker/default.nix         | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index f70fcebb26f3..48f454a69b4f 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -2,39 +2,49 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy27
-, backports_ssl_match_hostname
-, mock
+, pythonOlder
+, packaging
 , paramiko
 , pytestCheckHook
 , requests
-, six
+, setuptools_scm
+, urllib3
 , websocket-client
 }:
 
 buildPythonPackage rec {
   pname = "docker";
-  version = "5.0.3";
+  version = "6.0.0";
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d916a26b62970e7c2f554110ed6af04c7ccff8e9f81ad17d0d40c75637e227fb";
+    sha256 = "sha256-GeMwRwr0AWfSk7A1JXjB+iLXSzTT7fXU/5DrwgO7svE=";
   };
 
-  nativeBuildInputs = lib.optional isPy27 mock;
+  nativeBuildInputs = [
+    setuptools_scm
+  ];
 
   propagatedBuildInputs = [
-    paramiko
+    packaging
     requests
-    six
+    urllib3
     websocket-client
-  ] ++ lib.optional isPy27 backports_ssl_match_hostname;
+  ];
+
+  passthru.optional-dependencies.ssh = [
+    paramiko
+  ];
 
   checkInputs = [
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
-  pytestFlagsArray = [ "tests/unit" ];
+  pytestFlagsArray = [
+    "tests/unit"
+  ];
 
   # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket
   disabledTests = lib.optionals stdenv.isDarwin [ "api_test" "stream_response" "socket_file" ];

From 4edab54f8028e0a5dd48b95c3c55425a2436dfa7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 088/403] python3Packages.dpkt: 1.9.7.2 -> 1.9.8

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

diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
index a1036e099ea8..f59b7ba73662 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dpkt";
-  version = "1.9.7.2";
+  version = "1.9.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b";
+    sha256 = "sha256-Q/hobkVdpQUoNf0e2iaJ1R3jZwqsl5mxsAz9IDkn7kU=";
   };
 
   # Project has no tests

From ad07650f7c93a3dc01b468d7fc1e5a4bf95b2cb9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 089/403] python3Packages.etils: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index a428edc9e887..4d97ae3ff447 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "etils";
-  version = "0.7.1";
+  version = "0.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IHwJfdQYDV5asce37ni3v5Rx4SU03qziOx05LevSkvM=";
+    hash = "sha256-0dWve9nHhKJzxOHsz6qP6speBIGghxe1MT+iMdoiqQM=";
   };
 
   nativeBuildInputs = [

From f8461e03ba626a1b636a049fbbd1e9fc14ddc4b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 090/403] python3Packages.evdev: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix
index 86149cbd865a..354b10749938 100644
--- a/pkgs/development/python-modules/evdev/default.nix
+++ b/pkgs/development/python-modules/evdev/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "evdev";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-WzOxdPfIRXbn3WBx5Di/WtIn2pXv1DVqOf5Mg1VBL+Y=";
+    sha256 = "sha256-7PoBtchPfoxs7TNnrJUoj0PNhO+/1919DNv8DRjIemo=";
   };
 
   buildInputs = [ linuxHeaders ];

From e8fd120ee4617b9e8ddaf58feef608f1b4cfb7b9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 091/403] python3Packages.faker: 13.15.0 -> 14.2.0

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index a464d0372b51..9b8e6f7574a1 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "faker";
-  version = "13.15.0";
+  version = "14.2.0";
 
   src = fetchPypi {
     pname = "Faker";
     inherit version;
-    hash = "sha256-oSb6ZvVOZaZ/kT3MaYydAj3vcneIJTa94paPyscBv9U=";
+    hash = "sha256-bbVuLEOit0JQ0cMy7yX+99wH3LbF+rUynde0RnuO17k=";
   };
 
   propagatedBuildInputs = [

From 389875c8285fc2a4ce39bf64cd26f6c0ced374cc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 092/403] python3Packages.filelock: 3.7.1 -> 3.8.0

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

diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 5fdbd8c441fe..7afb72545147 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.7.1";
+  version = "3.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Og/YUWatnbq1TJrslnN7dEEG3F8VwLCaZ0SkRSmfzwQ=";
+    hash = "sha256-VUR8qmZvIZjFtrE6JtIITSb6WxFcANBlZkshJGgMTtw=";
   };
 
   nativeBuildInputs = [

From 00a317107e1e735f18b49641c3396575cd7e4d9b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:07 +0200
Subject: [PATCH 093/403] python3Packages.flask-security-too: 4.1.5 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix
index 7af6ea692cae..e2094568b658 100644
--- a/pkgs/development/python-modules/flask-security-too/default.nix
+++ b/pkgs/development/python-modules/flask-security-too/default.nix
@@ -44,12 +44,12 @@
 
 buildPythonPackage rec {
   pname = "flask-security-too";
-  version = "4.1.5";
+  version = "5.0.1";
 
   src = fetchPypi {
     pname = "Flask-Security-Too";
     inherit version;
-    sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
+    sha256 = "sha256-Q247oFmE8BDid0EFXGm8EsxFVmlG5NgFmQomKMNlZZQ=";
   };
 
   propagatedBuildInputs = [

From cf9ae52369a813401d39e8f916da191aa46c0f85 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 094/403] python3Packages.fontParts: 0.10.7 -> 0.10.8

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

diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
index 28972b62b977..6a595e29079e 100644
--- a/pkgs/development/python-modules/fontparts/default.nix
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "fontParts";
-  version = "0.10.7";
+  version = "0.10.8";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-u0hKI2LLWAUGIVRECk6b5y7UKgJHUx2I8R5Q+qkKxcg=";
+    sha256 = "sha256-LwEhvLqx3Vu1omc/QrGCptQD25Tbv9Ok5eTURL3hvEQ=";
     extension = "zip";
   };
 

From f75b8276afdda77d36663dba96911dc2fba4e384 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 095/403] python3Packages.freezegun: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix
index 171d2b0556ab..b1300b4e1146 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/pkgs/development/python-modules/freezegun/default.nix
@@ -10,21 +10,21 @@
 
 buildPythonPackage rec {
   pname = "freezegun";
-  version = "1.2.1";
+  version = "1.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tMZO+ydea8aNxudxsX/+D/D5C4GipRiQQ1ULZRmSa6Q=";
+    hash = "sha256-zSLRugaUE4RBDNln2KmdWuJEL1ffr+/y/aXejcXAVEY=";
   };
 
   patches = lib.optionals (pythonAtLeast "3.10") [
     # Staticmethods in 3.10+ are now callable, prevent freezegun to attempt to decorate them
     (fetchpatch {
       url = "https://github.com/spulec/freezegun/pull/397/commits/e63874ce75a74a1159390914045fe8e7955b24c4.patch";
-      sha256 = "sha256-FNABqVN5DFqVUR88lYzwbfsZj3xcB9/MvQtm+I2VjnI=";
+      hash = "sha256-FNABqVN5DFqVUR88lYzwbfsZj3xcB9/MvQtm+I2VjnI=";
     })
   ];
 

From eb22d2c184e8dcad5c7e3a164697aadba17bdf19 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 096/403] python3Packages.glean-parser: 6.1.2 -> 6.2.0

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

diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index 97ff89852d3b..8164d6099a45 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "glean-parser";
-  version = "6.1.2";
+  version = "6.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-EqD+ztwRRNd/pXHgQi/z/qTbrcOB1jG+qACmsvWPT38=";
+    hash = "sha256-PKUc1PYfM4MxDFErV4zYyHl/mkPQNvIcjNaDekenHc8=";
   };
 
   postPatch = ''

From e2c42ac0ccb4e1f7643378794269b6e5e7bae5a7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 097/403] python3Packages.google-api-core: 2.8.2 -> 2.10.1

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

diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 50b58e5a3f15..89139485ca37 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "2.8.2";
+  version = "2.10.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-BvckTGQDIrUIsSWQO7VwG+urzogy+Fq6kzXsALPQLtw=";
+    sha256 = "sha256-4WwVoReJvFo0V6+ygYo1QKA/NB5ucQ1/m79s3i70p8g=";
   };
 
   propagatedBuildInputs = [

From 5a43c9529d373c847056f063b02f0c65ba370867 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 098/403] python3Packages.google-api-python-client: 2.57.0 ->
 2.61.0

---
 .../python-modules/google-api-python-client/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 845bb25638f5..73f8310cc0d8 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "2.57.0";
+  version = "2.61.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7EQSVFsMWXioM7sDmTpGEhrSxwDzKvDLoj+EObP1+wI=";
+    sha256 = "sha256-3goMt7sY6/9c99x4K0ikiKFL12hLU4eZ8xvtq33iuD8=";
   };
 
   propagatedBuildInputs = [

From 49551a49476a04bba37846cffe548787a2360ff4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 099/403] python3Packages.google-cloud-asset: 3.13.0 -> 3.13.1

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

diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 2ab2ce584277..769648273770 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-asset";
-  version = "3.13.0";
+  version = "3.13.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UWy6dC1a9712pxT43JNP2CAbtXUFi2olvEm1eLw+z0g=";
+    hash = "sha256-FEgsqN1rgkryreNNotwzfErYAdwAjiJ9M7TfVJtQXUc=";
   };
 
   propagatedBuildInputs = [

From e8672b4ccecb0724c7711d244b1db0198f8afa57 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 100/403] python3Packages.google-cloud-compute: 1.5.1 -> 1.5.2

---
 .../python-modules/google-cloud-compute/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix
index 6e4e2d283f6f..f51cac5d8a5c 100644
--- a/pkgs/development/python-modules/google-cloud-compute/default.nix
+++ b/pkgs/development/python-modules/google-cloud-compute/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-compute";
-  version = "1.5.1";
+  version = "1.5.2";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1crkhcf56U6DAx9xVG2e9hCxQ04OjQq2QgLs434cCv0=";
+    sha256 = "sha256-D0pIR1vQEt/7aIxMo0uDlxvt+fwS2DxCurU/lxMHAjo=";
   };
 
   propagatedBuildInputs = [

From dbbf80b20fbbb29a43a31ba1748bfda7c36e15a7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 101/403] python3Packages.google-cloud-spanner: 3.19.0 ->
 3.20.0

---
 .../python-modules/google-cloud-spanner/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index fb35e7688e68..f37fade9c790 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "3.19.0";
+  version = "3.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-QGigxsIrIF/ey1hL5wTdo1Z6VqRQQX4vpgen1HgzaiQ=";
+    sha256 = "sha256-3KnpesMoqjjXgHjHihLN8cnYjtO07sbjHL1G4ZyInZ8=";
   };
 
   propagatedBuildInputs = [

From 5763e070e8e7fd6c9f400b6f70d3714db37d47c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 102/403] python3Packages.gradient: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix
index b78373294326..a9aadb85210b 100644
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@@ -23,12 +23,12 @@
 
 buildPythonPackage rec {
   pname = "gradient";
-  version = "2.0.5";
+  version = "2.0.6";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-D0JX6tk6SY5seH9m21hwMZ2TnaAG6OrHo+ucJEredd0=";
+    hash = "sha256-pqyyNzx2YPP3qmWQbzGd3q2HzCkrWlIVSJZeFrGm9dk=";
   };
 
   postPatch = ''

From c4f9177d3609df1dbd757a4d2a5a597f8d12b9b3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:08 +0200
Subject: [PATCH 103/403] python3Packages.greenlet: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 4264a8252610..12f3044f0680 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "greenlet";
-  version = "1.1.2";
+  version = "1.1.3";
   disabled = isPyPy; # builtin for pypy
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a";
+    sha256 = "sha256-vLbG3R1r5tONbbKDdH0H/aCJ/4xVmoNSNlYKRBA0BFU=";
   };
 
   checkInputs = [ unittestCheckHook ];

From ec348571a416f2ed626a907729eb10168e14f9e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 104/403] python3Packages.hatch-fancy-pypi-readme: 22.3.0 ->
 22.7.0

---
 .../python-modules/hatch-fancy-pypi-readme/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
index 0092f4b657a4..4e1a32236f0d 100644
--- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
+++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "hatch-fancy-pypi-readme";
-  version = "22.3.0";
+  version = "22.7.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "hatch_fancy_pypi_readme";
     inherit version;
-    hash = "sha256-fUZR+PB4JZMckoc8tRE3IUqTi623p1m4XB2Vv3T4bvo=";
+    hash = "sha256-3t8roLgaKXWrsd7ukxCy64XSI4D9oNUoaedgtUNapZY=";
   };
 
   nativeBuildInputs = [

From c5c0c3f9ddf540c42d6be8cd489d939164deedd9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 105/403] python3Packages.hatchling: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
index 636d46dfdd7f..6006c30219e1 100644
--- a/pkgs/development/python-modules/hatchling/default.nix
+++ b/pkgs/development/python-modules/hatchling/default.nix
@@ -20,7 +20,7 @@
 
 let
   pname = "hatchling";
-  version = "1.8.0";
+  version = "1.9.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -28,7 +28,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pPmC/coHF9jEa/57UBMC+QqvKlMChF1VC0nIc5aB/rI=";
+    sha256 = "sha256-tXxzYvQ3uUJuS5QiiiHSrFgE+7KrywGt3iVEo1uzA80=";
   };
 
   # listed in backend/src/hatchling/ouroboros.py

From 3de48e8c32ef4f0e3104a4f7c61808962bd0620e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 106/403] python3Packages.idna: 3.3 -> 3.4

---
 pkgs/development/python-modules/idna/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index dd0112860105..bf321edb38be 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -1,19 +1,27 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, flit-core
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "idna";
-  version = "3.3";
+  version = "3.4";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d";
+    sha256 = "sha256-gU9Sjo3q19MpgzuRxfqofWC/cYJM0Sp1MLVSYGPQLLQ=";
   };
 
-  checkInputs = [ pytestCheckHook ];
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = {
     homepage = "https://github.com/kjd/idna/";

From c4f68dcaf2c3d9344eb03c4ebb0115198883f8cc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 107/403] python3Packages.imageio: 2.19.3 -> 2.21.3

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

diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index f657f73a7e41..5a0226f0d3d7 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "imageio";
-  version = "2.19.3";
+  version = "2.21.3";
   disabled = isPy27;
 
   src = fetchPypi {
-    sha256 = "sha256-DJ34DkLy7mi+qSAB5/z2EqoUmRDv4EDrdX9c4yMlCuE=";
+    sha256 = "sha256-sQpYPIMcky9K++qehAMILSp2sdMNdVW3d863BEGJCzw=";
     inherit pname version;
   };
 

From bab313a9e7555ed6f5f5d9d1e68ea479cddf28a0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 108/403] python3Packages.importlib-resources: 5.8.0 -> 5.9.0

---
 .../python-modules/importlib-resources/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix
index 89537a8dfa2b..7e5d7e1448ac 100644
--- a/pkgs/development/python-modules/importlib-resources/default.nix
+++ b/pkgs/development/python-modules/importlib-resources/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "importlib-resources";
-  version = "5.8.0";
+  version = "5.9.0";
   format = "pyproject";
   disabled = isPy27;
 
   src = fetchPypi {
     pname = "importlib_resources";
     inherit version;
-    sha256 = "sha256-VoyfFssgT53syNbSSlcu7qJ9rLtM7p5rA6gCVzZ2l1E=";
+    sha256 = "sha256-VIHpf7Ra+Nzy95iVJiVZHFj+WZ0HNdhrEPVN4IamFoE=";
   };
 
   nativeBuildInputs = [

From 48b797097751d4b88883e006b8d1f7be44019fbc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 109/403] python3Packages.inflect: 5.6.2 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index bb98c5bd679f..6e64c946b980 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -3,22 +3,25 @@
 , fetchPypi
 , isPy27
 , setuptools-scm
+, pydantic
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "inflect";
-  version = "5.6.2";
+  version = "6.0.0";
   disabled = isPy27;
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-qtx+1zko9eAUEpeUu6wDBYzKNdCpc6X8TrRcf6JgBfk=";
+    sha256 = "sha256-C8FRbsJyXi2CIXB6YSJFCTy28c6iCc/Yy9T8Xpb6Y2U=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
 
+  propagatedBuildInputs = [ pydantic ];
+
   checkInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "inflect" ];

From e32ce4b6f600c1e0d9d782536a7849840dca64e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 110/403] python3Packages.ipykernel: 6.15.1 -> 6.15.3

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

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index e3f981964b65..36bd9961903c 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "ipykernel";
-  version = "6.15.1";
+  version = "6.15.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-N6zDJUyqig2vzd3cjchjpgrRtGSHtoruNh2aFb2pgRI=";
+    sha256 = "sha256-uB1XsOFxZwhEvynNwRVisQENPahxFcRRPg7mYKg2h2U=";
   };
 
   # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767

From d2ab35f5e02e8de117b76bdf399b551a58d9200a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 111/403] python3Packages.ipyvuetify: 1.8.2 -> 1.8.4

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

diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix
index 567c033e243f..1fbf03cfa797 100644
--- a/pkgs/development/python-modules/ipyvuetify/default.nix
+++ b/pkgs/development/python-modules/ipyvuetify/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ipyvuetify";
-  version = "1.8.2";
+  version = "1.8.4";
 
   # GitHub version tries to run npm (Node JS)
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A=";
+    sha256 = "sha256-viBWeFLGuKQKs9wXO3EULTNorrW25P2DFX1t5OmUcW0=";
   };
 
   propagatedBuildInputs = [ ipyvue ];

From 172f9cf80723482ab506365902a21025963bf4da Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:13:01 +1000
Subject: [PATCH 112/403] boehmgc: disabled tests on x86_64-darwin

---
 pkgs/development/libraries/boehm-gc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 2e1c0010f512..513ae50298e2 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional enableMmap "--enable-mmap"
   ++ lib.optional enableLargeConfig "--enable-large-config";
 
-  doCheck = true;
+  # `gctest` fails under emulation on aarch64-darwin
+  doCheck = !(stdenv.isDarwin && stdenv.isx86_64);
 
   enableParallelBuilding = true;
 

From cfe3eabb1be28f3120b3be2148b18154c67b8054 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:09 +0200
Subject: [PATCH 113/403] python3Packages.ipywidgets: 7.7.1 -> 8.0.2

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

diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index 62737e74785a..b4689b207756 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -6,18 +6,19 @@
 , lib
 , nbformat
 , pytestCheckHook
+, pytz
 , traitlets
 , widgetsnbextension
 }:
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "7.7.1";
+  version = "8.0.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Xy+ht6+uGvMsiAiMmCitl43pPd2jk9ftQU5VP+6T3Ks=";
+    hash = "sha256-CMt1xuCpaDYUfL/cVVgK4E0T4F0m/7w3e04caLqiix8=";
   };
 
   propagatedBuildInputs = [
@@ -26,6 +27,7 @@ buildPythonPackage rec {
     jupyterlab-widgets
     traitlets
     nbformat
+    pytz
     widgetsnbextension
   ];
 

From 33b94889fd4f52ee58108c98257cd0f0b36ef205 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 114/403] python3Packages.jaraco.logging: 3.1.0 -> 3.1.2

---
 .../python-modules/jaraco_logging/default.nix | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix
index d8ff10d95b62..1fa4e6dfed9f 100644
--- a/pkgs/development/python-modules/jaraco_logging/default.nix
+++ b/pkgs/development/python-modules/jaraco_logging/default.nix
@@ -1,20 +1,34 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools-scm
-, tempora, six
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, setuptools-scm
+, tempora
+, six
 }:
 
 buildPythonPackage rec {
-  pname = "jaraco.logging";
-  version = "3.1.0";
+  pname = "jaraco-logging";
+  version = "3.1.2";
+  format = "pyproject";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "150dc8701207b28bc65a16f0e91c07250a8d1b9da324ce674c0e375774944f13";
+    pname = "jaraco.logging";
+    inherit version;
+    sha256 = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE=";
   };
 
   pythonNamespaces = [ "jaraco" ];
 
-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ tempora six ];
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    tempora
+    six
+  ];
 
   # test no longer packaged with pypi
   doCheck = false;
@@ -25,5 +39,6 @@ buildPythonPackage rec {
     description = "Support for Python logging facility";
     homepage = "https://github.com/jaraco/jaraco.logging";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

From dfd910af8ddb64396ca06868005b29a40b4f7c70 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 115/403] python3Packages.jaraco.text: 3.8.1 -> 3.9.1

---
 .../python-modules/jaraco_text/default.nix      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix
index 2bdf376ffe23..341c744a4293 100644
--- a/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/pkgs/development/python-modules/jaraco_text/default.nix
@@ -2,22 +2,26 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, autocommand
 , importlib-resources
 , jaraco_functools
 , jaraco-context
+, inflect
+, pathlib2
+, pytestCheckHook
 , setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "jaraco.text";
-  version = "3.8.1";
+  version = "3.9.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RQlXw/j7mlU9nT5gc4czqxxcwns2pGM0KtuTfppwqz4=";
+    sha256 = "sha256-1XzURIpYgCAxhCXgQZTol/lvwjuSuC/5MIok1cvys/s=";
   };
 
   pythonNamespaces = [
@@ -29,14 +33,19 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    autocommand
     jaraco-context
     jaraco_functools
+    inflect
   ] ++ lib.optional (pythonOlder "3.9") [
     importlib-resources
   ];
 
-  # no tests in pypi package
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+  ] ++ lib.optional (pythonOlder "3.10") [
+    pathlib2
+  ];
 
   pythonImportsCheck = [
     "jaraco.text"

From 241d8b744adc4840ac91bdfaf2af00039214fae1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 116/403] python3Packages.jupyter-book: 0.13.0 -> 0.13.1

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

diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix
index a03910f6ce0b..7753f201a928 100644
--- a/pkgs/development/python-modules/jupyter-book/default.nix
+++ b/pkgs/development/python-modules/jupyter-book/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "jupyter-book";
-  version = "0.13.0";
+  version = "0.13.1";
 
   format = "flit";
 
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a956677e7bbee630dd66641c09a84091277887d6dcdd381a676f00fa9de2074";
+    sha256 = "sha256-RgpC/H4J3kbdZsKuwYu7EOKCqcgM2v4uUsm6PVFknQE=";
   };
 
   postPatch = ''

From c2f5f2381a87c6a18c8fa8d45027d0dfba4c4b7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 117/403] python3Packages.jupyter_client: 7.3.4 -> 7.3.5

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

diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix
index 6df956de5208..598cef9a8e58 100644
--- a/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "jupyter_client";
-  version = "7.3.4";
+  version = "7.3.5";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-qppsMgVLKQN0+V9zuwyukUVcWN+4T2XIWRkSuPZebVY=";
+    sha256 = "sha256-PFhGahuNVdugvzzgg05PW3dguvmNHXPbCt1vGd6ezR0=";
   };
 
   nativeBuildInputs = [

From ea128f1aeee2a1d167c6ab26eabf1d77b9ab4f55 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 118/403] python3Packages.jupyterlab: 3.4.6 -> 3.4.7

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

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index b300d14b25c5..0053c50ef0c0 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "3.4.6";
+  version = "3.4.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-41mci8dM7gZBFfluOIzSeipyUbHcAvStG/in/1Jw8Xk=";
+    sha256 = "sha256-TcSKsJgOOvLpId/ybgAT3QOxBLG2fw2FtnRI4W4lMR4=";
   };
 
   nativeBuildInputs = [

From 2462c67625d95b7cc9597e57a011b2eccd470832 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 119/403] python3Packages.jupyterlab-git: 0.39.0 -> 0.39.2

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

diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index 3052167d1d31..b8914a2a45a0 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-git";
-  version = "0.39.0";
+  version = "0.39.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     pname = "jupyterlab_git";
     inherit version;
-    sha256 = "sha256-2BMSbZ5ICISavg1JON7fiKd4e4vAyWW+geSgxbMowis=";
+    sha256 = "sha256-+wzKAK5jdrlPjtVDgp7QqOyXaBDzzkRJI+6hcbOcnpo=";
   };
 
   nativeBuildInputs = [

From 8495fb43efdaef13485cf9dc6774236f60af2f31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 120/403] python3Packages.jupyterlab-widgets: 2.0.0b1 -> 3.0.3

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

diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
index 26794fbc77b5..7077d39cb742 100644
--- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-widgets";
-  version = "2.0.0b1";
+  version = "3.0.3";
 
   src = fetchPypi {
     pname = "jupyterlab_widgets";
     inherit version;
-    sha256 = "1xinfk3bhqmfp9ygfpi8b87h4ky8dv3sdr96035psx1jjgyyw8bi";
+    sha256 = "sha256-x2cYE5m0yotke+/i2ROxJg9Rv52O+behRjLUwae1Nr0=";
   };
 
   nativeBuildInputs = [

From f0424a78f7d58a118b2babb1dcdbcfc6afbea40a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:10 +0200
Subject: [PATCH 121/403] python3Packages.jupyter-packaging: 0.12.2 -> 0.12.3

---
 .../python-modules/jupyter-packaging/default.nix     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix
index ae700d9a8068..1ee870bfd573 100644
--- a/pkgs/development/python-modules/jupyter-packaging/default.nix
+++ b/pkgs/development/python-modules/jupyter-packaging/default.nix
@@ -7,26 +7,32 @@
 , packaging
 , pytestCheckHook
 , pytest-timeout
+, setuptools
 , tomlkit
 }:
 
 buildPythonPackage rec {
   pname = "jupyter-packaging";
-  version = "0.12.2";
+  version = "0.12.3";
   disabled = pythonOlder "3.7";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "jupyter_packaging";
     inherit version;
-    sha256 = "sha256-C5nq7PVrnR2Z57y2Yy2RSo6laY2kCyOLqJIno0FX3jI=";
+    sha256 = "sha256-nZsrY7l//WeovFORwypCG8QVsmSjLJnk2NjdMdqunPQ=";
   };
 
   nativeBuildInputs = [
     hatchling
   ];
 
-  propagatedBuildInputs = [ deprecation packaging tomlkit ];
+  propagatedBuildInputs = [
+    deprecation
+    packaging
+    setuptools
+    tomlkit
+  ];
 
   checkInputs = [
     pytestCheckHook

From 2f55dfbc268f8428ee7a87895b2863d82d9d524d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:11 +0200
Subject: [PATCH 122/403] python3Packages.keras: 2.9.0 -> 2.10.0

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

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index edb928e682b7..32f4ad3a5995 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "2.9.0";
+  version = "2.10.0";
   format = "wheel";
 
   src = fetchPypi {
     inherit format pname version;
-    sha256 = "sha256-VZESVvic/JNDyfvkth7EWi0z2Jcpy+GrncrPiwe4tqs=";
+    sha256 = "sha256-JqbiwlIudGjd6iJxCpmzKQSTdo/AijnnXRFzoONFL98=";
   };
 
   checkInputs = [

From d809e53667aaf900fac7844674f8f650da2bea65 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:11 +0200
Subject: [PATCH 123/403] python3Packages.keyring: 23.7.0 -> 23.9.1

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

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 743220e89ee7..cd1f4d6816aa 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -6,6 +6,7 @@
 , setuptools-scm
 , importlib-metadata
 , dbus-python
+, jaraco_classes
 , jeepney
 , secretstorage
 , pytestCheckHook
@@ -13,14 +14,13 @@
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "23.7.0";
-  disabled = pythonOlder "3.7";
-
+  version = "23.9.1";
   format = "pyproject";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eC4c0RMukb9Fn80kO88lsyYBXBrAsZjkQI+R+meRBis=";
+    hash = "sha256-OeT2VyI40mFagvyqSF5gi4S1A88IDckkxDu7rLEcHBg=";
   };
 
   nativeBuildInputs = [
@@ -30,9 +30,10 @@ buildPythonPackage rec {
   propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
     importlib-metadata
   ] ++ lib.optionals stdenv.isLinux [
+    dbus-python
+    jaraco_classes
     jeepney
     secretstorage
-    dbus-python
   ];
 
   pythonImportsCheck = [

From 4240a4ba5d60e1cc89773fabd3a77ce2cd2fc580 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:11 +0200
Subject: [PATCH 124/403] python3Packages.keyrings.alt: 4.1.1 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 45a85f0fd8fd..7b46634d9f4a 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "keyrings.alt";
-  version = "4.1.1";
+  version = "4.2.0";
   format = "pyproject";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6HFSuVYvqCK1Ew7jECVRK02m5tsNrzjIcFZtCLhK3tY=";
+    sha256 = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE=";
   };
 
   nativeBuildInputs = [

From 0b47da7a13bf8b812b50bce53ea0a9ad79d0ac3c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:11 +0200
Subject: [PATCH 125/403] python3Packages.llvmlite: 0.38.1 -> 0.39.1

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

diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index b928fe59c1cd..d53d40ca3079 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "llvmlite";
-  version = "0.38.1";
+  version = "0.39.1";
 
   disabled = isPyPy || !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-BiKoYwH8+BzFDX7VtL6+mSwDBYDUE6hEOzKO1PTYJWE=";
+    sha256 = "sha256-tDq9fILoBSYcQl1QM1vppsT4QmTjTW1uR1IHMAAF1XI=";
   };
 
   nativeBuildInputs = [ llvm ];

From 2dd3d11c7424279a75e2ac7d899a6d40f4edc765 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:11 +0200
Subject: [PATCH 126/403] python3Packages.localstack-ext: 1.0.4 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix
index 6ccef341fadf..607ac5a00d74 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "localstack-ext";
-  version = "1.0.4";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-YNj4V/mv8gn+TEPBejgyMIuSXYmIXNjk5xruyVbf1qA=";
+    sha256 = "sha256-EpFkam2xqRSiIhLkcBFSFKr9j0P5oRP4CIUVcjKT5gM=";
   };
 
   postPatch = ''

From dbe80f4b2c007120eb8244883de8e3ea3140b7f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:11 +0200
Subject: [PATCH 127/403] python3Packages.matplotlib: 3.5.2 -> 3.5.3

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

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 933fd3865d6b..ad32c3db7eb6 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -17,7 +17,7 @@ let
 in
 
 buildPythonPackage rec {
-  version = "3.5.2";
+  version = "3.5.3";
   pname = "matplotlib";
   format = "setuptools";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18h78s5ld1i6mz00w258hy29909nfr3ddq6ry9kq18agw468bks8";
+    sha256 = "sha256-M5ysSLgN28i/0F2q4KOnNBRlGoWWkEwqiBz9Httl8mw=";
   };
 
   XDG_RUNTIME_DIR = "/tmp";
@@ -112,6 +112,9 @@ buildPythonPackage rec {
       echo "[libs]
       system_freetype=true
       system_qhull=true" > mplsetup.cfg
+
+      substituteInPlace setup.py \
+        --replace "setuptools_scm>=4,<7" "setuptools_scm>=4"
     '';
 
   # Matplotlib needs to be built against a specific version of freetype in

From a486245526a3d9593e61d1a1be33364035aef178 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:11 +0200
Subject: [PATCH 128/403] python3Packages.matplotlib-inline: 0.1.3 -> 0.1.6

---
 .../python-modules/matplotlib-inline/default.nix      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix
index d863239430dc..deb2a68f2504 100644
--- a/pkgs/development/python-modules/matplotlib-inline/default.nix
+++ b/pkgs/development/python-modules/matplotlib-inline/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "matplotlib-inline";
-  version = "0.1.3";
+  version = "0.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a04bfba22e0d1395479f866853ec1ee28eea1485c1d69a6faf00dc3e24ff34ee";
+    sha256 = "sha256-+Ifl8Qupjo0rFQ3c9HAsHl+LOiAAXrD3S/29Ng7m8wQ=";
   };
 
   propagatedBuildInputs = [
@@ -20,7 +20,12 @@ buildPythonPackage rec {
 
   # wants to import ipython, which creates a circular dependency
   doCheck = false;
-  pythonImportsCheck = [ "matplotlib_inline" ];
+
+  #
+  pythonImportsCheck = [
+    # tries to import matplotlib, which can't work with doCheck disabled
+    #"matplotlib_inline"
+  ];
 
   passthru.tests = { inherit ipython; };
 

From 17aab92d816d4335cb538fb9f8eccfe843741d88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 129/403] python3Packages.metakernel: 0.29.0 -> 0.29.2

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

diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix
index 417b4d914e63..5cc40f4a6ca6 100644
--- a/pkgs/development/python-modules/metakernel/default.nix
+++ b/pkgs/development/python-modules/metakernel/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "metakernel";
-  version = "0.29.0";
+  version = "0.29.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+B8ywp7q42g8H+BPFK+D1VyLfyqgnrYIN3ai/mdcwcA=";
+    sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ=";
   };
 
   propagatedBuildInputs = [ ipykernel ];

From 135ebd6c82313b81c882517e3f272549cfccd56e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 130/403] python3Packages.mocket: 3.10.6 -> 3.10.8

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

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 1e9203f4abe0..b79673e2b240 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -10,7 +10,9 @@
 , pytestCheckHook
 , pytest-mock
 , aiohttp
+, fastapi
 , gevent
+, httpx
 , redis
 , requests
 , sure
@@ -19,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.10.6";
+  version = "3.10.8";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pD6WiK3OgDD2Xy9r59KOB9TT/LNiQa/DWRXA+w76oe8=";
+    sha256 = "sha256-aiofKFE9CPLMVJm+IT6VmtJSsVuH7ucpv5Kp1w7d2FE=";
   };
 
   propagatedBuildInputs = [
@@ -38,7 +40,9 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-mock
     aiohttp
+    fastapi
     gevent
+    httpx
     redis
     requests
     sure

From cd931da1393893a35d1015d216b09fa3b3661a1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 131/403] python3Packages.more-itertools: 8.13.0 -> 8.14.0

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

diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index 9f3ce69394fa..1735148c58ec 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "more-itertools";
-  version = "8.13.0";
+  version = "8.14.0";
   format = "flit";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pCkBoKWxadkl9vIXzVoZDjLvVDYJBbnDnufbUxO/7A8=";
+    sha256 = "sha256-wJRDzT1UOLja/M2GemvBywiUOJ6Qy1PSJ0VrCwvMt1A=";
   };
 
   nativeBuildInouts = [

From c0d116921b0738801721b1dfa3d4d80d2884b09e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 132/403] python3Packages.moto: 3.1.16 -> 4.0.3

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

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 355ad0766c62..220c3aa3caa1 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -36,16 +36,21 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "3.1.16";
+  version = "4.0.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-y+itipSfUZdx5dJbZwc4YEdX+2fNR0110UwgZ3WC6B8=";
+    sha256 = "sha256-iutWdX5oavPkpj+Qr7yXPLIxrarYfFzonmiTbBCbC+k=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "werkzeug>=0.5,<2.2.0" "werkzeug>=0.5"
+  '';
+
   propagatedBuildInputs = [
     aws-xray-sdk
     boto3
@@ -96,6 +101,7 @@ buildPythonPackage rec {
     "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow"
     "--deselect=tests/test_iotdata/test_iotdata.py::test_publish"
     "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning"
+    "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header"
 
     # Disalbe test that require docker daemon
     "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda"

From f0ac1bb51eb90ed08664f3eecffa39899ecb5197 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 133/403] python3Packages.msldap: 0.3.40 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix
index 0c0eecbac12f..ffe20cb4f549 100644
--- a/pkgs/development/python-modules/msldap/default.nix
+++ b/pkgs/development/python-modules/msldap/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "msldap";
-  version = "0.3.40";
+  version = "0.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4sIqbjlrTX1l1zhj7URhISDo4lcP+JW1Qh3fajUAhbs=";
+    hash = "sha256-+zfFCWtqIrK0tQNJ+noilvvXO6y1umWoNQ2TvhDosls=";
   };
 
   propagatedBuildInputs = [

From c44b32597986d3014b53620a960d4dc27999e3e5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 134/403] python3Packages.murmurhash: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index 23587889f6a3..6e2b5bd49d89 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "murmurhash";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Ywo5br0xykTYm07KNvp06oquckrfCvqi3naAw1Cyk28=";
+    sha256 = "sha256-i7A6rYQoN6ZLDB0u0itQ66hfn6UUdsi8CnfDZql58fM=";
   };
 
   postPatch = ''

From bde09a920dc6128772fafcaad09cfb9f5322c938 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 135/403] python3Packages.myfitnesspal: 1.17.0 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix
index 791cb708be5c..433f06a0c50b 100644
--- a/pkgs/development/python-modules/myfitnesspal/default.nix
+++ b/pkgs/development/python-modules/myfitnesspal/default.nix
@@ -2,6 +2,7 @@
 , fetchPypi
 , buildPythonPackage
 , blessed
+, browser-cookie3
 , keyring
 , keyrings-alt
 , lxml
@@ -18,18 +19,19 @@
 
 buildPythonPackage rec {
   pname = "myfitnesspal";
-  version = "1.17.0";
+  version = "2.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-UXFvKQtC44EvscYWXK7KI/do3U0wTWI3zKwvsRdzKrs=";
+    sha256 = "sha256-xkO4rzjQTf1H4ZtJlzx6dT6BnfSg3VZU8pXdJFraTAI=";
   };
 
   propagatedBuildInputs = [
     blessed
+    browser-cookie3
     keyring
     keyrings-alt
     lxml

From 3adc90e49ccf50bf2df95774dee74e5f7cf38f0c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:12 +0200
Subject: [PATCH 136/403] python3Packages.mypy-protobuf: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix
index f1c7d83a6bae..007fd2fd015f 100644
--- a/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/pkgs/development/python-modules/mypy-protobuf/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonApplication rec {
   pname = "mypy-protobuf";
-  version = "3.2.0";
+  version = "3.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-cwqhUzfDjwRG++CPbGwjcO4B05USU2nUtw4IseLuMO4=";
+    sha256 = "sha256-JPOwrssGZW6YP1jgfHMqkFd7nXrz4QZvwrZju/A3Akg=";
   };
 
   propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ];

From 113ebb039c5fc84d0892567540779b552ba04cc7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 137/403] python3Packages.natsort: 8.1.0 -> 8.2.0

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

diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 3b3682b335e9..065367e36dd6 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "natsort";
-  version = "8.1.0";
+  version = "8.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-x8Hz8nw3Vxmk38qzU5Cf458mwgMqBiqMgMyETqrKBEU=";
+    hash = "sha256-V/hbcsaIsJ4FPNrDAt1bW1PfX3OuILSHT8v/2L94PRE=";
   };
 
   propagatedBuildInputs = [

From eb91570c7a496e1125ff2964dbdf02345746da08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 138/403] python3Packages.nbformat: 5.4.0 -> 5.5.0

---
 .../python-modules/nbformat/default.nix       | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index e5185aa37f66..fabee5f10a2b 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , fastjsonschema
+, flit-core
 , pytestCheckHook
 , glibcLocales
 , ipython_genutils
@@ -9,21 +10,36 @@
 , testpath
 , jsonschema
 , jupyter_core
+, pep440
 }:
 
 buildPythonPackage rec {
   pname = "nbformat";
-  version = "5.4.0";
+  version = "5.5.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RLpcpqy4DF1aUA8eW4Pt6MvjZNWklcTIz2Cq8bplZQE=";
+    sha256 = "sha256-nr4w5sOz5bR9Of8KOJehrPUj0r+vy04tBM23D4pmxQc=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   LC_ALL="en_US.utf8";
 
+  propagatedBuildInputs = [
+    fastjsonschema
+    ipython_genutils
+    jsonschema
+    jupyter_core
+    pep440
+    testpath
+    traitlets
+  ];
+
   checkInputs = [ pytestCheckHook glibcLocales ];
-  propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core fastjsonschema ];
 
   preCheck = ''
     mkdir tmp

From 8fe0a13463c65661f5d5e2aba1ccaebafe396bf4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 139/403] python3Packages.neo: 0.10.2 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix
index d6be449eb1b1..2c3873981e88 100644
--- a/pkgs/development/python-modules/neo/default.nix
+++ b/pkgs/development/python-modules/neo/default.nix
@@ -3,24 +3,26 @@
 , fetchPypi
 , nose
 , numpy
+, packaging
 , quantities
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "neo";
-  version = "0.10.2";
+  version = "0.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LUIYsIJtruqIDhVSJwYAKew4oAI4zrXwlxONlGfGOZs=";
+    sha256 = "sha256-zfjhMko/u9Hv1WGNzTfPxJexmXkjvXELWYRywdhGZ0o=";
   };
 
   propagatedBuildInputs = [
     numpy
+    packaging
     quantities
   ];
 

From 3fd41495a503eac662dec88b7dfd164b6d154298 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 140/403] python3Packages.networkx: 2.8.4 -> 2.8.6

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

diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix
index 3acf8cdf6385..7c026be5cd26 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/pkgs/development/python-modules/networkx/default.nix
@@ -11,12 +11,12 @@
 buildPythonPackage rec {
   pname = "networkx";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.8.4";
+  version = "2.8.6";
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-XlPwJ8DVZ88fiE27KDIk31JWROQ6/RFF1kydiKNYR2I=";
+    sha256 = "sha256-vSt3MDAIYMvS2v6OWvif9cmmXDl1s1J5nYemI4tDAaY=";
   };
 
   propagatedBuildInputs = [ decorator setuptools ];

From 3259ef3795f69b2b0d54f798394b2783e5e1183c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 141/403] python3Packages.nilearn: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index 85df64f20933..576724c9c256 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "nilearn";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-3YIbT/KzuH9eSwNOoPlfzkN1rOWG3o7Rfmpme94ZJdc=";
+    sha256 = "sha256-jajTg12SzXuKbMkkVaSJ1+f1mUz2T8cbzmU+NidzueQ=";
   };
 
   checkInputs = [ pytestCheckHook ];

From 9c161fa66255b34a85fdaf0ae7f329671fdd9bf9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 142/403] python3Packages.nipype: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 42d05d24775b..fc221085f98e 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -49,12 +49,12 @@ in
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.8.3";
+  version = "1.8.4";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Z/qa0NotxWFzweFHRm/MbJImivV8AZl68yiQ1jNvcAQ=";
+    sha256 = "sha256-yoG6iLfF7ugBL4eNC9OLINIzBj1YgF4TVngFKb77qak=";
   };
 
   postPatch = ''

From 5028050a62612c0da85afdaa6886476dd85a35b5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 143/403] python3Packages.num2words: 0.5.11 -> 0.5.12

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

diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix
index 8679da592cb6..9e8c0961680e 100644
--- a/pkgs/development/python-modules/num2words/default.nix
+++ b/pkgs/development/python-modules/num2words/default.nix
@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.5.11";
+  version = "0.5.12";
   pname = "num2words";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bGhOIiDYrbNhLSyAepdyzDJplj+81395ebaJp39gQ9Q=";
+    sha256 = "sha256-fnwLDwgEBao6HdnTKxypCzvwO6sXuOVNsF4beDAaCYg=";
   };
 
   propagatedBuildInputs = [ docopt ];

From 79849def01e5345b05ee12e5dc8c150f5ee83741 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 144/403] python3Packages.numba: 0.55.2 -> 0.56.2

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 9953ddec3690..d5404954683a 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -22,13 +22,13 @@
 let
   inherit (cudaPackages) cudatoolkit;
 in buildPythonPackage rec {
-  version = "0.55.2";
+  version = "0.56.2";
   pname = "numba";
   disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5CjZ4R2bpZKEnMyfegCQA+t9MGEgB+Nlr+dDznEYxvQ=";
+    hash = "sha256-NJLwpdCeJX/FIfU3emxrkH7sGSDRRznwskWLnSmUalo=";
   };
 
   postPatch = ''

From d414351266009fa586cb4b623a144c72d7149435 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 145/403] python3Packages.numcodecs: 0.10.0 -> 0.10.2

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

diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index 438a54127a07..3137fa7acd37 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -4,6 +4,7 @@
 , isPy27
 , setuptools-scm
 , cython
+, entrypoints
 , numpy
 , msgpack
 , pytestCheckHook
@@ -13,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "numcodecs";
-  version = "0.10.0";
+  version = "0.10.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LdQlZOd3KpOFkjsCo2Pjzt8FPOkwlKkGRIXn9ppvHJI=";
+    sha256 = "sha256-IoOMaz/Zhr2cckA5uIhwBX95DiKyDm4cu6oN4ULdWcQ=";
   };
 
   nativeBuildInputs = [
@@ -28,6 +29,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    entrypoints
     numpy
     msgpack
   ];

From 422ce1815d4fb46c13bd53e8f71b3c8c4604214d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:13 +0200
Subject: [PATCH 146/403] python3Packages.oauthenticator: 15.0.1 -> 15.1.0

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

diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index 08a34aed2155..4e1b032de0ec 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "oauthenticator";
-  version = "15.0.1";
+  version = "15.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LjC/Ly3wQL55gjCyoWZikvK6ByiS1CEsZXK0/lmzmGA=";
+    hash = "sha256-0dmHPJtm4a+XMpGWi5Vz0lN4vYxkfzDXO42PsnsaC4U=";
   };
 
   propagatedBuildInputs = [

From 37bead230547d22d0d3a07bde1e5f2dbfdfed8a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 147/403] python3Packages.openstackdocstheme: 2.4.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix
index 0a04006704c1..b2d1a028b955 100644
--- a/pkgs/development/python-modules/openstackdocstheme/default.nix
+++ b/pkgs/development/python-modules/openstackdocstheme/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "openstackdocstheme";
-  version = "2.4.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-dFrZTObRDKB8aw1/i6febpttymbY3cPzA3ckNuhVt4c=";
+    sha256 = "sha256-csbU+am2OXp4xJ60P4Cp2i7TCz+PnRg3BCcc9+PyPM8=";
   };
 
   postPatch = ''

From f4cc27e7b639016c360a0cb18bd7a553a7421164 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 148/403] python3Packages.oslo-concurrency: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix
index 3706a4577bf5..f809bfc5f2ac 100644
--- a/pkgs/development/python-modules/oslo-concurrency/default.nix
+++ b/pkgs/development/python-modules/oslo-concurrency/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-concurrency";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchPypi {
     pname = "oslo.concurrency";
     inherit version;
-    sha256 = "sha256-n0aUbp+KcqBvFP49xBiaTT3TmGKDFSU5OjEZvbvniX4=";
+    sha256 = "sha256-DfvzYJX0Y3/7tl5cJB9MJYUavTtyjd2tnwc5YwKnJUQ=";
   };
 
   postPatch = ''

From 3a2fd43ad016f05ce91531e8f87b55cd9d3cb1cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 149/403] python3Packages.oslo-utils: 6.0.0 -> 6.0.1

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

diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix
index 45e400856ba7..fe207cbd5c46 100644
--- a/pkgs/development/python-modules/oslo-utils/default.nix
+++ b/pkgs/development/python-modules/oslo-utils/default.nix
@@ -23,12 +23,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-utils";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchPypi {
     pname = "oslo.utils";
     inherit version;
-    sha256 = "sha256-CpLiTESWht7CgAlXZr4+uOV/EyXNpMbyEpVBVk5ei6g=";
+    sha256 = "sha256-mwRU+ZQV0MqsXIYFNxbXRtGY7Oxm5nLY5eY4a2+6orY=";
   };
 
   postPatch = ''

From 7a498f272c1a69cdb03b7ff673ef78fa1f5f01be Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 150/403] python3Packages.OWSLib: 0.26.0 -> 0.27.2

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

diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 10e7580af616..c2783642b514 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -1,11 +1,11 @@
 { lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } :
 buildPythonPackage rec {
   pname = "OWSLib";
-  version = "0.26.0";
+  version = "0.27.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-jEywYzjrZAXCrs7QttCFaCqmHw8uUo8ceI1o3FDflBs=";
+    sha256 = "sha256-4QKqJETf4MhDmrHhd2zA+kfOoowJuKKCEsiTxgF8F5s=";
   };
 
   # as now upstream https://github.com/geopython/OWSLib/pull/824

From 4c2aaa2f08f4527008b5648304bde2f6a961c032 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 151/403] python3Packages.parsimonious: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix
index d517e9433e41..f22b1b605e34 100644
--- a/pkgs/development/python-modules/parsimonious/default.nix
+++ b/pkgs/development/python-modules/parsimonious/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "parsimonious";
-  version = "0.9.0";
+  version = "0.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME=";
+    hash = "sha256-goFgDaGA7IrjVCekq097gr/sHj0eUvgMtg6oK5USUBw=";
   };
 
   propagatedBuildInputs = [

From 25d75f0c97d72cc16ca651d20b6c5b4abb09c4d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 152/403] python3Packages.partd: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix
index 9b5a94fa9107..7f6fa7b510f7 100644
--- a/pkgs/development/python-modules/partd/default.nix
+++ b/pkgs/development/python-modules/partd/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "partd";
-  version = "1.2.0";
+  version = "1.3.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb";
+    sha256 = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU=";
   };
 
   checkInputs = [ pytest ];

From dfdb6f4e7b280bf2f9c8e9cf144ba142b75d9da5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 153/403] python3Packages.pathspec: 0.9.0 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index 6a0281b756ec..d3485003dc97 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname   = "pathspec";
-  version = "0.9.0";
+  version = "0.10.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1";
+    sha256 = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0=";
   };
 
   meta = {

From 15aaccd1b3c8ad5d6e073c3952f39893420969b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:14 +0200
Subject: [PATCH 154/403] python3Packages.pbr: 5.9.0 -> 5.10.0

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

diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 7fb0574f75a0..0fe9ac5a7367 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "5.9.0";
+  version = "5.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6Nyi9LQ1YO3vWIE5afUqVs7wIxRsu4kxYm24DmwcQwg=";
+    sha256 = "sha256-z8xP+OaYJW/BfqP/eWR4sFCFJYWqW6557NBbKrezm5o=";
   };
 
   # importlib-metadata could be added here if it wouldn't cause an infinite recursion

From 9792a8bad4a71c6329f899f4ffbeaaf5ac3f6ede Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 155/403] python3Packages.pep517: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix
index ad58cdb72d4d..9848e2780173 100644
--- a/pkgs/development/python-modules/pep517/default.nix
+++ b/pkgs/development/python-modules/pep517/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "pep517";
-  version = "0.12.0";
+  version = "0.13.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0";
+    sha256 = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k=";
   };
 
   nativeBuildInputs = [

From e1df56d2ced5e77eef6967d011893b730c16f406 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 156/403] python3Packages.phonenumbers: 8.12.51 -> 8.12.55

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index f0538c25d376..c1827559fbf5 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.12.51";
+  version = "8.12.55";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nUqUYBJ//SiK4HHdH3lC4jKdpbXF1X2Kq+cQNCfKfL8=";
+    hash = "sha256-G+PHNT6TJd3qqQmrF5NkI8YpWNVwDWjl2lvpUDxG0Ic=";
   };
 
   checkInputs = [

From 2dc2124dcf55f4100cd353edc4a6d9b83d20f51f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 157/403] python3Packages.piep: 0.9.2 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix
index c99f408db62f..8db4f09a9249 100644
--- a/pkgs/development/python-modules/piep/default.nix
+++ b/pkgs/development/python-modules/piep/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.9.2";
+  version = "0.10.0";
   pname = "piep";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b5anpsq16xkiisws95jif5s5mplkl1kdnhy0w0i6m0zcy50jnxq";
+    sha256 = "sha256-aM7KQJZr1P0Hs2ReyRj2ItGUo+fRJ+TU3lLAU2Mu8KA=";
   };
 
   propagatedBuildInputs = [ pygments ];

From 0b8c1f48094459fc446fbc09810637cfaad12546 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 158/403] python3Packages.plotly: 5.9.0 -> 5.10.0

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

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 79c7784e23bb..f150945a37cb 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "5.9.0";
+  version = "5.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-sFNucrvAs88WmsH9AHWdd6rnuxKuN4zcdcXcNi9d5XY=";
+    sha256 = "sha256-TTbZhZt6FTsnNWLe7tjCklh6Ry6x/VfNQVjsidne+ts=";
   };
 
   propagatedBuildInputs = [

From 5512fe12f7a3a536fae9a7105934a9018b347dcf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 159/403] python3Packages.plugincode: 30.0.0 -> 31.0.0

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

diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix
index 2e54d5604e19..e3265ec5b34d 100644
--- a/pkgs/development/python-modules/plugincode/default.nix
+++ b/pkgs/development/python-modules/plugincode/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "plugincode";
-  version = "30.0.0";
+  version = "31.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos=";
+    hash = "sha256-0BfdHQn/Kgct4ZT34KhMgMC3nS0unE3iL7DiWDhXDSk=";
   };
 
   dontConfigure = true;

From c40e78aa785476dd79a389ed3ac50c8d18a2c0c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 160/403] python3Packages.prettytable: 3.3.0 -> 3.4.1

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

diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index 21e7a455da88..922f85990db7 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EY61T9J5QEm4EIk2U7IJUjSd9tO8F2Tn+s2KGAZPqbA=";
+    sha256 = "sha256-fX3YTQsgby2qxEcacvKZ1pB/NFFgZP6yg44zOk4lZ70=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From bb049833aef30ed8fe3b6e66191c3afda5a8a76f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 161/403] python3Packages.prompt-toolkit: 3.0.30 -> 3.0.31

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

diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix
index f87558e5194c..038575794bd3 100644
--- a/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt-toolkit/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "prompt-toolkit";
-  version = "3.0.30";
+  version = "3.0.31";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "prompt_toolkit";
     inherit version;
-    sha256 = "sha256-hZsoPFC95F9fl4Kfd6RnTRwfzYhTk2Txsoo3gFz9icA=";
+    sha256 = "sha256-mtqVLJ0Xh/Uv9tXzSE0LTfiVJ4fAh+32offCyx6ogUg=";
   };
 
   propagatedBuildInputs = [

From c8381b01494cbbd33c6f6eb98d822987c01ea29f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 162/403] python3Packages.proto-plus: 1.22.0 -> 1.22.1

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

diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix
index 266294325c17..3d3646d5c839 100644
--- a/pkgs/development/python-modules/proto-plus/default.nix
+++ b/pkgs/development/python-modules/proto-plus/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "proto-plus";
-  version = "1.22.0";
+  version = "1.22.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wuZpP99oxAWmQoImkVqGJdIdBRN5NZiuMoehIQR42Ow=";
+    sha256 = "sha256-bH39Ei3++AGf9lR0a+T1sdnIC7p4f+lhG1CN2Ivjovo=";
   };
 
   propagatedBuildInputs = [ protobuf ];

From 3370ff051c7af2a99b8e334c23a8ccfb328161ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:15 +0200
Subject: [PATCH 163/403] python3Packages.psutil: 5.9.1 -> 5.9.2

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

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 197da3c76ce6..3815a64eec60 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.9.1";
+  version = "5.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-V/GBm12elc37DIgailt9VC7Qt8Ui1XVwaoC+3ISMiVQ=";
+    sha256 = "sha256-/rhhoQtsO7AHAQY7N+Svx1T4IX8PCcQigFhr1qxxK1w=";
   };
 
   # We have many test failures on various parts of the package:

From 683050486861fef92a4033b764f3102c82b2cda4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 164/403] python3Packages.py4j: 0.10.9.5 -> 0.10.9.7

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

diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix
index dac1ecb9ec1f..3f7a7e188232 100644
--- a/pkgs/development/python-modules/py4j/default.nix
+++ b/pkgs/development/python-modules/py4j/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "py4j";
 
-  version = "0.10.9.5";
+  version = "0.10.9.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-J2pKPFohVN8YYO8zA6knRg4C6XsEfcCkfBw/uMzjTbY=";
+    sha256 = "sha256-C25TFbs62lz2KsZR0Qe7LrwC3vPe6dlUjjuqxkTqjbs=";
   };
 
   # No tests in archive

From 1de81696086943f1a370da6e4cc4839e86d9b844 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 165/403] python3Packages.pybids: 0.15.1 -> 0.15.3

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

diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index bddb9fb52200..18717f40f4fe 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.15.1";
+  version = "0.15.3";
   pname = "pybids";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-AlNQegTb/qQ+sfdaH3GqsEviEHa/6WwASIgAC4AuOPI=";
+    sha256 = "sha256-TZnJebxLwgnP9woC0downJv4xrAzjioLZuvqd8fzxGE=";
   };
 
   propagatedBuildInputs = [

From 6ce3d81ba3530a09ca18a1a55988b8157003b4a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 166/403] python3Packages.pycares: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
index c8e8fdb7b3d9..74dc59aefbe8 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pycares";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-c1tPdf0PWVxOkYTaGM2Hc39GvIGmTqQfTtzitraNRtI=";
+    sha256 = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U=";
   };
 
   buildInputs = [

From ab1c0dc6048f653f291a5a5cd3edd7d5a67ae7d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 167/403] python3Packages.pydispatcher: 2.0.5 -> 2.0.6

---
 .../python-modules/pydispatcher/default.nix     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix
index d949b16d1057..902f39e6b970 100644
--- a/pkgs/development/python-modules/pydispatcher/default.nix
+++ b/pkgs/development/python-modules/pydispatcher/default.nix
@@ -1,23 +1,22 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pytest
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  version = "2.0.5";
+  version = "2.0.6";
   pname = "pydispatcher";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m";
+    pname = "PyDispatcher";
+    inherit version;
+    hash = "sha256-PX5PQ8cAAKHcox+SaU6Z0BAZNPpuq11UVadYhY2G35U=";
   };
 
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    py.test
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     homepage = "http://pydispatcher.sourceforge.net/";

From b226724c859759656b0befb0990e84cc3bb8df1a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 168/403] python3Packages.pyfakefs: 4.6.2 -> 4.6.3

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

diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index 9f9dbe7fd7bf..bac9202a2b22 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.6.2";
+  version = "4.6.3";
   pname = "pyfakefs";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-jdnIAgvNCB8llleoadXq+cynuzZzx/A7+uiyi751mbY=";
+    sha256 = "sha256-bfEqfPZXY3obA2vCAFlyfGQvkpkOkP7i+wA9qjzabKE=";
   };
 
   postPatch = ''

From 7466b96d590797eaeaaa88fe4e397a4d372231e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 169/403] python3Packages.pygit2: 1.9.2 -> 1.10.1

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

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 9e293e65a09b..565cd6d67ec9 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -4,7 +4,6 @@
 , cacert
 , cached-property
 , cffi
-, fetchpatch
 , fetchPypi
 , isPyPy
 , libgit2
@@ -15,25 +14,16 @@
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.9.2";
+  version = "1.10.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk=";
+    hash = "sha256-NUZRvwYsAtHwgEHW+/GptL96k6/OZZeb3Ai9xlZTqi4=";
   };
 
-  patches = [
-    # libgit 2 fix
-    (fetchpatch {
-      url = "https://github.com/libgit2/pygit2/commit/14b1df84060ea4ab085202382e80672ec1a104e3.patch";
-      includes = [ "src/types.h" ];
-      sha256 = "sha256-2krkyAT30l/olSEl2ugWCsylvGuT7VvkuSFVshIXktA=";
-    })
-  ];
-
   preConfigure = lib.optionalString stdenv.isDarwin ''
     export DYLD_LIBRARY_PATH="${libgit2}/lib"
   '';

From 10508d54516dd983173f5bfa2b2dd2b3ee7f7443 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 170/403] python3Packages.pygraphviz: 1.9 -> 1.10

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

diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index 3780122f19f7..15f57612ac66 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "pygraphviz";
-  version = "1.9";
+  version = "1.10";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw=";
+    hash = "sha256-RX4JOoiBKJAyUaJmqMwWtLqT8/YzSz6/7ZLHRxp02Gc=";
     extension = "zip";
   };
 

From e2870d550b34124f419a27efd913d387d1b9af40 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 171/403] python3Packages.PyHamcrest: 2.0.3 -> 2.0.4

---
 .../python-modules/pyhamcrest/default.nix     | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index a4c04ce79ee6..ffe11cc140b3 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -1,20 +1,39 @@
-{ lib, buildPythonPackage, fetchPypi
-, mock, pytest
-, six
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, hatchling
+, hatch-vcs
+, numpy
+, pythonOlder
+, pytest-xdist
+, pytestCheckHook
 }:
-buildPythonPackage rec {
-  pname = "PyHamcrest";
-  version = "2.0.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "dfb19cf6d71743e086fbb761ed7faea5aacbc8ec10c17a08b93ecde39192a3db";
+buildPythonPackage rec {
+  pname = "pyhamcrest";
+  version = "2.0.4";
+  format = "pyproject";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "hamcrest";
+    repo = "PyHamcrest";
+    rev = "refs/tags/V${version}";
+    hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk=";
   };
 
-  checkInputs = [ mock pytest ];
-  propagatedBuildInputs = [ six ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
-  doCheck = false;  # pypi tarball does not include tests
+  nativeBuildInputs = [
+    hatchling
+    hatch-vcs
+  ];
+
+  checkInputs = [
+    numpy
+    pytest-xdist
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/hamcrest/PyHamcrest";

From 6d6e7b49b12f9f2d56d02c3a78bdb2c2e080e24c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 172/403] python3Packages.pyjnius: 1.4.1 -> 1.4.2

---
 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 b53dd83205f3..84f7a337a661 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.1";
+  version = "1.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce";
+    sha256 = "sha256-/AY3zaSuEo7EqWrDJ9NS6H6oZnZLAdliZyhwvlOana4=";
   };
   propagatedBuildInputs = [
     six

From eeba93090ada85c9942923a60d507187cbcec145 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:16 +0200
Subject: [PATCH 173/403] python3Packages.pymongo: 4.1.1 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 9ebe37f4b8da..285a729eb894 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "4.1.1";
+  version = "4.2.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-17jyXJsAQ8uvd7i4lYFOM+ejyAeglzd8B+G9SZRgMNU=";
+    sha256 = "sha256-cvM49qq9N9NDvZ0f3T3pIRBNOVdmvMXNxAOeTC3Zd2Y=";
   };
 
   # Tests call a running mongodb instance

From 9edf5e8b4e883667fdc9f7fb0a8eb07510e2f6f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 174/403] python3Packages.pynisher: 0.6.4 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix
index 942192c57dc5..8dc5d1eaa9f6 100644
--- a/pkgs/development/python-modules/pynisher/default.nix
+++ b/pkgs/development/python-modules/pynisher/default.nix
@@ -1,26 +1,26 @@
 { lib
 , buildPythonPackage
-, docutils
 , fetchPypi
 , psutil
 , pythonOlder
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "pynisher";
-  version = "0.6.4";
+  version = "1.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ER2RqtRxN1wFCakSQV/5AFPvkJEA+s9BJRE4OvEHwSQ=";
+    hash = "sha256-5FJQCN+yO1gh7HK47MRR/SAr8Qzix3bfrjyzsakBQXA=";
   };
 
   propagatedBuildInputs = [
     psutil
-    docutils
+    typing-extensions
   ];
 
   # No tests in the Pypi archive

From 7ac45016ece4452aff6b70e8e87d841df87c4e5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 175/403] python3Packages.pyotp: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix
index 16916666a0d5..8b64a713d9f4 100644
--- a/pkgs/development/python-modules/pyotp/default.nix
+++ b/pkgs/development/python-modules/pyotp/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyotp";
-  version = "2.6.0";
+  version = "2.7.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d28ddfd40e0c1b6a6b9da961c7d47a10261fb58f378cb00f05ce88b26df9c432";
+    sha256 = "sha256-zpifq6Dfd9wDK0XlHGzKQrzyCJbI09HnzXWaU9x9bLU=";
   };
 
   pythonImportsCheck = [ "pyotp" ];

From 7f859cf9d7555a8fc6cbe7e10a8d2a10061ccfb4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 176/403] python3Packages.pypugjs: 5.9.11 -> 5.9.12

---
 .../python-modules/pypugjs/default.nix        | 46 ++++++++++++++-----
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index cfc7fbf2ded3..b983bedc4098 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -1,21 +1,45 @@
-{ lib, buildPythonPackage, fetchPypi, six, chardet, nose
-, django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
+{ lib
+, buildPythonPackage
+, charset-normalizer
+, django
+, fetchFromGitHub
+, jinja2
+, Mako
+, nose
+, pyramid
+, pyramid_mako
+, pytestCheckHook
+, six
+, tornado
+}:
 
 buildPythonPackage rec {
   pname = "pypugjs";
-  version = "5.9.11";
+  version = "5.9.12";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-kStaT1S8cPJF+iDFk/jLGKi3JVOMmtf7PzeYDKCdD0E=";
+  src = fetchFromGitHub {
+    owner = "kakulukia";
+    repo = "pypugjs";
+    rev = "v${version}";
+    sha256 = "sha256-6tIhKCa8wg01gNFygCS6GdUHfbWBu7wOZeMkCExRR34=";
   };
 
-  propagatedBuildInputs = [ six chardet ];
-  checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ];
+  propagatedBuildInputs = [ six charset-normalizer ];
 
-  checkPhase = ''
-    nosetests pypugjs
-  '';
+  checkInputs = [
+    django
+    jinja2
+    Mako
+    nose
+    tornado
+    pyramid
+    pyramid_mako
+    pytestCheckHook
+  ];
+
+  pytestCheckFlags = [
+    "pypugjs/testsuite"
+  ];
 
   meta = with lib; {
     description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates";

From 8c53219d0882aa164483d230b2c656e38f7e1d9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 177/403] python3Packages.pypykatz: 0.5.7 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix
index 72fdb6d3c5b4..5a3137063afa 100644
--- a/pkgs/development/python-modules/pypykatz/default.nix
+++ b/pkgs/development/python-modules/pypykatz/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pypykatz";
-  version = "0.5.7";
+  version = "0.6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-G+dbP+xtRH8dIU70HbimRJV+e/yYlo2ds5OAIzUcydY=";
+    hash = "sha256-GbIWxYCVmNXUwn6W4a/cl1XOTbWkpBemKcmjOvnXER4=";
   };
 
   propagatedBuildInputs = [

From 9dfae070d390f26d7b87d927e0ad28383f97ccde Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 178/403] python3Packages.pyro-ppl: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix
index b14119c32807..b0cc9c7f91cd 100644
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "pyro-ppl";
-  version = "1.8.1";
+  version = "1.8.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit version pname;
-    hash = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY=";
+    hash = "sha256-4Afl0ROCpY78+4+61xxy6vEGbIZsaNxURXDEGMGCiks=";
   };
 
   propagatedBuildInputs = [

From 26e6aa8b9ec267f9e3b7acdfc8551776e401be4d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 179/403] python3Packages.pyroute2: 0.7.2 -> 0.7.3

---
 pkgs/development/python-modules/pyroute2/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index f5c4d936aebd..2d9efdf39e2d 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -4,20 +4,25 @@
 , importlib-metadata
 , mitogen
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.7.2";
+  version = "0.7.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hahWY7BIO8c6DmCgG+feZdNikbYWycFCl0E6P1uEQ/M=";
+    hash = "sha256-cEEEDbHC0Yf7zNFRSFsSRMQddYvoIXhYR5RjcOtrtwY=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     mitogen
   ] ++ lib.optionals (pythonOlder "3.8") [
@@ -38,7 +43,6 @@ buildPythonPackage rec {
     "pr2modules.nftables"
     "pr2modules.nslink"
     "pr2modules.protocols"
-    "pr2modules.proxy"
   ];
 
   meta = with lib; {

From 2d4a1be4824239812afdf189b7eca184ac7a39c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 180/403] python3Packages.PySDL2: 0.9.11 -> 0.9.14

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

diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index 1f1d97f19fa5..f5d76eda9b94 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "PySDL2";
-  version = "0.9.11";
+  version = "0.9.14";
   # The tests use OpenGL using find_library, which would have to be
   # patched; also they seem to actually open X windows and test stuff
   # like "screensaver disabling", which would have to be cleverly
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93e51057d39fd583b80001d42b21d5a3f71e30d489d85924d944b2c7350e2da6";
+    sha256 = "sha256-JAkfjZ5DdkZZHH921bru49OqbNiuSSpRxwJuUzifGHo=";
   };
 
   # Deliberately not in propagated build inputs; users can decide

From d8ed07f85e4d21673a630cca052170d646e3193d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:17 +0200
Subject: [PATCH 181/403] python3Packages.pysqlcipher3: 1.0.4 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix
index 9c98664af1ca..acb71deab0b1 100644
--- a/pkgs/development/python-modules/pysqlcipher3/default.nix
+++ b/pkgs/development/python-modules/pysqlcipher3/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pysqlcipher3";
-  version = "1.0.4";
+  version = "1.1.0";
 
   disabled = pythonAtLeast "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "75d6b9d023d7ab76c841f97fd9d108d87516e281268e61518411d08cb7062663";
+    sha256 = "sha256-Lo75+2y2jZJrQZj9xrJvVRGWmOo8fI5iXzEURn00Y3E=";
   };
 
   buildInputs = [ sqlcipher ];

From 23efe5abe719c455daa9704dd4ed789fe960e4d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 182/403] python3Packages.pyTelegramBotAPI: 4.6.0 -> 4.7.0

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

diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 0474ed4e67cf..5fb31f9fdde2 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyTelegramBotAPI";
-  version = "4.6.0";
+  version = "4.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sa6kw8hnWGt++qgNVNs7cQ9LJK64CVv871aP8n08pRA=";
+    hash = "sha256-sVu518B+PDSpW6MhYtNWkPpwuT471VfGuDDtpL7Mo/U=";
   };
 
   propagatedBuildInputs = [

From 091852837e8c100e1c97e7eeba4a816e1d6176c7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 183/403] python3Packages.pytest-check: 1.0.5 -> 1.0.9

---
 .../python-modules/pytest-check/default.nix      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
index c690e01778b6..a9973da9c142 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -7,17 +7,21 @@
 
 buildPythonPackage rec {
   pname = "pytest-check";
-  version = "1.0.5";
+  version = "1.0.9";
   format = "flit";
 
   src = fetchPypi {
-    pname = "pytest_check";
-    inherit version;
-    sha256 = "sha256-ucjbax3uPB5mFivQebgcCDKWy3Ex6YQVGcKKQIGKSHU=";
+    inherit pname version;
+    hash = "sha256-zVMQTzpPw2RPcCi1XiOHZvbWWhKiB9MbzUyLoA2yP9k=";
   };
 
-  buildInputs = [ pytest ];
-  checkInputs = [ pytestCheckHook ];
+  buildInputs = [
+    pytest
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "pytest plugin allowing multiple failures per test";

From c5b06fd1f46d1ce663b25c3c0b297ce705704bad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 184/403] python3Packages.pytest-localserver: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index b64f3365dd6f..cde2bf81a6e3 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-localserver";
-  version = "0.6.0";
+  version = "0.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-3cR5q6lqfaDnocx9OjA+UFgtbVBYA+j2e4JyGPn+D2U=";
+    sha256 = "sha256-8ZtJDHyh7QW/5LxrSQgRgFph5ycfBCTTwPpNQ4k6Xc0=";
   };
 
   propagatedBuildInputs = [

From 0be873c4dd4a4d8326f54590f8e5642377dd151f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 185/403] python3Packages.pytest-xprocess: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix
index 1b45c06969d3..c6262b7f1e0e 100644
--- a/pkgs/development/python-modules/pytest-xprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-xprocess/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-xprocess";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-GCDFSdZx7bLInCX/HjjHDs2g/v4oDxPEWiyMbWbXtQ4=";
+    sha256 = "sha256-AhZ1IsTcdZ+RxKsZhUY5zR6fbgq/ynXhGWgrVB0b1j8=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 000bf335745ae7af84e17ff6be401867e9180a5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 186/403] python3Packages.python-dotenv: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix
index a805c3e6c623..85e5034d6ebc 100644
--- a/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/pkgs/development/python-modules/python-dotenv/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "python-dotenv";
-  version = "0.20.0";
+  version = "0.21.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-t+OwSllpPELDb5qxzCrMRvpd+MeOF4/DOo1M0FyNSY8=";
+    sha256 = "sha256-t30IJ0Y549NBRd+mxwCOZt8PBLe+enX9DVKSwZHXkEU=";
   };
 
   propagatedBuildInputs = [ click ];

From 0ae3aa1a157da19d425b5f41969a1da532b276ec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 187/403] python3Packages.python-telegram-bot: 13.13 -> 13.14

---
 .../python-modules/python-telegram-bot/default.nix       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 8b3a6ba091cc..677322fc50d1 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "python-telegram-bot";
-  version = "13.13";
+  version = "13.14";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-QpbYGji35e8fl5VlESjlj7NUZ4uNxNuTyhZsloKMV7I=";
+    hash = "sha256-6TkdQ+sRI94md6nSTqh4qdUyfWWyQZr7plP0dtJq7MM=";
   };
 
   propagatedBuildInputs = [
@@ -39,7 +39,8 @@ buildPythonPackage rec {
 
     substituteInPlace requirements.txt \
       --replace "APScheduler==3.6.3" "APScheduler" \
-      --replace "cachetools==4.2.2" "cachetools"
+      --replace "cachetools==4.2.2" "cachetools" \
+      --replace "tornado==6.1" "tornado"
   '';
 
   setupPyGlobalFlags = "--with-upstream-urllib3";

From 7e971dd676eb2d38fb43a4beb65c144038f7bec6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 188/403] python3Packages.pytz: 2022.1 -> 2022.2.1

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

diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix
index 58ac098c17cc..718ee964588e 100644
--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/pkgs/development/python-modules/pytz/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytz";
-  version = "2022.1";
+  version = "2022.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HnYOL+aoFjvAs9mhnE+ENCr6Cir/6/qoSwG5eKAuyqc=";
+    sha256 = "sha256-zqIhQXIE8tGiqgPdrj6GeSGXHQ128U2Hq7RBRBW73PU=";
   };
 
   checkInputs = [ unittestCheckHook ];

From e9e0f1a2ce3e412d38bd44b1fb53584f3e2a35fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 189/403] python3Packages.pyudev: 0.23.2 -> 0.24.0

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

diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix
index 24784afc842d..aa54e5169697 100644
--- a/pkgs/development/python-modules/pyudev/default.nix
+++ b/pkgs/development/python-modules/pyudev/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pyudev";
-  version = "0.23.2";
+  version = "0.24.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Mq41hbMgpRvCg+CgQAD9iiVZnttEVB4vUDT2r+5dFcw=";
+    sha256 = "sha256-sqOv4cmep1H4KWZSVX6sVZh02iobHsBiUXhwbsWjRfM=";
   };
 
   postPatch = ''

From 74b0bda46d14f035f136bb0ba5df66e97b5dfb60 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:18 +0200
Subject: [PATCH 190/403] python3Packages.pyvex: 9.2.15 -> 9.2.18

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index e1ce42205057..08989d65147e 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.15";
+  version = "9.2.18";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Yik1RTz4SQBFJxgPzp7LnPHV4EMbxGEhD2fBVcKJC7c=";
+    hash = "sha256-bwQveWnXsYmoJkyVZkzrXEbg2MdU6lj7Z56iu9t7XxE=";
   };
 
   nativeBuildInputs = [

From 998108e52517e39d235d938da96811962a018cd5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 191/403] python3Packages.pyzmq: 23.2.0 -> 23.2.1

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

diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index ea61a50560da..480247d01bb0 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyzmq";
-  version = "23.2.0";
+  version = "23.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pR8SqHGarZ3PtV1FYCLxa5CryN3n08qTzjEgtA4/oWk=";
+    hash = "sha256-KzgaqGfs59CoLzCgx/PUOHt88uBpfjPvqlvtbFeEq80=";
   };
 
   buildInputs = [

From f988d4ba186079768f280e7a2b573f2cf315c1e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 192/403] python3Packages.qtconsole: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index a1483518f92b..aae38c944958 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "5.3.1";
+  version = "5.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-tzcj+sQ5OLaE3LI3qIUQ3HchxDpybOqK3heaKSfAovM=";
+    sha256 = "sha256-jq3wEug6sBgpWAPCR8arfqzT1aseHYig83/c/auSlaM=";
   };
 
   checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];

From da8654ae543822b96bad882e9f3397e1eab54c20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 193/403] python3Packages.QtPy: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index 31c05ce48f4e..97d2111677f3 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "QtPy";
-  version = "2.1.0";
+  version = "2.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-yozUIXF1GGNEKZ7kwPfnrc82LHCFK6NbJVpTQHcCXAY=";
+    sha256 = "sha256-2F8bEh8kpBrSbFXERuZqvbfFKIOfjE8R8VbsRUGQORQ=";
   };
 
   propagatedBuildInputs = [

From c2335e7e45d455f1990d2e0896ce6158f757d491 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 194/403] python3Packages.readme-renderer: 37.0 -> 37.1

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

diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index b3ffc2aa34a4..43ac95db9277 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "readme-renderer";
-  version = "37.0";
+  version = "37.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "readme_renderer";
     inherit version;
-    sha256 = "sha256-B7fqI04D5Y93zCIuIG5qu49MBDW+zOUQR5TuWR+TAcU=";
+    sha256 = "sha256-lnaMBpcp9pF29RRHflfy+M1UP7ss17rTcpdiSfpQmgw=";
   };
 
   propagatedBuildInputs = [

From e6e6559b1d784aac03527de349953bce7944ad17 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 195/403] python3Packages.regex: 2022.3.2 -> 2022.9.13

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

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 512a7162f0e3..1bd2d8b5d871 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2022.3.2";
+  version = "2022.9.13";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs=";
+    hash = "sha256-8HNztuVqbzoN89dbZRonjKe9NXp5YHiiapWOoc4FiP0=";
   };
 
   checkPhase = ''

From d45461d56c634dd88e3f90995bebf4a4affee788 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 196/403] python3Packages.reproject: 0.8 -> 0.9

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

diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index 02a6b149eb0b..1f75683a5b1d 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "reproject";
-  version = "0.8";
+  version = "0.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Z54sY3R6GViTvMLHrJclrAZ1dH4/9bzIrgqDd9nFbJY=";
+    hash = "sha256-zhjI4MjlCV9zR0nNcss+C36CZXY/imGsalfKMGacfi0=";
   };
 
   nativeBuildInputs = [

From 2ce96f4e54ec017305a80b14456e00a1594cca71 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 197/403] python3Packages.requests-mock: 1.9.3 -> 1.10.0

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

diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix
index 85d7c47baae3..85b9d9fe35fb 100644
--- a/pkgs/development/python-modules/requests-mock/default.nix
+++ b/pkgs/development/python-modules/requests-mock/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "requests-mock";
-  version = "1.9.3";
+  version = "1.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba";
+    sha256 = "sha256-WcnDJBmp+xroPsJC2Y6InEW9fXpl1IN1zCQ+wIRBZYs=";
   };
 
   patchPhase = ''

From 61db326624ddbc8c369deb3bd004f42d2fef1d9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 198/403] python3Packages.rlax: 0.1.2 -> 0.1.4

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

diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix
index adff2f0ac5d3..c23f7d9cce3a 100644
--- a/pkgs/development/python-modules/rlax/default.nix
+++ b/pkgs/development/python-modules/rlax/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "rlax";
-  version = "0.1.2";
+  version = "0.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-hAG0idz5VkGVvxaJWoxlVZ8myeHF6ndDxB0SyJm7qV8=";
+    sha256 = "sha256-a4qyJ5W9fs4TSTQQZS/NptlcSr2Nhw0pvnk+sGEsbyY=";
   };
 
   buildInputs = [

From d59ac78dbd039c754182d105c80e979e71cd3911 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:19 +0200
Subject: [PATCH 199/403] python3Packages.rsa: 4.8 -> 4.9

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

diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix
index ccfd237862d7..0a70f8d8b088 100644
--- a/pkgs/development/python-modules/rsa/default.nix
+++ b/pkgs/development/python-modules/rsa/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "rsa";
-  version = "4.8";
+  version = "4.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17";
+    sha256 = "sha256-44RkpJxshdfxNRsBJmYUh6fgoUpQ8WdexQ6zTU8g7yE=";
   };
 
   checkInputs = [ unittest2 mock ];

From 73bc196072d39a797e8bb1d9c502672da8b6dafd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 200/403] python3Packages.s3fs: 2022.5.0 -> 2022.8.2

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

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index bb4d5828284f..343d637db0ab 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "2022.5.0";
+  version = "2022.8.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tAo8v6+Ay6uvDjMjMRF8ysaSkO/aw0cYT7OrYAP3BGU=";
+    hash = "sha256-PKBwGomp4SWijekIKdGflvQd2x2LQ3kHbCntgsSvhs0=";
   };
 
   buildInputs = [

From 8d2da476d03aa92155fc6f3b0a6ac9ea268ca8c9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 201/403] python3Packages.sagemaker: 2.103.0 -> 2.109.0

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

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 77d4cc5aa280..b35eb7118d57 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.103.0";
+  version = "2.109.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0iXIUWvoL6+kT+KaJq7yzdEzYA0orKBbQkGAVUYcSKk=";
+    hash = "sha256-hs71bIoByh5S1ncsku+y4X2i0yU65FknJE05lEmnru4=";
   };
 
   propagatedBuildInputs = [

From 0bea38db498b1b02c43ebf41779b1291f040885c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 202/403] python3Packages.scancode-toolkit: 31.0.0b4 -> 31.1.1

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

diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix
index 40c52962e51d..40e391347702 100644
--- a/pkgs/development/python-modules/scancode-toolkit/default.nix
+++ b/pkgs/development/python-modules/scancode-toolkit/default.nix
@@ -60,13 +60,13 @@
 
 buildPythonPackage rec {
   pname = "scancode-toolkit";
-  version = "31.0.0b4";
+  version = "31.1.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A=";
+    hash = "sha256-/QLW+rxkDbrv/78xiXOuSNaQvY+0oYZQV0/m60CEZLk=";
   };
 
   dontConfigure = true;

From bbb37e5e8cf55f463fe507088f9ebefbf7a20c0a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 203/403] python3Packages.schema-salad: 8.3.20220626185350 ->
 8.3.20220913105718

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

diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index e35c1bb69109..d986c4ed69b5 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "schema-salad";
-  version = "8.3.20220626185350";
+  version = "8.3.20220913105718";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-g8h3dAdN+tbdLRO3ctmsW+ZLiyhU0zPd1XR+XvEBpwo=";
+    hash = "sha256-18/xLIq1+yM8iQBIeXvRIO4A5GqZS/3qOKXmi439+sQ=";
   };
 
   propagatedBuildInputs = [

From 56ae32a3d0539129a0bb8403587f9a44150a7cbe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 204/403] python3Packages.scikit-learn: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index 6a97bcd46846..3512f1ddd06f 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "1.1.1";
+  version = "1.1.2";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Pne3Ho5kT4bItb5/HChe9ZfeTDhJYTie4+nKNsRFslY=";
+    sha256 = "sha256-fCLRMFsW8I1XdRpOo2Bx4iFe+0wJy3kYP6pOjoKj2/g=";
   };
 
   buildInputs = [

From 81e4fdbdfa4440a8d38f8396df27357781fc4961 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 205/403] python3Packages.scikits.odes: 2.6.4 -> 2.6.5

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

diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
index 21baa7bfa37e..e419cb8b63e5 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "scikits.odes";
-  version = "2.6.4";
+  version = "2.6.5";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-fS9E0kO+ZEcGjiWQPAQHa52zOz9RafNSBPNKypm0GhA=";
+    sha256 = "sha256-MP1pNkr0fAyWWVHJVHiaVEn1UsbVsjU9MZHHAQYtPYI=";
   };
 
   nativeBuildInputs = [

From 358a6ead53e0581c7b4fe4c9e8daddcae6be0d9d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 206/403] python3Packages.screeninfo: 0.8 -> 0.8.1

---
 .../python-modules/screeninfo/default.nix     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index dc794513fc4c..f67d68b0dddd 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -2,25 +2,33 @@
 , lib
 , buildPythonApplication
 , dataclasses
-, fetchPypi
+, fetchFromGitHub
 , libX11
 , libXinerama
 , libXrandr
+, poetry-core
 , pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonApplication rec {
   pname = "screeninfo";
-  version = "0.8";
+  version = "0.8.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "9501bf8b8458c7d1be4cb0ac9abddddfa80b932fb3f65bfcb54f5586434b1dc5";
+  src = fetchFromGitHub {
+    owner = "rr-";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA=";
   };
 
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
   propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
     dataclasses
   ];
@@ -40,7 +48,7 @@ buildPythonApplication rec {
 
   disabledTestPaths = [
     # We don't have a screen
-    "screeninfo/test_screeninfo.py"
+    "tests/test_screeninfo.py"
   ];
 
   pythonImportsCheck = [ "screeninfo" ];

From ff383555f59c07c3d0962a28524aa447c77b6745 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 207/403] python3Packages.seaborn: 0.11.2 -> 0.12.0

---
 pkgs/development/python-modules/seaborn/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index 8d94264721b7..2fc7a6a7a87f 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, flit-core
 , matplotlib
 , pytestCheckHook
 , numpy
@@ -12,16 +13,20 @@
 
 buildPythonPackage rec {
   pname = "seaborn";
-  version = "0.11.2";
-  format = "setuptools";
+  version = "0.12.0";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cf45e9286d40826864be0e3c066f98536982baf701a7caa386511792d61ff4f6";
+    sha256 = "sha256-iT8XKS2LrKYWwVeN21jrJcctYi9U/F7jKcggfcm1eyM=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   propagatedBuildInputs = [
     matplotlib
     numpy

From 246c1e8473e70e384c65836ba74500f87b98ad5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 208/403] python3Packages.secretstorage: 3.3.2 -> 3.3.3

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

diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix
index a9f336d18df9..59584ee9170f 100644
--- a/pkgs/development/python-modules/secretstorage/default.nix
+++ b/pkgs/development/python-modules/secretstorage/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "secretstorage";
-  version = "3.3.2";
+  version = "3.3.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "SecretStorage";
     inherit version;
-    hash = "sha256-Co65ZFsyCIHCIugnwm9M/PVTY+izdKAhmB74hmV6kS8=";
+    hash = "sha256-JANTPvNp7KbSuoFxhXbF4PVk1cyhtY9zqLI+fU7uvXc=";
   };
 
   propagatedBuildInputs = [

From 1cfab2fe763b44e6283c069c6c580b11c7c0d6a0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:20 +0200
Subject: [PATCH 209/403] python3Packages.setproctitle: 1.2.3 -> 1.3.2

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

diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix
index c48b7b9e1b3c..cfcd221c5abb 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/pkgs/development/python-modules/setproctitle/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "setproctitle";
-  version = "1.2.3";
+  version = "1.3.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7PKLHAenmddvQyblCBV7ca7aB7hLkDaOpFHAcQ29MsA=";
+    sha256 = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0=";
   };
 
   checkInputs = [ pytestCheckHook ];

From e2a293d4740b984406ae558a06a55e9690ab93b3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 210/403] python3Packages.sharkiq: 0.0.1 -> 1.0.2

---
 pkgs/development/python-modules/sharkiq/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix
index e41205fba737..0b99c15564fd 100644
--- a/pkgs/development/python-modules/sharkiq/default.nix
+++ b/pkgs/development/python-modules/sharkiq/default.nix
@@ -1,17 +1,20 @@
 { lib
 , aiohttp
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
 }:
 
 buildPythonPackage rec {
   pname = "sharkiq";
-  version = "0.0.1";
+  version = "1.0.2";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e5efb0ad13a66cf6a097da5c128347ef7bd0b2abe53a8ca65cbc847ec1190c8b";
+  src = fetchFromGitHub {
+    owner = "JeffResc";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-UG460uEv1U/KTuVEcXMZlVbK/7REFpotkUk4U7z7KpA=";
   };
 
   propagatedBuildInputs = [

From 8e2993b0a4f530e04c5277713398fe6722ebfba3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 211/403] python3Packages.sh: 1.14.2 -> 1.14.3

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

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index a08920a39e2b..d6334251bff4 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "sh";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d";
+    sha256 = "sha256-5ARbbHMtnOddVxx59awiNO3Zrk9fqdWbCXBQgr3KGMc=";
   };
 
   patches = [

From 2d0d88eb4140da6351662530962e1ed87768bd01 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 212/403] python3Packages.skein: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix
index 8dc3391e9e97..493528be4976 100644
--- a/pkgs/development/python-modules/skein/default.nix
+++ b/pkgs/development/python-modules/skein/default.nix
@@ -14,10 +14,10 @@
 
 buildPythonPackage rec {
   pname = "skein";
-  version = "0.8.1";
+  version = "0.8.2";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04208b4be9df2dc68ac5b3e3ae51fd9b589add95ea1b67222a8de754d17b1efa";
+    sha256 = "sha256-nXTqsJNX/LwAglPcPZkmdYPfF+vDLN+nNdZaDFTrHzE=";
   };
   # Update this hash if bumping versions
   jarHash = "sha256-UGiEoTZ17IhLG72FZ18Zb+Ej4T8z9rMIMDUxzSZGZyY=";

From 6ca607f2ac1875e9aae5dba96f2d92df3371d256 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 213/403] python3Packages.sniffio: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix
index 5b91bade0098..86e37168c899 100644
--- a/pkgs/development/python-modules/sniffio/default.nix
+++ b/pkgs/development/python-modules/sniffio/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "sniffio";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de";
+    sha256 = "sha256-5gMFxeXTFPU4klm38iqqM9j33uSXYxGSNK83VcVbkQE=";
   };
 
   disabled = !isPy3k;

From b863e9018992b3c1a0097013d87d9f7aa9cc0e88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 214/403] python3Packages.snowflake-connector-python: 2.7.9 ->
 2.7.12

---
 .../python-modules/snowflake-connector-python/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 500a392b1162..8e957b0ee373 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -5,6 +5,7 @@
 , cffi
 , charset-normalizer
 , fetchPypi
+, filelock
 , idna
 , oscrypto
 , pycryptodomex
@@ -14,18 +15,19 @@
 , pytz
 , requests
 , setuptools
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "2.7.9";
+  version = "2.7.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HQ/d7luqdG1BriuP8QXzZk5JZwwLJH1JQIN3BtEDpM4=";
+    hash = "sha256-M50YI6aB7fSVRLeAqxLKtsxJIC1oWLcb9Mvah9/C/zU=";
   };
 
   propagatedBuildInputs = [
@@ -33,6 +35,7 @@ buildPythonPackage rec {
     certifi
     cffi
     charset-normalizer
+    filelock
     idna
     oscrypto
     pycryptodomex
@@ -41,6 +44,7 @@ buildPythonPackage rec {
     pytz
     requests
     setuptools
+    typing-extensions
   ];
 
   postPatch = ''

From 55f12e1cd9fbec21c1d2508d2160b6b211e1b040 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 215/403] python3Packages.spacy: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index e4f5868d8457..cc1c01adf288 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "3.4.0";
+  version = "3.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PM0an1Z1nl8Pnv31cRmgZwKtWcBF3eCzgwtUclk+Ce8=";
+    hash = "sha256-WcXPXTSKbA5kpZrFz+bNhdCOhmM3hwyV0exhYdUx5GM=";
   };
 
   propagatedBuildInputs = [

From 327ce1654131d7f5187d310efd3bbbdfdb5b8cc8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 216/403] python3Packages.spacy-transformers: 1.1.7 -> 1.1.8

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

diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix
index d21f5d17cd27..f6985a613380 100644
--- a/pkgs/development/python-modules/spacy-transformers/default.nix
+++ b/pkgs/development/python-modules/spacy-transformers/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "spacy-transformers";
-  version = "1.1.7";
+  version = "1.1.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lrC1JEQu3/YX4o5azs4UDTsrtfim3IJyD6plCbx5G3E=";
+    hash = "sha256-e7YuBEq2yggW5G2pJ0Rjw9z3c1jqgRKCifYSfnzblVs=";
   };
 
   propagatedBuildInputs = [

From e43c1c8856911c0948b7896970ea28d865219278 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:21 +0200
Subject: [PATCH 217/403] python3Packages.spglib: 1.16.5 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix
index d317f11dea42..c9023285568b 100644
--- a/pkgs/development/python-modules/spglib/default.nix
+++ b/pkgs/development/python-modules/spglib/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "spglib";
-  version = "1.16.5";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Lqzv1TzGRLqakMRoH9bJNLa92BjBE9fzGZBOB41dq5M=";
+    sha256 = "sha256-9fHKuDWuwbjXjL9CmJxUWWoomkqDP93J8MX1XKwbwsE=";
   };
 
   propagatedBuildInputs = [ numpy ];

From 152f922444aa3c06121921746526c27cce1ea05f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 218/403] python3Packages.spyder: 5.3.2 -> 5.3.3

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

diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index edcee3fe9323..85fe9ed37e72 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -46,13 +46,13 @@
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "5.3.2";
+  version = "5.3.3";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-KJkamNMXr4Mi9Y6B7aKExoiqWKoExCFlELChCrQL6mQ=";
+    sha256 = "sha256-vWhwn07zgHX7/7uAz0ekNwnAiKLECCBzBq47TtTaHfE=";
   };
 
   nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];

From a4be3f72f45f7eeaed4923a6d7b79a742e6edd56 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 219/403] python3Packages.spyder-kernels: 2.3.2 -> 2.3.3

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

diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 3742d15b356a..743be37b5130 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "spyder-kernels";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-urI7Ak25NZzsUYLiR+cIdfcd3ECoJx/RNT3gj0QPJtw=";
+    sha256 = "sha256-7luJo7S/n88jDJRhJx1WuF5jhmeRHrrdxinbBbXuRxc=";
   };
 
   propagatedBuildInputs = [

From da041cebc6eaf2fb370f5e2bb69e09c17281e39e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 220/403] python3Packages.stestr: 3.2.1 -> 4.0.0

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

diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix
index 2071d20a75f8..bb6dc7e54b20 100644
--- a/pkgs/development/python-modules/stestr/default.nix
+++ b/pkgs/development/python-modules/stestr/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "stestr";
-  version = "3.2.1";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wj7nq0QSKNiDZZBKIk+4RC2gwCifkBz0qUIukpt76c0=";
+    sha256 = "sha256-A2Y+q62KcxaoRJFo78WCVmpdOvnHf8QALX3IPnf28q0=";
   };
 
   postPatch = ''

From 26d22f6c4f660d16c018445a0fb8894327a1415f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 221/403] python3Packages.sunpy: 4.0.4 -> 4.0.5

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

diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index aad3afda8adf..88dca4a51d4a 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "sunpy";
-  version = "4.0.4";
+  version = "4.0.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-O4VjxcuJVgUjjz3VWyczCjJxvJvAL94MBnGsRn54Ld4=";
+    hash = "sha256-7I23WtSeZPtHULJ7sNAbOdwAuzjiPE6WW2ukKUCMODs=";
   };
 
   nativeBuildInputs = [

From 81ab49a99caf4f521b03745181d4645d71bd27ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 222/403] python3Packages.sympy: 1.10.1 -> 1.11.1

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

diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index 17765a375298..c00230e501d2 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.10.1";
+  version = "1.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-WTnu/9+eFSFyYBRjYmwCKiwn51z2J43o1AHVDJ1YeHs=";
+    sha256 = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg=";
   };
 
   checkInputs = [ glibcLocales ];

From f256380dc2d3ad45f2d7bee8ca7cfc4fa89df675 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 223/403] python3Packages.tensorboard: 2.9.1 -> 2.10.0

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

diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix
index 4e7087deb326..d3cc30cdad68 100644
--- a/pkgs/development/python-modules/tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorboard/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "tensorboard";
-  version = "2.9.1";
+  version = "2.10.0";
   format = "wheel";
   disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     inherit pname version format;
     dist = "py3";
     python = "py3";
-    hash = "sha256-uqcn95F3b55YQdNHEncgzu1LvVnDa0BgS5X7KuYCknY=";
+    hash = "sha256-dskaXolZzSIIzDLLF6DLACutq7ZqBqwq8Cp4EPSaWeM=";
   };
 
   postPatch = ''
@@ -41,8 +41,8 @@ buildPythonPackage rec {
     pushd unpacked/tensorboard-${version}
 
     substituteInPlace tensorboard-${version}.dist-info/METADATA \
-      --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" \
-      --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)"
+      --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" \
+      --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)"
 
     popd
     wheel pack ./unpacked/tensorboard-${version}

From ded5f2354d3512055bc58cedc297e40dcca0cff2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 224/403] python3Packages.tensorflow-estimator: 2.9.0 -> 2.10.0

---
 .../python-modules/tensorflow-estimator/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix
index b52a96a3ea5b..24fb681f3b6f 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/default.nix
+++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  version = "2.9.0";
+  version = "2.10.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    hash = "sha256-6XYrswL1G8HrLzXRnwGQpqLYCddU1d73iMQyj+N0Z0Q=";
+    hash = "sha256-8yTqF81X8W4zvxiHEdUHfmsuX1oSwyjW4BoHsjiI7c0=";
   };
 
   propagatedBuildInputs = [ mock numpy absl-py ];

From 3bd6f99b3e2c83209a9492cfc7aacbd866cf3b45 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:22 +0200
Subject: [PATCH 225/403] python3Packages.termcolor: 1.1.0 -> 2.0.1

---
 .../python-modules/termcolor/default.nix      | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix
index e440dab114fa..b1cfc0dc0461 100644
--- a/pkgs/development/python-modules/termcolor/default.nix
+++ b/pkgs/development/python-modules/termcolor/default.nix
@@ -1,17 +1,34 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, hatch-vcs
+, hatchling
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "termcolor";
-  version = "1.1.0";
+  version = "2.0.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b";
+    sha256 = "sha256-ayz3aekzZKJnbh3lanwM/yz1vQfzfpzICw3WMg6/44g=";
   };
 
+  nativeBuildInputs = [
+    hatch-vcs
+    hatchling
+  ];
+
+  pythonImportsCheck = [
+    "termcolor"
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
   meta = with lib; {
     description = "Termcolor";
     homepage = "https://pypi.python.org/pypi/termcolor";

From db8a2534560618752d3cb2a8c90d7e9afc244c93 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 226/403] python3Packages.thinc: 8.1.0 -> 8.1.1

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

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 79faa769ddf3..51ee2803f3cf 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "8.1.0";
+  version = "8.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6q6pHcVsBBUWqCnEYEI6iu9TVwAWEMjWOVvOldglSgs=";
+    sha256 = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80=";
   };
 
   postPatch = ''

From 88ae5fb717a0b4579adfc9dd22d197ef03f6739a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 227/403] python3Packages.tifffile: 2022.5.4 -> 2022.8.12

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

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 2452c6bb4453..ea20059f5620 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "tifffile";
-  version = "2022.5.4";
+  version = "2022.8.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sDFHoVhit8HZDUdDUZfxSb73pSwlrWfPH5tGX6pxuNI=";
+    hash = "sha256-PnTg/UiDhHfrz0Dgm3eAvQle5ZILIjj0heLGhGOj3LQ=";
   };
 
   propagatedBuildInputs = [

From 038d0b9e1711e2ef50249ef8307d9a352cc9ac89 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 228/403] python3Packages.tomlkit: 0.11.1 -> 0.11.4

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

diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 6430bef1aa88..6bd461db75a2 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "tomlkit";
-  version = "0.11.1";
+  version = "0.11.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-YZAfgf9AF5URGc0NHtm3rzHIIdaEXIxHdYe73NXlhU4=";
+    sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM=";
   };
 
   propagatedBuildInputs =

From 01170b7b66ecc2bd749a96ce29b494050ca37951 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 229/403] python3Packages.tox: 3.25.1 -> 3.26.0

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

diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index cc9a96a1cba7..ea14b92abf5c 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "3.25.1";
+  version = "3.26.0";
 
   buildInputs = [ setuptools-scm ];
   propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wTgyeBX1O8baT+VrrsXyXwBiKuae8/5OHjhXIOIkhvk=";
+    sha256 = "sha256-RPPDR8aMLGh5nX1E8YCPnTlvyKGlAMvGJCUzdceuEH4=";
   };
 
   meta = with lib; {

From d7056eb74fe5ad233961ff34c77b76abf2e43e08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 230/403] python3Packages.tqdm: 4.64.0 -> 4.64.1

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

diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 81e447457c5a..6da72cde5ea5 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.64.0";
+  version = "4.64.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13a0spki37rdbx54nspcni3bpsp4d7p5ln570yipf1r01v9mbgj0";
+    sha256 = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ=";
   };
 
   nativeBuildInputs = [

From 718534a72902bb1a5a49d3d3dd81c08f0d9b6a09 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 231/403] python3Packages.traitlets: 5.3.0 -> 5.4.0

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

diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix
index 0a32f931d132..30bff404032e 100644
--- a/pkgs/development/python-modules/traitlets/default.nix
+++ b/pkgs/development/python-modules/traitlets/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "traitlets";
-  version = "5.3.0";
+  version = "5.4.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-C7nx+fAXqo7Bh9ixsqemYmoqHYdxFrq6UqEpv6Ek+OI=";
+    sha256 = "sha256-PyxOQ14nFZL+Q5DxdG6laDbjoID4Tngz8PgB2WE/7Dk=";
   };
 
   nativeBuildInputs = [ hatchling ];

From e65663f0dc9f774e147d07551d21c06d3a7af67d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 232/403] python3Packages.traits: 6.3.2 -> 6.4.1

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

diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index 9e6b1a5056da..ebe3c858543e 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "traits";
-  version = "6.3.2";
+  version = "6.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4520ef4a675181f38be4a5bab1b1d5472691597fe2cfe4faf91023e89407e2c6";
+    sha256 = "sha256-eLssyv1gr/YGUVqsRt5kZooKgctcVMZQuYd6hBqp6BI=";
   };
 
   # Circular dependency

From 963f8317b8c0b50f4cb6ac30c8ad4568ba43db17 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 233/403] python3Packages.transitions: 0.8.11 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix
index e50dec28ef50..24bfa14b8c4b 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/pkgs/development/python-modules/transitions/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "transitions";
-  version = "0.8.11";
+  version = "0.9.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-eyDTKQbqTWDub2wfXcnJ8XiAJCXFsVUhPrDyXCd/BOQ=";
+    sha256 = "sha256-L1TRG9siV3nX5ykBHpOp+3F2aM49xl+NT1pde6L0jhA=";
   };
 
   propagatedBuildInputs = [

From 31d9dddcc01b972cb2bb2dd6e6b7aa4669e4669c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:23 +0200
Subject: [PATCH 234/403] python3Packages.trytond: 6.4.4 -> 6.4.5

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

diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index f681d2b369f0..ce39ed5d1a05 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "trytond";
-  version = "6.4.4";
+  version = "6.4.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-eTYm3anMKhgoaB8t5jald5XRD3PIVijJP4vmh0pA9lE=";
+    sha256 = "sha256-AF8LG68K+CvHpFOIoGbxD+lF7IVwBDk8K06I4uTNguI=";
   };
 
   propagatedBuildInputs = [

From f8edd6531cf858ed59e8bb2bbf7849c644ed789b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 235/403] python3Packages.twisted: 22.4.0 -> 22.8.0

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

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 6689a2ce80d3..ac09730526b3 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "twisted";
-  version = "22.4.0";
+  version = "22.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     pname = "Twisted";
     inherit version;
     extension = "tar.gz";
-    sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA=";
+    sha256 = "sha256-5bYN458tHaFT++GHTYhf4/y9sh/MRG+nWaU+j8NRO+0=";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -76,9 +76,6 @@ buildPythonPackage rec {
     echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py
     echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py
 
-    echo 'PTYProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
-    echo 'PTYProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
-
     echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py
     echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py
 
@@ -91,8 +88,6 @@ buildPythonPackage rec {
     echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py
     echo 'MulticastTests.test_multiListen.skip = "No such device"'>> src/twisted/test/test_udp.py
 
-    echo 'DomishExpatStreamTests.test_namespaceWithWhitespace.skip = "syntax error: line 1, column 0"'>> src/twisted/words/test/test_domish.py
-
     # not packaged
     substituteInPlace src/twisted/test/test_failure.py \
       --replace "from cython_test_exception_raiser import raiser  # type: ignore[import]" "raiser = None"

From 93acf0d4ff6bbd3eeea5b87136fa005292b538f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 236/403] python3Packages.twitter: 1.19.4 -> 1.19.6

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

diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix
index e9676c0fa707..64ca41f60c2f 100644
--- a/pkgs/development/python-modules/twitter/default.nix
+++ b/pkgs/development/python-modules/twitter/default.nix
@@ -2,25 +2,30 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools-scm
+, certifi
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "twitter";
-  version = "1.19.4";
+  version = "1.19.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-g7jSSEpsdEihGuHG9MJTNVFe6NyB272vEsvAocRo72U=";
+    hash = "sha256-gN3WmuLuuIMT/u3uoxvxGf1ueVQe5bN6u5xD0jMZThA=";
   };
 
   nativeBuildInputs = [
     setuptools-scm
   ];
 
+  propagatedBuildInputs = [
+    certifi
+  ];
+
   doCheck = false;
 
   pythonImportsCheck = [

From f6c1f88a653b35a99bafdb0193913c41b7c8f64d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 237/403] python3Packages.types-typed-ast: 1.5.6 -> 1.5.8

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

diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix
index ca45ec7039ba..485c6b0d5af1 100644
--- a/pkgs/development/python-modules/types-typed-ast/default.nix
+++ b/pkgs/development/python-modules/types-typed-ast/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-typed-ast";
-  version = "1.5.6";
+  version = "1.5.8";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UzmUeAz3KbdAwUdQZsRAdi8pqZvalRHU+mhdXuOoQ4k=";
+    hash = "sha256-FW+6ypA+hXH+cLsLVi/7qSp8vbe6yacTNRyifYgYO6c=";
   };
 
   # Module doesn't have tests

From 28b57575555e8672555a191c7b2768256dfdffb0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 238/403] python3Packages.typing-inspect: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix
index d54016049364..e79eb6823efa 100644
--- a/pkgs/development/python-modules/typing-inspect/default.nix
+++ b/pkgs/development/python-modules/typing-inspect/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "typing-inspect";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit version;
     pname = "typing_inspect";
-    sha256 = "1al2lyi3r189r5xgw90shbxvd88ic4si9w7n3d9lczxiv6bl0z84";
+    sha256 = "sha256-ix/wxACUO2FF34EZxBwkTKggfx8QycBXru0VYOSAbj0=";
   };
 
   propagatedBuildInputs = [

From 5638e62876a385032796ea233e9c93563db08c52 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 239/403] python3Packages.tzdata: 2022.1 -> 2022.2

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

diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index 089446b8ffea..c701d3683cdb 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "tzdata";
-  version = "2022.1";
+  version = "2022.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-i1NqjsY9wHUTQrOYQZOjEY+Pyir+JXUrubf//TmFUtM=";
+    hash = "sha256-IfTw1yQVcu+n96T9q7BS5htV3EgnTmhCaXzN9SU+VFE=";
   };
 
   nativeBuildInputs = [

From 743833b5a3f54e613cad95e282d8edde38fbcd2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 240/403] python3Packages.uamqp: 1.5.3 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 1a087c10d8f1..6fb474aefc2b 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "uamqp";
-  version = "1.5.3";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs=";
+    sha256 = "sha256-LDG3ShCFbszyWNc8TQjlysTWBgo0uYNIkL/UK8sTg1A=";
   };
 
   patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [

From b0186bd37f87914321eeec4c77de61c7774d1327 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 241/403] python3Packages.urllib3: 1.26.11 -> 1.26.12

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

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 3cdbdd3a111b..ec63f5f21ed9 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -20,12 +20,12 @@
 
 buildPythonPackage rec {
   pname = "urllib3";
-  version = "1.26.11";
+  version = "1.26.12";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6m6PshCxnZUPq5O2DJAJImxjoogIvIOG4FMB4liDrAo=";
+    hash = "sha256-P6ls9CPmmHmX/DJq6N85bbKot8ZndH1H3djsupH0p04=";
   };
 
   # FIXME: remove backwards compatbility hack

From 34fa7f145bd0d02a0cb396e2dc6724d23cc78f30 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:24 +0200
Subject: [PATCH 242/403] python3Packages.vcrpy: 4.2.0 -> 4.2.1

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

diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index 8dbc7b50546e..9abd727e725c 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "vcrpy";
-  version = "4.2.0";
+  version = "4.2.1";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-lFILhvt2WSWtyMd/+TToml4VbCjnSjFDICF+8bRUr+A=";
+    sha256 = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM=";
   };
 
   checkInputs = [

From 94b9a0dff184b2d7e8468b6e9a2e25c7ff8c000d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 243/403] python3Packages.virtualenv: 20.15.1 -> 20.16.5

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

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 3fba7cdb50c5..f0b365761f6c 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.15.1";
+  version = "20.16.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-KIFxE0ov87+xovVPEZ53zRuBwp/BJlojVvPo0Ux9WMQ=";
+    sha256 = "sha256-In6huZlP3F6jGXe6M4PvKW10cuqFvp1nMuQqkcBOgNo=";
   };
 
   nativeBuildInputs = [

From d4f6da468b881e0b1ee6efb26b04661452804d02 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 244/403] python3Packages.w3lib: 1.22.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index d7074269e6a9..9c98f4d0926c 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "w3lib";
-  version = "1.22.0";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha";
+    sha256 = "sha256-E98V+MF7Fj3g/V+qiSwa0UPhkN/L25hTS7l16zfGx9Y=";
   };
 
   propagatedBuildInputs = [ six ];

From eeab55c2af145b6c72065bc140f8f18059b28f80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 245/403] python3Packages.wasabi: 0.9.1 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index 16c89ae63a0d..2f751e8105e4 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "wasabi";
-  version = "0.9.1";
+  version = "0.10.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8=";
+    sha256 = "sha256-yONyeBvhknKUI4KxTZkxTRdVGNeCIFfLepcBDEJZ0kk=";
   };
 
   checkInputs = [

From 2108742af389b5c1cdcf29fc0e5d7ba76205994b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 246/403] python3Packages.websocket-client: 1.3.3 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix
index a73703f12a11..1e1823095b0b 100644
--- a/pkgs/development/python-modules/websocket-client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "websocket-client";
-  version = "1.3.3";
+  version = "1.4.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1YxfKE1qm/g3natCMln+j4W3DV+l0pFtV5GoRZSxIrE=";
+    sha256 = "sha256-+WEetlyCQaZ/s3O+8ECzz4rTd6n2VGoStiC2UR6Oqe8=";
   };
 
   propagatedBuildInputs = [

From 5ec9725c23704d56cbabb0228de3e08d42c45453 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 247/403] python3Packages.widgetsnbextension: 3.6.1 -> 4.0.3

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

diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index 7609eb376f1c..800851a87a34 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "widgetsnbextension";
-  version = "3.6.1";
+  version = "4.0.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nISuZMKJPHy+Lqr8dQUiGnlcJ9aJOEVANKxIcxmnWxA=";
+    hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY=";
   };
 
   # setup.py claims to require notebook, but the source doesn't have any imports

From 95603510ba67dc6bebb12b65559c62ae1130c3c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 248/403] python3Packages.wsproto: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix
index bcc9428b460b..ce9f0c0d7a37 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/pkgs/development/python-modules/wsproto/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "wsproto";
-  version = "1.1.0";
+  version = "1.2.0";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ouVr/Vx82DwTadg7X+zNbTd5i3SHKGbmJhbg7PERvag=";
+    sha256 = "sha256-rVZfJuy5JYij5DvD2WFk3oTNmQJIKxMNDduqlmSoUGU=";
   };
 
   propagatedBuildInputs = [ h11 ];

From 4a9c64e15161c6371115fdd2cb2ffee3a655e3c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 249/403] python3Packages.xarray: 2022.3.0 -> 2022.6.0

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

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 5d0ac813e498..2d10f0ddb572 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "2022.3.0";
+  version = "2022.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-OYNEv30XBHeqzv9wIQ4R69aa9rFW/hOXgFTSXEhylEA=";
+    sha256 = "sha256-ECjRmEk/ZrsVvTXc/dEd79gxy+469lif/xb0G93WfoQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION="${version}";

From 41544b24810fc4949ce4534d78a5e3fb6aa63a43 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:25 +0200
Subject: [PATCH 250/403] python3Packages.xlsx2csv: 0.7.8 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix
index e22c0d965919..21a40f0c35f3 100644
--- a/pkgs/development/python-modules/xlsx2csv/default.nix
+++ b/pkgs/development/python-modules/xlsx2csv/default.nix
@@ -1,17 +1,23 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "xlsx2csv";
-  version = "0.7.8";
+  version = "0.8.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3aaf0c5febd9c5e48488026e7a58af37a67bf3da5e221cc57d371328b3b7dd3";
+    sha256 = "sha256-LCaOUJt3ZspKJPLzYwLpGHBcXq0vzeP0vV8cphUvfiw=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/dilshod/xlsx2csv";
     description = "Convert xlsx to csv";

From 3ddc82f3902218ed483438698fc957cde80c6d87 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 251/403] python3Packages.xmlsec: 1.3.12 -> 1.3.13

---
 .../python-modules/xmlsec/default.nix         |  9 ++------
 .../xmlsec/reset-lxml-in-tests.patch          | 22 -------------------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch

diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix
index 0224c03ab3e8..1aec0cc114ec 100644
--- a/pkgs/development/python-modules/xmlsec/default.nix
+++ b/pkgs/development/python-modules/xmlsec/default.nix
@@ -15,19 +15,14 @@
 
 buildPythonPackage rec {
   pname = "xmlsec";
-  version = "1.3.12";
+  version = "1.3.13";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9";
+    sha256 = "sha256-kW9deOgEH2zZORq7plnajJSk/vcZbRJtQK8f9Bfyz4Y=";
   };
 
-  # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
-  patches = [
-    ./reset-lxml-in-tests.patch
-  ];
-
   nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ];
 
   buildInputs = [ xmlsec libxslt libxml2 libtool ];
diff --git a/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch b/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch
deleted file mode 100644
index 0968583faa63..000000000000
--- a/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/base.py b/tests/base.py
-index b05de1d..5ec356f 100644
---- a/tests/base.py
-+++ b/tests/base.py
-@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase):
- 
-     def load_xml(self, name, xpath=None):
-         """returns xml.etree"""
-+        etree.set_default_parser(parser=etree.XMLParser())
-         root = etree.parse(self.path(name)).getroot()
-         if xpath is None:
-             return root
-diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
-index 2fc490f..53d2377 100644
---- a/tests/test_doc_examples.py
-+++ b/tests/test_doc_examples.py
-@@ -42,3 +42,5 @@ def test_doc_example(example):
-     """
-     with cd(example.parent):
-         runpy.run_path(str(example))
-+    from lxml import etree
-+    etree.set_default_parser(parser=etree.XMLParser())

From 076139da3a7930c3a1836cb0781d2fd5245baab8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 252/403] python3Packages.yamllint: 1.27.1 -> 1.28.0

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

diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index b82e87016159..58d47d1fff9c 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "1.27.1";
+  version = "1.28.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-5ogyS1hWCraKGjz/LApHTj/tNx3+jaXRuYF7ffVQOc4=";
+    sha256 = "sha256-nj2N3RbQWDIUxf3/6AbJNECGch8QdDX2i62ZDlqIgms=";
   };
 
   propagatedBuildInputs = [

From ee802c7dfb867f290d32a2494c908565300de12b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 253/403] python3Packages.yangson: 1.4.13 -> 1.4.14

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

diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix
index a82bf972546d..42caebb92e8b 100644
--- a/pkgs/development/python-modules/yangson/default.nix
+++ b/pkgs/development/python-modules/yangson/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "yangson";
-  version = "1.4.13";
+  version = "1.4.14";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-SuKpSwIjZioyqmxlcKJ+UXP+ADfJwUwCCttmMAiEkZ4=";
+    sha256 = "sha256-OMqtZ/kPj7ge235nuyrfCzawG6AOAqfJPzQHF8cW4Ok=";
   };
 
   nativeBuildInputs = [

From 22ef7ade00791276e8e5765c715b094cc724eb4f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 254/403] python3Packages.yarl: 1.7.2 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 08866ac39074..249bf974322e 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "1.7.2";
+  version = "1.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RTmbRtYMJTMnpGDpmFZ1IAn87l9dPICy98DK4cONVt0=";
+    sha256 = "sha256-r4h4RbjC4GDrVgX/crby3SqrenYTeTc/2J0xT0dSq78=";
   };
 
   postPatch = ''

From c5e5fe9754a3a67bd07eff5845437e8bd0dfd14f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 255/403] python3Packages.zope-cachedescriptors: 4.3.1 -> 4.4

---
 .../python-modules/zope-cachedescriptors/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix
index 4cbf9386b6cb..7696e078343e 100644
--- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix
+++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "zope-cachedescriptors";
-  version = "4.3.1";
+  version = "4.4";
 
   format = "setuptools";
 
   src = fetchPypi {
     pname = "zope.cachedescriptors";
     inherit version;
-    sha256 = "1f4d1a702f2ea3d177a1ffb404235551bb85560100ec88e6c98691734b1d194a";
+    sha256 = "sha256-1FxIdIb334HymS8aAJEmJL93JZ2DxdmKp2tnhxbj0Ro=";
   };
 
   propagatedBuildInputs = [

From cef001745909ce1ca314e4c72d63a2ecf6fd8fc6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 256/403] python3Packages.zope-hookable: 5.1.0 -> 5.2

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

diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix
index 993568f6ffd9..f1bc3bf72f74 100644
--- a/pkgs/development/python-modules/zope-hookable/default.nix
+++ b/pkgs/development/python-modules/zope-hookable/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "zope-hookable";
-  version = "5.1.0";
+  version = "5.2";
 
   src = fetchPypi {
     pname = "zope.hookable";
     inherit version;
-    sha256 = "8fc3e6cd0486c6af48e3317c299def719b57538332a194e0b3bc6a772f4faa0e";
+    sha256 = "sha256-TDAYvPKznPXMz0CCb3mbS4wUAFbbeA+WywyjMqJDvSk=";
   };
 
   checkInputs = [ zope_testing ];

From 8a9c57ac80d47636c2a5587e187f73bb5d31cd42 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 257/403] python3Packages.zope.size: 4.3 -> 4.4

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

diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix
index 6945dddceaa3..bf7a44f8a026 100644
--- a/pkgs/development/python-modules/zope_size/default.nix
+++ b/pkgs/development/python-modules/zope_size/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "zope.size";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6f3eb687c9181e3b7400c5cd4d4209a2f676475b7b85c99ee11de2404b3493ec";
+    sha256 = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk=";
   };
 
   propagatedBuildInputs = [ zope_i18nmessageid zope_interface ];

From b749db3ab5176914224e928466655117b7f4e54b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 258/403] python3Packages.zope.testrunner: 5.5 -> 5.5.1

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

diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index 273326baeb2a..1b838354c4cf 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "zope.testrunner";
-  version = "5.5";
+  version = "5.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/LhQZWGIoM380kmjt9Mw1JsVv7+DoQ8YW//cD6uQE+U=";
+    sha256 = "sha256-ahDTg1RZ7tO8hDHyGq9gS8dU/4OSopeXzSDlqUHBQ74=";
   };
 
   propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];

From abcab7e08c449d9493daf698047edef323faf603 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Sep 2022 23:36:26 +0200
Subject: [PATCH 259/403] python3Packages.zstd: 1.5.2.5 -> 1.5.2.6

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

diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index 8599c7495ad9..db33c7f36772 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "zstd";
-  version = "1.5.2.5";
+  version = "1.5.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-PEKbFmo7MksJg7/1OuCSi5dkxpOgF/Yv+2sg5hNeM48=";
+    sha256 = "sha256-9ECFjRmIkOX/UX3/MtFejDG7c1BqiW+br20BTv5i9/w=";
   };
 
   postPatch = ''

From c87bfc061e1f8e471d3d4db3761d7d182fd38b8b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 01:09:19 +0200
Subject: [PATCH 260/403] python3Packages.distlib: 0.3.4 -> 0.3.6

---
 .../python-modules/distlib/default.nix        | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix
index ec4e8ecdc6f5..ae14cc008c8d 100644
--- a/pkgs/development/python-modules/distlib/default.nix
+++ b/pkgs/development/python-modules/distlib/default.nix
@@ -1,15 +1,34 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "distlib";
-  version = "0.3.4";
+  version = "0.3.6";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579";
-    extension = "zip";
+    hash = "sha256-FLrS2bBNOjYSesl/MLEqGSaPIRBj2PjuT0cQiJbhG0Y=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "distlib"
+    "distlib.database"
+    "distlib.locators"
+    "distlib.index"
+    "distlib.markers"
+    "distlib.metadata"
+    "distlib.util"
+    "distlib.resources"
+  ];
+
   # Tests use pypi.org.
   doCheck = false;
 

From 6a34633c0e626b58079cac1ffb9a77126b25a8ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 02:03:53 +0200
Subject: [PATCH 261/403] python3Packages.paramiko: propagate six, reenable
 tests

---
 .../python-modules/paramiko/default.nix       | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index 9a0046940035..225bf8b6f12f 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -11,6 +11,7 @@
 , pynacl
 , pytest-relaxed
 , pytestCheckHook
+, six
 }:
 
 buildPythonPackage rec {
@@ -33,26 +34,27 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    bcrypt
     cryptography
     pyasn1
+    six
   ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update
 
-  checkInputs = [
-    invoke
-    mock
-    pytest-relaxed
-    pytestCheckHook
-  ];
+  passthru.optional-dependencies = {
+    gssapi = [ pyasn1 gssapi ];
+    ed25519 = [ pynacl bcrypt ];
+    invoke = [ invoke ];
+  };
 
-  # with python 3.9.6+, the deprecation warnings will fail the test suite
-  # see: https://github.com/pyinvoke/invoke/issues/829
-  # pytest-relaxed does not work with pytest 6
-  # see: https://github.com/bitprophet/pytest-relaxed/issues/12
-  doCheck = false;
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   disabledTestPaths = [
-    "tests/test_sftp.py"
-    "tests/test_config.py"
+    # disable tests that require pytest-relaxed, which is broken
+    "tests/test_client.py"
+    "tests/test_ssh_gss.py"
   ];
 
   pythonImportsCheck = [
@@ -61,12 +63,6 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  passthru.optional-dependencies = {
-    gssapi = [ pyasn1 gssapi ];
-    ed25519 = [ pynacl bcrypt ];
-    invoke = [ invoke ];
-  };
-
   meta = with lib; {
     homepage = "https://github.com/paramiko/paramiko/";
     description = "Native Python SSHv2 protocol library";

From e26a2367f67b524079085ff40e0597cda91eb75b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 04:23:44 +0200
Subject: [PATCH 262/403] python3Packages.hass-nabucasa: relax cryptography
 constraint further

---
 pkgs/development/python-modules/hass-nabucasa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index ce2f12804bd8..e23aa5b9fa7c 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace setup.py \
       --replace "acme==" "acme>=" \
-      --replace "cryptography>=2.8,<37.0" "cryptography" \
+      --replace "cryptography>=2.8,<38.0" "cryptography" \
       --replace "pycognito==" "pycognito>=" \
       --replace "snitun==" "snitun>=" \
   '';

From e345248f8cde5156c6b0f9ff74c6e1e9642d8b33 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 05:18:02 +0200
Subject: [PATCH 263/403] home-assistant: relax yarl constraint

---
 pkgs/servers/home-assistant/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 599211c398d5..0cd59c21ad18 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -363,6 +363,7 @@ in python.pkgs.buildPythonApplication rec {
       "orjson"
       "PyJWT"
       "requests"
+      "yarl"
     ];
   in ''
     sed -r -i \

From bfe66ab0da1e4e6632983af56adaa6dd3acb6361 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 16:15:16 +0200
Subject: [PATCH 264/403] python3Packages.django_4: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 4d4e9265defa..96ee036d1259 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -5,6 +5,9 @@
 , pythonOlder
 , substituteAll
 
+# build
+, setuptools
+
 # patched in
 , fetchpatch
 , geos
@@ -64,6 +67,10 @@ buildPythonPackage rec {
     })
   ];
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     asgiref
     sqlparse

From f98d8fc610696e10e8b19c1e579ce3b9a2ea1ce8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 16:25:00 +0200
Subject: [PATCH 265/403] python3Packages.build: migrate to setuptools
 build-system

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

diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 59f0e9f245d2..1ef401b8c0a2 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -3,7 +3,6 @@
 , buildPythonPackage
 , fetchFromGitHub
 , filelock
-, setuptools
 , importlib-metadata
 , packaging
 , pep517
@@ -12,6 +11,7 @@
 , pytest-xdist
 , pytestCheckHook
 , pythonOlder
+, setuptools
 , toml
 , tomli
 }:

From 40b6a2232f1a1ef8c9ba53d938e928b9450aa8cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 16:29:21 +0200
Subject: [PATCH 266/403] python3Packages.poetry-core: add setuptools to
 checkInputs

Was previously provided through buildPythonPackage, not anymore. Also
remove the intreehooks builder, because poetry-core relies on
backend-path to use itself to build itself.
---
 .../python-modules/poetry-core/default.nix           | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index 9c61c527c98a..737985ece249 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -5,7 +5,6 @@
 , build
 , git
 , importlib-metadata
-, intreehooks
 , pep517
 , pytest-mock
 , pytestCheckHook
@@ -27,17 +26,6 @@ buildPythonPackage rec {
     sha256 = "sha256-WUgBrO9h1E7N2SVFD47UPv39DMx1yQviV5tcNPmR+/g=";
   };
 
-  postPatch = lib.optionalString (pythonOlder "3.8") ''
-    # remove >1.0.3
-    substituteInPlace pyproject.toml \
-      --replace 'importlib-metadata = {version = "^1.7.0", python = "~2.7 || >=3.5, <3.8"}' \
-        'importlib-metadata = {version = ">=1.7.0", python = "~2.7 || >=3.5, <3.8"}'
-  '';
-
-  nativeBuildInputs = [
-    intreehooks
-  ];
-
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
     importlib-metadata
   ];

From 44ae9b6090fa093d169d96294498fb2558cf896f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 5 Jul 2022 16:17:36 +0200
Subject: [PATCH 267/403] python3.pkgs.scipy: switch to using meson

---
 pkgs/development/python-modules/scipy/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index c1d13ca73501..aa578d21d257 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -5,7 +5,10 @@
 , buildPythonPackage
 , cython
 , gfortran
+, meson-python
+, pkg-config
 , pythran
+, wheel
 , nose
 , pytest
 , pytest-xdist
@@ -16,13 +19,14 @@
 buildPythonPackage rec {
   pname = "scipy";
   version = "1.9.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-JtKMRokA5tX9s30oEqtG2wzNIsY7qglQV4cfqjpJi8k=";
   };
 
-  nativeBuildInputs = [ cython gfortran pythran ];
+  nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ];
 
   buildInputs = [ numpy.blas pybind11 ];
 
@@ -30,11 +34,6 @@ buildPythonPackage rec {
 
   checkInputs = [ nose pytest pytest-xdist ];
 
-  # Remove tests because of broken wrapper
-  prePatch = ''
-    rm scipy/linalg/tests/test_lapack.py
-  '';
-
   doCheck = !(stdenv.isx86_64 && stdenv.isDarwin);
 
   preConfigure = ''
@@ -42,10 +41,6 @@ buildPythonPackage rec {
     export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
   '';
 
-  preBuild = ''
-    ln -s ${numpy.cfg} site.cfg
-  '';
-
   # disable stackprotector on aarch64-darwin for now
   #
   # build error:

From c2e54388d5be215169de0761fee7337aa96c15db Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 5 Jul 2022 16:17:54 +0200
Subject: [PATCH 268/403] python3.pkgs.meson-python: init at 0.6.0

---
 .../python-modules/meson-python/default.nix   | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/meson-python/default.nix

diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
new file mode 100644
index 000000000000..46482c4d5a67
--- /dev/null
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, colorama
+, meson
+, ninja
+, pyproject-metadata
+, tomli
+}:
+
+buildPythonPackage rec {
+  pname = "meson-python";
+  version = "0.6.0";
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "meson_python";
+    hash = "sha256-/bX7s6ttdTav/+qPt9CYREb4t5vHCz+8mA5DvV81bfM=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pyproject-metadata
+    tomli
+  ];
+
+  propagatedBuildInputs = [
+    colorama
+    meson
+    ninja
+    pyproject-metadata
+    tomli
+  ];
+
+  # Ugly work-around. Drop ninja dependency.
+  # We already have ninja, but it comes without METADATA.
+  # Building ninja-python-distributions is the way to go.
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace "'ninja'," ""
+  '';
+
+  meta = {
+    description = "Meson Python build backend (PEP 517)";
+    license = [ lib.licenses.mit ];
+    maintainers = [ lib.maintainers.fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47d42b98953a..21488b7edb11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5658,6 +5658,8 @@ in {
 
   mesonpep517 = callPackage ../development/python-modules/mesonpep517 { };
 
+  meson-python = callPackage ../development/python-modules/meson-python { };
+
   messagebird = callPackage ../development/python-modules/messagebird { };
 
   metakernel = callPackage ../development/python-modules/metakernel { };

From 941663db0bdca4bae25817812150063af8de4ee9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 5 Jul 2022 16:18:12 +0200
Subject: [PATCH 269/403] python3.pkgs.pyproject-metadata: init at 0.5.0

---
 .../pyproject-metadata/default.nix            | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyproject-metadata/default.nix

diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix
new file mode 100644
index 000000000000..5cd5b92073bc
--- /dev/null
+++ b/pkgs/development/python-modules/pyproject-metadata/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, wheel
+, packaging
+, pytestCheckHook
+, tomli
+}:
+
+buildPythonPackage rec {
+  pname = "pyproject-metadata";
+  version = "0.5.0";
+  format = "pyproject";
+
+  src = fetchPypi rec {
+    inherit pname version;
+    hash = "sha256-6YN9I3V8XJ//+19/N8+be8LZc30OlZt/XV8YmVFulww=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
+
+  propagatedBuildInputs = [
+    packaging
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    tomli
+  ];
+
+  # Many broken tests, and missing test files
+  doCheck = false;
+
+  meta = with lib; {
+    description = "PEP 621 metadata parsing";
+    homepage = "https://github.com/FFY00/python-pyproject-metadata";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 21488b7edb11..30f0eb0d3796 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8250,6 +8250,8 @@ in {
 
   pyproj = callPackage ../development/python-modules/pyproj { };
 
+  pyproject-metadata = callPackage ../development/python-modules/pyproject-metadata { };
+
   pyprosegur = callPackage ../development/python-modules/pyprosegur { };
 
   pyptlib = callPackage ../development/python-modules/pyptlib { };

From 9b4a97f4f1636d6e447393ac2541cbb5d9f630d8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 15 Sep 2022 19:04:03 +0200
Subject: [PATCH 270/403] python3Packages.meson-python: 0.6.0 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index 46482c4d5a67..18c00a95e856 100644
--- a/pkgs/development/python-modules/meson-python/default.nix
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "meson-python";
-  version = "0.6.0";
+  version = "0.8.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "meson_python";
-    hash = "sha256-/bX7s6ttdTav/+qPt9CYREb4t5vHCz+8mA5DvV81bfM=";
+    hash = "sha256-RC8fpM9dtQ7qYRcKYFnBD6/XCXf12980QcEGzSOwXkw=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,6 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    colorama
     meson
     ninja
     pyproject-metadata
@@ -44,7 +43,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Meson Python build backend (PEP 517)";
+    homepage = "https://github.com/FFY00/meson-python";
     license = [ lib.licenses.mit ];
     maintainers = [ lib.maintainers.fridh ];
   };
-}
\ No newline at end of file
+}

From b462aefc7f608e2ee040d351462ae7c442cf3b03 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 15 Sep 2022 19:05:14 +0200
Subject: [PATCH 271/403] python3Packages.numpy: revert to setuptools

Somehow the pyproject configuration fails.
---
 pkgs/development/python-modules/numpy/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 7b4c5178d66b..6f13a90e2ec3 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -11,7 +11,6 @@
 , lapack
 , writeTextFile
 , cython
-, setuptoolsBuildHook
 , pythonOlder
 }:
 
@@ -41,13 +40,8 @@ let
   };
 in buildPythonPackage rec {
   pname = "numpy";
-
-  # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so
-  # build both to verify they don't break.
-  # https://github.com/scipy/scipy/issues/15414
   version = "1.23.3";
-
-  format = "pyproject";
+  format = "setuptools";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
@@ -63,7 +57,7 @@ in buildPythonPackage rec {
     ./numpy-distutils-C++.patch
   ];
 
-  nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ];
+  nativeBuildInputs = [ gfortran cython ];
   buildInputs = [ blas lapack ];
 
   # we default openblas to build with 64 threads

From d4d5601d998ffc5cc26396aaacd84b83cf6e05be Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 21:40:30 +0200
Subject: [PATCH 272/403] python3Packages.openapi-schema-validator: 0.3.0 ->
 0.3.4

---
 .../python-modules/openapi-schema-validator/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix
index 2471df794fc0..2060b2cf4787 100644
--- a/pkgs/development/python-modules/openapi-schema-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "openapi-schema-validator";
-  version = "0.3.0";
+  version = "0.3.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-Ms00nR3dpJ0hGtHvVa5B29dasYtBP8igxrgMm0NiArc=";
+    sha256 = "sha256-0nKAeqZCfzYFsV18BDsSws/54FmRoy7lQSHguI6m3Sc=";
   };
 
   nativeBuildInputs = [

From cf758ae35572d27f3431a5e836855d4c90f97c7f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 21:52:22 +0200
Subject: [PATCH 273/403] python3Packages.jsonschema-spec: init at 0.1.2

---
 .../jsonschema-spec/default.nix               | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/jsonschema-spec/default.nix

diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix
new file mode 100644
index 000000000000..4e11bd4a27e2
--- /dev/null
+++ b/pkgs/development/python-modules/jsonschema-spec/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, poetry-core
+, jsonschema
+, pathable
+, pyyaml
+, typing-extensions
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "jsonschema-spec";
+  version = "0.1.2";
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "p1c2u";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-RfkD2fVH9OUTe0XNpHO6brQ4+8zbMpae6AgdeFpYXa8=";
+  };
+
+  postPatch = ''
+    sed -i "/--cov/d" pyproject.toml
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    jsonschema
+    pathable
+    pyyaml
+    typing-extensions
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/p1c2u/jsonschema-spec/releases/tag/${version}";
+    description = "JSONSchema Spec with object-oriented paths";
+    homepage = "https://github.com/p1c2u/jsonschema-spec";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30f0eb0d3796..69122a2b0f77 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4832,6 +4832,8 @@ in {
 
   jsonschema = callPackage ../development/python-modules/jsonschema { };
 
+  jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { };
+
   jsonstreams = callPackage ../development/python-modules/jsonstreams { };
 
   json-tricks = callPackage ../development/python-modules/json-tricks { };

From 504d0e24f32372533f858be7ac0145549de14f85 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 21:53:29 +0200
Subject: [PATCH 274/403] python3Packages.openapi-spec-validator: 0.4.0 ->
 0.5.1

https://github.com/p1c2u/openapi-spec-validator/releases/tag/0.5.1
https://github.com/p1c2u/openapi-spec-validator/releases/tag/0.5.0
---
 .../openapi-spec-validator/default.nix         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 2edd46419654..6ee3de6cc37e 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -4,7 +4,10 @@
 , poetry-core
 
 # propagates
+, importlib-resources
 , jsonschema
+, jsonschema-spec
+, lazy-object-proxy
 , openapi-schema-validator
 , pyyaml
 
@@ -18,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "openapi-spec-validator";
-  version = "0.4.0";
+  version = "0.5.1";
   format = "pyproject";
 
   # no tests via pypi sdist
@@ -26,20 +29,18 @@ buildPythonPackage rec {
     owner = "p1c2u";
     repo = pname;
     rev = version;
-    hash = "sha256-mGgHlDZTUo72RNZ/448gkGdza4EntYU9YoBpSKDUCeA=";
+    hash = "sha256-8VhD57dNG0XrPUdcq39GEfHUAgdDwJ8nv+Lp57OpTLg=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'openapi-schema-validator = "^0.2.0"' 'openapi-schema-validator = "*"'
-  '';
-
   nativeBuildInputs = [
     poetry-core
   ];
 
   propagatedBuildInputs = [
+    importlib-resources
     jsonschema
+    jsonschema-spec
+    lazy-object-proxy
     openapi-schema-validator
     pyyaml
   ];
@@ -69,8 +70,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/p1c2u/openapi-spec-validator";
+    changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${version}";
     description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification";
+    homepage = "https://github.com/p1c2u/openapi-spec-validator";
     license = licenses.asl20;
     maintainers = with maintainers; [ rvl ];
   };

From fc7fafcbf0ace64b3016ea65241a6855532bbf2a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 22:13:47 +0200
Subject: [PATCH 275/403] python3Packages.dateparser: fix regex compatibility

Patch by thmo (THomas Moschny) taken from
https://github.com/scrapinghub/dateparser/issues/1045#issuecomment-1129846022.

Also relaxes the regex version constraint.
---
 .../development/python-modules/dateparser/default.nix |  8 ++++++++
 .../python-modules/dateparser/regex-compat.patch      | 11 +++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/python-modules/dateparser/regex-compat.patch

diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index 6d113b178c5a..5c151d518bb9 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -29,7 +29,15 @@ buildPythonPackage rec {
     sha256 = "sha256-bDup3q93Zq+pvwsy/lQy2byOMjG6C/+7813hWQMbZRU=";
   };
 
+  patches = [
+    ./regex-compat.patch
+  ];
+
   postPatch = ''
+    substituteInPlace setup.py --replace \
+      'regex !=2019.02.19,!=2021.8.27,<2022.3.15' \
+      'regex'
+
     # https://github.com/scrapinghub/dateparser/issues/1053
     substituteInPlace tests/test_search.py --replace \
       "('June 2020', datetime.datetime(2020, 6, datetime.datetime.utcnow().day, 0, 0))," \
diff --git a/pkgs/development/python-modules/dateparser/regex-compat.patch b/pkgs/development/python-modules/dateparser/regex-compat.patch
new file mode 100644
index 000000000000..4c69d14f1023
--- /dev/null
+++ b/pkgs/development/python-modules/dateparser/regex-compat.patch
@@ -0,0 +1,11 @@
+--- a/dateparser/languages/locale.py
++++ b/dateparser/languages/locale.py
+@@ -169,7 +169,7 @@ class Locale:
+             if normalize:
+                 value = list(map(normalize_unicode, value))
+             pattern = '|'.join(sorted(value, key=len, reverse=True))
+-            pattern = DIGIT_GROUP_PATTERN.sub(r'?P<n>\d+', pattern)
++            pattern = pattern.replace(r'\d+', r'?P<n>\d+')
+             pattern = re.compile(r'^(?:{})$'.format(pattern), re.UNICODE | re.IGNORECASE)
+             relative_dictionary[pattern] = key
+         return relative_dictionary

From fe1ecd204f70632ca1aaaeb11b4cf73219098b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 15 Sep 2022 22:30:20 +0200
Subject: [PATCH 276/403] python3Packages.radicale_infcloud: 2017-07-27 ->
 unstable-2022-04-18

---
 .../radicale_infcloud/default.nix              | 18 +++++++++++-------
 pkgs/top-level/python-packages.nix             |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix
index 5d3540e01956..580ab59e630b 100644
--- a/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/pkgs/development/python-modules/radicale_infcloud/default.nix
@@ -1,23 +1,27 @@
-{ lib, fetchFromGitHub, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage, radicale }:
 
 buildPythonPackage {
   pname = "radicale_infcloud";
-  version = "2017-07-27";
+  version = "unstable-2022-04-18";
 
   src = fetchFromGitHub {
     owner = "Unrud";
     repo = "RadicaleInfCloud";
-    rev = "972757bf4c6be8b966ee063e3741ced29ba8169f";
-    sha256 = "1c9ql9nv8kwi791akwzd19dcqzd916i7yxzbnrismzw4f5bhgzsk";
+    rev = "53d3a95af5b58cfa3242cef645f8d40c731a7d95";
+    sha256 = "sha256-xzBWIx2OOkCtBjlff1Z0VqgMhxWtgiOKutXUadT3tIo=";
   };
 
-  doCheck = false; # Tries to import radicale, circular dependency
+  propagatedBuildInputs = [ radicale ];
+
+  # has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "radicale" ];
 
   meta = with lib; {
     homepage = "https://github.com/Unrud/RadicaleInfCloud/";
     description = "Integrate InfCloud into Radicale's web interface";
     license = with licenses; [ agpl3 gpl3 ];
-    platforms = platforms.all;
-    maintainers = with maintainers; [ aneeshusa ];
+    maintainers = with maintainers; [ aneeshusa erictapen ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69122a2b0f77..a61cc235d967 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9414,7 +9414,9 @@ in {
 
   rachiopy = callPackage ../development/python-modules/rachiopy { };
 
-  radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { };
+  radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {
+    radicale = pkgs.radicale.override { python3 = python; };
+  };
 
   radio_beam = callPackage ../development/python-modules/radio_beam { };
 

From d79ea2dde35c671d5b93443569efe15fb7fb067e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 15 Sep 2022 22:30:40 +0200
Subject: [PATCH 277/403] python310Packages.autocommand: init at 2.2.1

---
 .../python-modules/autocommand/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/autocommand/default.nix

diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix
new file mode 100644
index 000000000000..0c8dfc54036c
--- /dev/null
+++ b/pkgs/development/python-modules/autocommand/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "autocommand";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "Lucretiel";
+    repo = "autocommand";
+    rev = version;
+    sha256 = "sha256-bjoVGfP57qhvPuHHcMP8JQddAaW4/fEyatElk1UEPZo=";
+  };
+
+  # fails with: SyntaxError: invalid syntax
+  doCheck = false;
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "autocommand" ];
+
+  meta = with lib; {
+    description = " Autocommand turns a python function into a CLI program ";
+    homepage = "https://github.com/Lucretiel/autocommand";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a61cc235d967..93037a89b537 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -885,6 +885,8 @@ in {
 
   autobahn = callPackage ../development/python-modules/autobahn { };
 
+  autocommand = callPackage ../development/python-modules/autocommand { };
+
   autograd = callPackage ../development/python-modules/autograd { };
 
   autoit-ripper = callPackage ../development/python-modules/autoit-ripper { };

From ac4af6c1f88b0ac41c080b8034f724dac93d5490 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 23:22:50 +0200
Subject: [PATCH 278/403] python3Packages.numba: relax setuptools constraint

---
 .../python-modules/numba/default.nix          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index d5404954683a..2ca0e08ba5b1 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -5,10 +5,11 @@
 , fetchPypi
 , python
 , buildPythonPackage
+, setuptools
 , numpy
 , llvmlite
-, setuptools
 , libcxx
+, importlib-metadata
 , substituteAll
 
 # CUDA-only dependencies:
@@ -24,6 +25,7 @@ let
 in buildPythonPackage rec {
   version = "0.56.2";
   pname = "numba";
+  format = "setuptools";
   disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
   src = fetchPypi {
@@ -32,29 +34,27 @@ in buildPythonPackage rec {
   };
 
   postPatch = ''
-    # numpy
     substituteInPlace setup.py \
-      --replace "1.23" "2"
-
-    substituteInPlace numba/__init__.py \
-      --replace "(1, 22)" "(2, 0)"
+      --replace "setuptools<60" "setuptools"
   '';
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
 
+  nativeBuildInputs = lib.optional cudaSupport [
+    addOpenGLRunpath
+  ];
+
   propagatedBuildInputs = [
     numpy
     llvmlite
     setuptools
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    importlib-metadata
   ] ++ lib.optionals cudaSupport [
     cudatoolkit
     cudatoolkit.lib
   ];
 
-  nativeBuildInputs = lib.optional cudaSupport [
-    addOpenGLRunpath
-  ];
-
   patches = lib.optionals cudaSupport [
     (substituteAll {
       src = ./cuda_path.patch;

From 05cdb1e95e3105c867dacc7a1274f2a6eb92902a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 15 Sep 2022 23:23:37 +0200
Subject: [PATCH 279/403] python310Packages.pyspark: make postPatch generic

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

diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index dfce66ee52df..a596a2226c5e 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sed -i "s/'pypandoc'//" setup.py
 
     substituteInPlace setup.py \
-      --replace py4j==0.10.9.3 'py4j>=0.10.9,<0.11'
+      --replace py4j== 'py4j>='
   '';
 
   propagatedBuildInputs = [

From 4a1bbf8de5d4dd14330875dedd6f0d313a82a717 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Sep 2022 23:45:47 +0200
Subject: [PATCH 280/403] python3Packages.selenium: 4.3.0 -> 4.4.2

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

diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index 101135794385..4c7eedf281d3 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "selenium";
-  version = "4.3.0";
+  version = "4.4.2";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "SeleniumHQ";
     repo = "selenium";
-    rev = "refs/tags/selenium-${version}"; # check if there is a newer tag with -python suffix
-    sha256 = "sha256-tD2sJGVBwqB0uOM3zwdNn71+ILYEHPAvWHvoJN24w6E=";
+    rev = "refs/tags/selenium-${version}-python"; # check if there is a newer tag with -python suffix
+    hash = "sha256-sJJ3i4mnGp5fDgo64p6B2vRCqp/Wm99VoyRLyy4nBH8=";
   };
 
   postPatch = ''

From 3e6c255b329cb1438436d54113fc46d8907a9488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 15 Sep 2022 23:52:59 +0200
Subject: [PATCH 281/403] python310Packages.eth-abi: 3.0.0 -> 3.0.1

---
 pkgs/development/python-modules/eth-abi/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix
index 7bf0f9b49710..dc9b2f7895cd 100644
--- a/pkgs/development/python-modules/eth-abi/default.nix
+++ b/pkgs/development/python-modules/eth-abi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "eth-abi";
-  version = "3.0.0";
+  version = "3.0.1";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-abi";
     rev = "v${version}";
-    sha256 = "sha256-qiuyGVOy+n8l3jSqwMGnBXcDrOxIiJ0lNP4lq/EQEhU=";
+    sha256 = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY=";
   };
 
   postPatch = ''
@@ -33,6 +33,9 @@ buildPythonPackage rec {
     parsimonious
   ];
 
+  # lots of: TypeError: isinstance() arg 2 must be a type or tuple of types
+  doCheck = false;
+
   checkInputs = [
     hypothesis
     pytestCheckHook

From fa380853c34fa96bfb8c5278a81844e8f7a4365d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 16 Sep 2022 00:17:14 +0200
Subject: [PATCH 282/403] python310Packages.eth-keys: disable broken tests

---
 pkgs/development/python-modules/eth-keys/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix
index efdde22b8b90..47e43efef681 100644
--- a/pkgs/development/python-modules/eth-keys/default.nix
+++ b/pkgs/development/python-modules/eth-keys/default.nix
@@ -41,6 +41,14 @@ buildPythonPackage rec {
   ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3
   ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome;
 
+  disabledTests = [
+    # tests are broken
+    "test_compress_decompress_inversion"
+    "test_public_key_generation_is_equal"
+    "test_signing_is_equal"
+    "test_native_to_coincurve_recover"
+  ];
+
   pythonImportsCheck = [ "eth_keys" ];
 
   passthru.optional-dependencies = {

From 227920fe6b77ff7e0c0032d075dbbacc6d8f32ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 16 Sep 2022 00:17:24 +0200
Subject: [PATCH 283/403] python310Packages.py-eth-sig-utils: disable tests

---
 pkgs/development/python-modules/py-eth-sig-utils/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
index 1dfc8904fe00..3ef63cd1926e 100644
--- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix
+++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
@@ -26,6 +26,9 @@ buildPythonPackage rec {
     rlp
   ];
 
+  # lots of: isinstance() arg 2 must be a type or tuple of types
+  doCheck = false;
+
   checkPhase = ''
     ${python.interpreter} -m unittest
   '';

From 72b05490748832db812be179cb0dc774fd23c0f8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 01:23:23 +0200
Subject: [PATCH 284/403] python3Packages.pylama: propagate setuptools for
 pkg_resources import

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

diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index 41e2b86202d7..5875112c99fd 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -10,6 +10,7 @@
 , pydocstyle
 , pyflakes
 , vulture
+, setuptools
 , isort
 , pylint
 , pytestCheckHook
@@ -43,6 +44,7 @@ let pylama = buildPythonPackage rec {
     pycodestyle
     pydocstyle
     pyflakes
+    setuptools
     vulture
   ];
 

From e118a8d81f72dc6712640a127b530ac053a01b26 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 01:39:11 +0200
Subject: [PATCH 285/403] python3Packages.clikit: relax crashtest constraint,
 enable tests

---
 .../python-modules/clikit/default.nix         | 67 ++++++++++++++-----
 1 file changed, 52 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index 1f6be754be19..af366cdbec06 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -1,26 +1,63 @@
-{ lib, buildPythonPackage, fetchPypi
-, isPy27, pythonAtLeast
-, pylev, pastel, typing ? null, enum34 ? null, crashtest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pythonAtLeast
+, poetry-core
+
+# propagates
+, pylev
+, pastel
+
+# python36+
+, crashtest
+
+# python2
+, typing
+, enum34
+
+# tests
+, pytest-mock
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "clikit";
   version = "0.6.2";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ngdkmb73gkp5y00q7r9k1cdlfn0wyzws2wrqlshc4hlkbdyabj4";
+  src = fetchFromGitHub {
+    owner = "sdispater";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA=";
   };
 
-  propagatedBuildInputs = [
-    pylev pastel
-  ]
-    ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ]
-    ++ lib.optionals isPy27 [ typing enum34 ];
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace \
+      'crashtest = { version = "^0.3.0", python = "^3.6" }' \
+      'crashtest = { version = "*", python = "^3.6" }'
+  '';
 
-  # The Pypi tarball doesn't include tests, and the GitHub source isn't
-  # buildable until we bootstrap poetry, see
-  # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665
-  doCheck = false;
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    pylev
+    pastel
+  ]
+  ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ]
+  ++ lib.optionals isPy27 [ typing enum34 ];
+
+  checkInputs = [
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "clikit"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/sdispater/clikit";

From b60e4d71d6cb9cdf4b53948d64bb5edb6ac4902f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 01:54:14 +0200
Subject: [PATCH 286/403] python3Packages.python-ldap: rename from ldap

---
 pkgs/applications/finance/odoo/default.nix    |  2 +-
 .../networking/powerdns-admin/default.nix     |  2 +-
 .../django-auth-ldap/default.nix              |  4 +-
 .../python-modules/ldappool/default.nix       |  4 +-
 .../{ldap => python-ldap}/default.nix         | 39 ++++++++++++-------
 .../python-modules/suseapi/default.nix        |  4 +-
 pkgs/os-specific/linux/sssd/default.nix       |  4 +-
 pkgs/servers/ldap/389/default.nix             |  2 +-
 pkgs/tools/security/adenum/default.nix        |  2 +-
 pkgs/tools/security/ldapmonitor/default.nix   |  2 +-
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  8 ++--
 12 files changed, 44 insertions(+), 30 deletions(-)
 rename pkgs/development/python-modules/{ldap => python-ldap}/default.nix (54%)

diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix
index c755b0fb6678..9ae2d97a3d28 100644
--- a/pkgs/applications/finance/odoo/default.nix
+++ b/pkgs/applications/finance/odoo/default.nix
@@ -120,7 +120,7 @@ in python.pkgs.buildPythonApplication rec {
     pypdf2
     pyserial
     python-dateutil
-    ldap
+    python-ldap
     python-stdnum
     pytz
     pyusb
diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix
index cc31f25390a7..d8b4a6b2f329 100644
--- a/pkgs/applications/networking/powerdns-admin/default.nix
+++ b/pkgs/applications/networking/powerdns-admin/default.nix
@@ -32,7 +32,7 @@ let
   pythonDeps = with python.pkgs; [
     flask flask_assets flask_login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify
     mysqlclient psycopg2 sqlalchemy
-    cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython
+    cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython
     gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core
     lima pytimeparse pyyaml jinja2 itsdangerous werkzeug
   ];
diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix
index b3596e1e4444..e1ca5f418afb 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -7,8 +7,8 @@
 , setuptools-scm
 
 # runtime
-, ldap
 , django
+, python-ldap
 
 # tests
 , python
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     django
-    ldap
+    python-ldap
   ];
 
   # ValueError: SCHEMADIR is None, ldap schemas are missing.
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index a3cb21c10972..4697c80680af 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi
-, pbr, ldap, prettytable, fixtures, testresources, testtools }:
+, pbr, python-ldap, prettytable, fixtures, testresources, testtools }:
 
 buildPythonPackage rec {
   pname = "ldappool";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ pbr ];
 
-  propagatedBuildInputs = [ ldap prettytable ];
+  propagatedBuildInputs = [ python-ldap prettytable ];
 
   checkInputs = [ fixtures testresources testtools ];
 
diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix
similarity index 54%
rename from pkgs/development/python-modules/ldap/default.nix
rename to pkgs/development/python-modules/python-ldap/default.nix
index ceaf4f6bf83a..ea9e8ca852d7 100644
--- a/pkgs/development/python-modules/ldap/default.nix
+++ b/pkgs/development/python-modules/python-ldap/default.nix
@@ -1,21 +1,39 @@
-{ buildPythonPackage, fetchPypi
-, pyasn1, pyasn1-modules
-, pythonAtLeast, pytestCheckHook
-, openldap, cyrus_sasl, lib, stdenv }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pyasn1
+, pyasn1-modules
+, pythonAtLeast
+, pythonOlder
+, pytestCheckHook
+, openldap
+, cyrus_sasl
+}:
 
 buildPythonPackage rec {
   pname = "python-ldap";
   version = "3.4.2";
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc=";
+    hash = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc=";
   };
 
-  propagatedBuildInputs = [ pyasn1 pyasn1-modules ];
+  buildInputs = [
+    openldap
+    cyrus_sasl
+  ];
 
-  checkInputs = [ pytestCheckHook ];
-  buildInputs = [ openldap cyrus_sasl ];
+  propagatedBuildInputs = [
+    pyasn1
+    pyasn1-modules
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   preCheck = ''
     # Needed by tests to setup a mockup ldap server.
@@ -25,11 +43,6 @@ buildPythonPackage rec {
     export SCHEMA="${openldap}/etc/schema"
   '';
 
-  disabledTests = lib.optionals (pythonAtLeast "3.9") [
-    # See https://github.com/python-ldap/python-ldap/issues/407
-    "test_simple_bind_noarg"
-  ];
-
   doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix
index bcf35d1f5f70..83925dd64d93 100644
--- a/pkgs/development/python-modules/suseapi/default.nix
+++ b/pkgs/development/python-modules/suseapi/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , django
 , suds-jurko
-, ldap
+, python-ldap
 , mechanize
 , beautifulsoup4
 , pyxdg
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    django suds-jurko ldap mechanize beautifulsoup4 pyxdg python-dateutil requests
+    django suds-jurko python-ldap mechanize beautifulsoup4 pyxdg python-dateutil requests
   ];
 
   buildInputs = [ httpretty ];
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index ba655e75be54..462151ff64f7 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export SGML_CATALOG_FILES="${docbookFiles}"
-    export PYTHONPATH=$(find ${python3.pkgs.ldap} -type d -name site-packages)
+    export PYTHONPATH=$(find ${python3.pkgs.python-ldap} -type d -name site-packages)
     export PATH=$PATH:${openldap}/libexec
 
     configureFlagsArray=(
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
                   samba nfs-utils p11-kit python3 popt
                   talloc tdb tevent ldb pam openldap pcre2 libkrb5
                   cifs-utils glib keyutils dbus fakeroot libxslt libxml2
-                  libuuid python3.pkgs.ldap systemd nspr check cmocka uid_wrapper
+                  libuuid python3.pkgs.python-ldap systemd nspr check cmocka uid_wrapper
                   nss_wrapper ncurses Po4a http-parser jansson jose ];
 
   makeFlags = [
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index aa46426142bd..438d7d0e630f 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     # lib389
     (python3.withPackages (ps: with ps; [
       setuptools
-      ldap
+      python-ldap
       six
       pyasn1
       pyasn1-modules
diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/tools/security/adenum/default.nix
index 8bcac264d95d..24d318968ad8 100644
--- a/pkgs/tools/security/adenum/default.nix
+++ b/pkgs/tools/security/adenum/default.nix
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python3.pkgs; [
     impacket
     pwntools
-    ldap
+    python-ldap
   ] ++ [
     john
   ];
diff --git a/pkgs/tools/security/ldapmonitor/default.nix b/pkgs/tools/security/ldapmonitor/default.nix
index 83035de4d20c..410aa4ca87ed 100644
--- a/pkgs/tools/security/ldapmonitor/default.nix
+++ b/pkgs/tools/security/ldapmonitor/default.nix
@@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     impacket
-    ldap
     ldap3
+    python-ldap
   ];
 
   installPhase = ''
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 6f9f6accd927..e6c9434a1198 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -95,6 +95,7 @@ mapAliases ({
   influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
   jupyter_client = jupyter-client; # added 2021-10-15
   Keras = keras; # added 2021-11-25
+  ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   loo-py = loopy; # added 2022-05-03
   Markups = markups; # added 2022-02-14
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93037a89b537..b3bca6b0d3ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5071,10 +5071,6 @@ in {
 
   lc7001 = callPackage ../development/python-modules/lc7001 { };
 
-  ldap = callPackage ../development/python-modules/ldap {
-    inherit (pkgs) openldap cyrus_sasl;
-  };
-
   ldap3 = callPackage ../development/python-modules/ldap3 { };
 
   ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { };
@@ -8935,6 +8931,10 @@ in {
 
   python_keyczar = callPackage ../development/python-modules/python_keyczar { };
 
+  python-ldap = callPackage ../development/python-modules/python-ldap {
+    inherit (pkgs) openldap cyrus_sasl;
+  };
+
   python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
 
   python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { };

From 3bc2615c681d9c25b5eba75cbd2b050133813ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 16 Sep 2022 12:21:20 +0200
Subject: [PATCH 287/403] python310Packages.ujson: 5.4.0 -> 5.5.0

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

diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix
index ee2fede8e9f8..15e71e9544d9 100644
--- a/pkgs/development/python-modules/ujson/default.nix
+++ b/pkgs/development/python-modules/ujson/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPyPy
 , pytestCheckHook
 , pythonOlder
 , setuptools-scm
@@ -9,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "ujson";
-  version = "5.4.0";
-  disabled = isPyPy || pythonOlder "3.7";
+  version = "5.5.0";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-a5U+CUQeMHUEEwdV5b1rFYUBeNWR9mKSu6RgjE9/mwA=";
+    sha256 = "sha256-slB3qXHH2ke9aEapEqdH9pY3dtkHIMiGA7G1XYF5B4A=";
   };
 
   nativeBuildInputs = [

From 606d511ef6e4081ab5baaa4d7d98eaa19b9e26b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 14:00:08 +0200
Subject: [PATCH 288/403] python3Packages.pytest-logdog: propagate setuptools

Uses pkg_resources, but does not declare a dependency on it.
---
 pkgs/development/python-modules/pytest-logdog/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix
index c626a1cfac9e..bba0f092fd3f 100644
--- a/pkgs/development/python-modules/pytest-logdog/default.nix
+++ b/pkgs/development/python-modules/pytest-logdog/default.nix
@@ -4,6 +4,7 @@
 , pytest
 , pytestCheckHook
 , pythonOlder
+, setuptools
 , setuptools-scm
 }:
 
@@ -31,6 +32,9 @@ buildPythonPackage rec {
     pytest
   ];
 
+  propagatedBuildInputs = [
+    setuptools
+  ];
 
   checkInputs = [
     pytestCheckHook

From 39feebbf61cb937eafa23cbb486acc0244cca416 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 14:01:21 +0200
Subject: [PATCH 289/403] python3Packages.amqtt: relax transitions constraint

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

diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix
index 71c07c07cc9b..5e42a6ea1f5b 100644
--- a/pkgs/development/python-modules/amqtt/default.nix
+++ b/pkgs/development/python-modules/amqtt/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
     hash = "sha256-8T1XhBSOiArlUQbQ41LsUogDgOurLhf+M8mjIrrAC4s=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'transitions = "^0.8.0"' 'transitions = "*"'
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];

From e7cf8da2d06a6e8f78e364d3eb42d02df578c13a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 14:01:36 +0200
Subject: [PATCH 290/403] python3Packages.pluggy: use pyproject format

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

diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix
index 8d1fcbed3a7f..46aebb519500 100644
--- a/pkgs/development/python-modules/pluggy/default.nix
+++ b/pkgs/development/python-modules/pluggy/default.nix
@@ -9,25 +9,22 @@
 buildPythonPackage rec {
   pname = "pluggy";
   version = "1.0.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159";
   };
 
-  checkPhase = ''
-    py.test
-  '';
-
-  # To prevent infinite recursion with pytest
-  doCheck = false;
-
   nativeBuildInputs = [ setuptools-scm ];
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
     importlib-metadata
   ];
 
+  # To prevent infinite recursion with pytest
+  doCheck = false;
+
   meta = {
     description = "Plugin and hook calling mechanisms for Python";
     homepage = "https://github.com/pytest-dev/pluggy";

From 6aa094d7535caee5d6726b3da29799d307e40604 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 16:07:05 +0200
Subject: [PATCH 291/403] protobuf: update to 3.21.x

Required for the latest python google-api-core version.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c418b06b7e1e..78c8b3cb65d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21155,7 +21155,7 @@ with pkgs;
 
   prospector = callPackage ../development/tools/prospector { };
 
-  protobuf = protobuf3_19;
+  protobuf = protobuf3_21;
 
   protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { };
   protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { };

From b0312b879412c581372b704ddc76f9a0e4744f9c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 16:12:39 +0200
Subject: [PATCH 292/403] python3Packages.archinfo: 9.2.15 -> 9.2.18

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

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 263b99997149..fa91ebe356fa 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.15";
+  version = "9.2.18";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-K9EAyCvwgWhiZ+rkPKPGBr3lWYIIRCf0FAzPjIjrcU8=";
+    hash = "sha256-atLc02FoW2cmlvA/jzRsOeXEY9cyrSeLSl3+pO5nNKA=";
   };
 
   nativeBuildInputs = [

From 266ce4914f64ec96fce44a75c1a65ad419b329ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 16:32:26 +0200
Subject: [PATCH 293/403] python3Packages.requirements-parser: propagate
 setuptools

---
 pkgs/development/python-modules/requirements-parser/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix
index 3d51f4741af6..3e26c91014a4 100644
--- a/pkgs/development/python-modules/requirements-parser/default.nix
+++ b/pkgs/development/python-modules/requirements-parser/default.nix
@@ -4,6 +4,7 @@
 , poetry-core
 , pytestCheckHook
 , pythonOlder
+, setuptools
 , types-setuptools
 }:
 
@@ -26,6 +27,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    setuptools
     types-setuptools
   ];
 

From 173569088a94c7e7beb3f770aebfdfe3aec5519e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 17:55:12 +0200
Subject: [PATCH 294/403] python3Packages.javaproperties: add setuptools to
 nativeBuildInputs

and migrate checkphase to the pytest hook.
---
 .../python-modules/javaproperties/default.nix | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix
index 6b2bac8ad65f..3132c873246f 100644
--- a/pkgs/development/python-modules/javaproperties/default.nix
+++ b/pkgs/development/python-modules/javaproperties/default.nix
@@ -1,7 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
 , setuptools
 , six
-, pytest
+, pytestCheckHook
 , python-dateutil
 }:
 
@@ -17,14 +19,26 @@ buildPythonPackage rec {
     sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp";
   };
 
-  nativeBuildInputs = [ setuptools ];
-  propagatedBuildInputs = [ six ];
+  nativeBuildInputs = [
+    setuptools
+  ];
 
-  checkInputs = [ python-dateutil pytest ];
-  checkPhase = ''
-    rm tox.ini
-    pytest -k 'not dumps and not time' --ignore=test/test_propclass.py
-  '';
+  propagatedBuildInputs = [
+    six
+  ];
+
+  checkInputs = [
+    python-dateutil
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    "time"
+  ];
+
+  disabledTestPaths = [
+    "test/test_propclass.py"
+  ];
 
   meta = with lib; {
     description = "Microsoft Azure API Management Client Library for Python";

From 12589b39b7a1fcb2e20a74cd92b454bdaa2988e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 18:10:52 +0200
Subject: [PATCH 295/403] python3Packages.aioresponses: propagate setuptools

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

diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index a23b1eca77ca..3c2a0e48d329 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -7,6 +7,7 @@
 , pbr
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -27,6 +28,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     aiohttp
+    setuptools
   ];
 
   checkInputs = [

From 62bc7297006e980d0ed4d1d979064ec7cd6254bf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 18:34:20 +0200
Subject: [PATCH 296/403] python3Packages.schema-salad: mark as broken

Depends on an outdated version of mistune (pins <0.9, current is 2.0.4).
---
 .../python-modules/schema-salad/default.nix            | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index d986c4ed69b5..ae1627f888f3 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -2,6 +2,7 @@
 , black
 , buildPythonPackage
 , fetchPypi
+, setuptools-scm
 , cachecontrol
 , lockfile
 , mistune
@@ -23,6 +24,10 @@ buildPythonPackage rec {
     hash = "sha256-18/xLIq1+yM8iQBIeXvRIO4A5GqZS/3qOKXmi439+sQ=";
   };
 
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     cachecontrol
     lockfile
@@ -35,6 +40,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ] ++ passthru.optional-dependencies.pycodegen;
 
+  preCheck = ''
+    rm tox.ini
+  '';
+
   disabledTests = [
     # Setup for these tests requires network access
     "test_secondaryFiles"
@@ -52,6 +61,7 @@ buildPythonPackage rec {
   };
 
   meta = with lib; {
+    broken = true; # disables on outdated version of mistune
     description = "Semantic Annotations for Linked Avro Data";
     homepage = "https://github.com/common-workflow-language/schema_salad";
     license = with licenses; [ asl20 ];

From 09b2bf488f3a54df8a05fc8ee6b7786eb27b6011 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 18:39:37 +0200
Subject: [PATCH 297/403] platformio: relax wsproto constraint

---
 pkgs/development/embedded/platformio/core.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index 9bb197c0bd40..fcb4e7d5fda3 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -21,7 +21,8 @@ with python3.pkgs; buildPythonApplication rec {
       --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}'
 
     substituteInPlace setup.py \
-      --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"'
+      --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \
+      --replace 'wsproto==' 'wsproto>='
   '';
 
   propagatedBuildInputs = [

From 6182f82dbe01d1c6b4988c11864744543aca131d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 18:46:11 +0200
Subject: [PATCH 298/403] python3Packages.phone-mode: relax aioserial
 constraint

---
 pkgs/development/python-modules/phone-modem/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/phone-modem/default.nix b/pkgs/development/python-modules/phone-modem/default.nix
index 3d5a9d783727..0202e2c411b4 100644
--- a/pkgs/development/python-modules/phone-modem/default.nix
+++ b/pkgs/development/python-modules/phone-modem/default.nix
@@ -17,6 +17,11 @@ buildPythonPackage rec {
     sha256 = "sha256-7NahK9l67MdT/dDVXsq+y0Z4cZxZ/WUW2kPpE4Wz6j0=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "aioserial==1.3.0" "aioserial"
+  '';
+
   propagatedBuildInputs = [
     aioserial
   ];

From ccb6cb09e606f426d16781a04053828905e37702 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 18:51:02 +0200
Subject: [PATCH 299/403] python3Packages.ttls: propagate setuptools

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

diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix
index 9f5917749e67..ea1d3b789152 100644
--- a/pkgs/development/python-modules/ttls/default.nix
+++ b/pkgs/development/python-modules/ttls/default.nix
@@ -5,6 +5,7 @@
 , fetchFromGitHub
 , poetry-core
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -28,6 +29,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     aiohttp
     colour
+    setuptools
   ];
 
   # Module has no tests

From ccdc6e1f4cdd5f390bb674bf5761292e89c0e486 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 19:03:25 +0200
Subject: [PATCH 300/403] python3Packages.certbot: ignore DeprecationWarnings
 during test

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

diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 53c7c397f981..8bef6cf2148e 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -49,6 +49,7 @@ buildPythonPackage rec {
     "-o cache_dir=$(mktemp -d)"
     # See https://github.com/certbot/certbot/issues/8746
     "-W ignore::ResourceWarning"
+    "-W ignore::DeprecationWarning"
   ];
 
   doCheck = true;

From e944d4fe3dea48360f3efa2ac9301438da0a3927 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 19:12:53 +0200
Subject: [PATCH 301/403] python3Packages.gql: 3.1.0 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix
index 0c8b2bd9378a..2adcf894dcca 100644
--- a/pkgs/development/python-modules/gql/default.nix
+++ b/pkgs/development/python-modules/gql/default.nix
@@ -1,6 +1,7 @@
 { lib
 , aiofiles
 , aiohttp
+, backoff
 , botocore
 , buildPythonPackage
 , fetchFromGitHub
@@ -8,6 +9,7 @@
 , mock
 , parse
 , pytest-asyncio
+, pytest-console-scripts
 , pytestCheckHook
 , pythonOlder
 , requests
@@ -34,6 +36,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     aiohttp
+    backoff
     botocore
     graphql-core
     requests
@@ -48,10 +51,19 @@ buildPythonPackage rec {
     mock
     parse
     pytest-asyncio
+    pytest-console-scripts
     pytestCheckHook
     vcrpy
   ];
 
+  preCheck = ''
+    export PATH=$out/bin:$PATH
+  '';
+
+  pytestFlagsArray = [
+    "--asyncio-mode=legacy"
+  ];
+
   disabledTests = [
     # Tests requires network access
     "test_execute_result_error"

From 0c45c1a09b5782ba4dfefa69eac4e0698e22fb9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 19:18:13 +0200
Subject: [PATCH 302/403] python3Packages.pipdeptree: 2.2.1 -> 2.3.1

---
 .../python-modules/pipdeptree/default.nix     | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index b6dbfe53d8d9..945093dffd0b 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -2,31 +2,51 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
-, tox
+, diff-cover
+, graphviz
+, hatchling
+, hatch-vcs
+, pytest-mock
+, pytestCheckHook
 , pip
+, virtualenv
 }:
 
 buildPythonPackage rec {
   pname = "pipdeptree";
-  version = "2.2.1";
+  version = "2.3.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.4";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "naiquevin";
     repo = "pipdeptree";
-    rev = "${version}";
-    sha256 = "sha256-CL0li/79qptOtOGLwder5s0+6zv7+PUnl+bD6p+XBtA=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-X3SVQzBg+QjBSewRsfiyLqIea0duhe1nUf8ancWLvcI=";
   };
 
-  propagatedBuildInputs = [
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    hatchling
+    hatch-vcs
+  ];
+
+  propagatedBuildInput = [
     pip
   ];
 
+  passthru.optional-dependencies = {
+    graphviz = [ graphviz ];
+  };
+
   checkInputs = [
-    tox
-  ];
+    diff-cover
+    pytest-mock
+    pytestCheckHook
+    virtualenv
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   pythonImportsCheck = [
     "pipdeptree"

From 73fed7827ceb2f652a3f592c4d537ba083f20518 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 16 Sep 2022 19:19:45 +0200
Subject: [PATCH 303/403] python3Packages.backoff: use pyproject format

---
 .../python-modules/backoff/default.nix        | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix
index 9671b7b5a267..e62533f491cb 100644
--- a/pkgs/development/python-modules/backoff/default.nix
+++ b/pkgs/development/python-modules/backoff/default.nix
@@ -1,8 +1,16 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, responses }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+, pytest-asyncio
+, responses
+}:
 
 buildPythonPackage rec {
   pname = "backoff";
   version = "2.1.2";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "litl";
@@ -11,11 +19,19 @@ buildPythonPackage rec {
     sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI=";
   };
 
-  format = "pyproject";
+  nativeBuildInputs = [
+    poetry-core
+  ];
 
-  nativeBuildInputs = [ poetry ];
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+    responses
+  ];
 
-  checkInputs = [ pytestCheckHook pytest-asyncio responses ];
+  pythonImportsCheck = [
+    "backoff"
+  ];
 
   meta = with lib; {
     description = "Function decoration for backoff and retry";

From c2f03aa6f15746e69a7d884982224a8dee3a0388 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 00:36:08 +0200
Subject: [PATCH 304/403] easycrypt-runtest: use other format

---
 pkgs/applications/science/logic/easycrypt/runtest.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/logic/easycrypt/runtest.nix b/pkgs/applications/science/logic/easycrypt/runtest.nix
index 79a034b93693..c0d72d96e1d1 100644
--- a/pkgs/applications/science/logic/easycrypt/runtest.nix
+++ b/pkgs/applications/science/logic/easycrypt/runtest.nix
@@ -2,6 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   inherit (easycrypt) src version;
+  format = "other";
 
   pname = "easycrypt-runtest";
 

From 99e2cf4e9486607c9f392c0fd9b3e9110cf713dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 00:37:19 +0200
Subject: [PATCH 305/403] headphones: use other format

---
 pkgs/servers/headphones/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix
index f39390f5ea92..9ebf04b80bdd 100644
--- a/pkgs/servers/headphones/default.nix
+++ b/pkgs/servers/headphones/default.nix
@@ -3,6 +3,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "headphones";
   version = "0.6.0-beta.5";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "rembo10";

From 557e932a6408f5dfcaf803cc498237cbead9aae1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 00:39:44 +0200
Subject: [PATCH 306/403] python3Packages.atenpdu: propagate async-timeout

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

diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix
index d2f4cc0af8ce..e14b68c35507 100644
--- a/pkgs/development/python-modules/atenpdu/default.nix
+++ b/pkgs/development/python-modules/atenpdu/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, async-timeout
 , pysnmp
 }:
 
@@ -13,7 +14,10 @@ buildPythonPackage rec {
     sha256 = "sha256-vvq8InmJUgvm/PpvZutpsBR3Fj1gR+xrkgfEGlw04Ek=";
   };
 
-  propagatedBuildInputs = [ pysnmp ];
+  propagatedBuildInputs = [
+    async-timeout
+    pysnmp
+  ];
 
   # Project has no test
   doCheck = false;

From 14fbd3df87c31f0f1a261a57e6a7f45195427e08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 01:06:17 +0200
Subject: [PATCH 307/403] python3Packages.clize: add setuptools to
 nativeBuildInputs

relax attrs constraints and use pyproject format.
---
 pkgs/development/python-modules/clize/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix
index 1b0caeaaf266..f1e5b16320b6 100644
--- a/pkgs/development/python-modules/clize/default.nix
+++ b/pkgs/development/python-modules/clize/default.nix
@@ -2,6 +2,9 @@
 , buildPythonPackage
 , fetchPypi
 
+# build
+, setuptools
+
 # propagtes
 , sigtools
 , six
@@ -21,6 +24,7 @@
 buildPythonPackage rec {
   pname = "clize";
   version = "4.2.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -29,9 +33,14 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "docutils ~= 0.17.0" "docutils"
+      --replace "docutils ~= 0.17.0" "docutils" \
+      --replace "attrs>=19.1.0,<22" "attrs>=19.1.0"
   '';
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     attrs
     docutils

From 1d0965044eb635b41f6b2523c3c1c43a18af28d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 01:24:11 +0200
Subject: [PATCH 308/403] python3Packages.cx_Freeze: relax setuptools
 constraint

---
 pkgs/development/python-modules/cx_freeze/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 454e2e8f2ccf..cb4f7e074ffa 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -1,11 +1,12 @@
 { stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }:
 
 buildPythonPackage rec {
-  pname = "cx_Freeze";
+  pname = "cx-freeze";
   version = "6.11.1";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "cx_Freeze";
+    inherit version;
     sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw=";
   };
 
@@ -17,8 +18,11 @@ buildPythonPackage rec {
   ];
 
   # timestamp need to come after 1980 for zipfiles and nix store is set to epoch
-  prePatch = ''
+  postPatch = ''
     substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()"
+
+    substituteInPlace setup.cfg \
+      --replace "setuptools>=59.0.1,<=60.10.0" "setuptools>=59.0.1"
   '';
 
   # fails to find Console even though it exists on python 3.x

From b461a549c9d810516d260f4662d011a09038ae14 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 01:32:46 +0200
Subject: [PATCH 309/403] python3Packages.nats-python: propagate setuptools

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

diff --git a/pkgs/development/python-modules/nats-python/default.nix b/pkgs/development/python-modules/nats-python/default.nix
index 5bf5b2a6d21c..9662dddd5ddb 100644
--- a/pkgs/development/python-modules/nats-python/default.nix
+++ b/pkgs/development/python-modules/nats-python/default.nix
@@ -4,6 +4,7 @@
 , fetchpatch
 , poetry-core
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -32,6 +33,10 @@ buildPythonPackage rec {
     })
   ];
 
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
   # Tests require a running NATS server
   doCheck = false;
 

From 221754c5ca1b4a6734d91a73da6f9b3ecc2364d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 01:34:56 +0200
Subject: [PATCH 310/403] python3Packages.nunavut: relax pydsdl constraint

---
 pkgs/development/python-modules/nunavut/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix
index 117d5cfdd14f..5b8fb246641a 100644
--- a/pkgs/development/python-modules/nunavut/default.nix
+++ b/pkgs/development/python-modules/nunavut/default.nix
@@ -10,14 +10,20 @@
  buildPythonPackage rec {
   pname = "nunavut";
   version = "1.8.3";
+  format = "setuptools";
 
-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-JI+0IpQWikE6vXfpZHWsVjx3JPaVJ/f4oAjTSNs1Wuk=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "pydsdl ~= 1.16" "pydsdl"
+  '';
+
   propagatedBuildInputs = [
     importlib-resources
     pydsdl

From 6e51c3ee475a06106eddf5431b38b073c5080a54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 01:50:55 +0200
Subject: [PATCH 311/403] python3Packages.widgetsnbextension: add
 jupyter-packaging to nativeBuildInputs

---
 .../python-modules/widgetsnbextension/default.nix   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index 800851a87a34..7b077d14c58e 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, jupyter-packaging
 , notebook
 , ipywidgets
 }:
@@ -15,20 +16,16 @@ buildPythonPackage rec {
     hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY=";
   };
 
-  # setup.py claims to require notebook, but the source doesn't have any imports
-  # in it.
-  postPatch = ''
-    substituteInPlace setup.py --replace "'notebook>=4.4.1'," ""
-  '';
-
-  propagatedBuildInputs = [ ];
+  nativeBuildInputs = [
+    jupyter-packaging
+  ];
 
   # No tests in archive
   doCheck = false;
 
   meta = {
     description = "IPython HTML widgets for Jupyter";
-    homepage = "http://ipython.org/";
+    homepage = "https://github.com/jupyter-widgets/ipywidgets/tree/master/python/widgetsnbextension";
     license = ipywidgets.meta.license; # Build from same repo
     maintainers = with lib.maintainers; [ fridh ];
   };

From 9ec63fb7a72bbdbb3444a4682257367f1273df7e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 03:06:09 +0200
Subject: [PATCH 312/403] zpool-iostat-viz: build using format other

---
 pkgs/tools/filesystems/zpool-iostat-viz/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix
index f5eb7c7f02ef..a9e4dfe8ab74 100644
--- a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix
+++ b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix
@@ -7,6 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "zpool-iostat-viz";
   version = "unstable-2021-11-13";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "chadmiller";

From 0ebde8969685fa1fef6e35f0e2d1f30f3f99db8b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:08:56 +0200
Subject: [PATCH 313/403] home-assistant-component-tests: build with format
 other

---
 pkgs/servers/home-assistant/tests.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 7703bc6b2832..196da7e63953 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -70,6 +70,7 @@ let
 in lib.listToAttrs (map (component: lib.nameValuePair component (
   home-assistant.overridePythonAttrs (old: {
     pname = "homeassistant-test-${component}";
+    format = "other";
 
     dontBuild = true;
     dontInstall = true;

From ad824e40c57f5b1d67e7c304d3915ba1cdd8c246 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:29:27 +0200
Subject: [PATCH 314/403] python3Packages.aioesphomeapi: relax protobuf
 constraint

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

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 67decf5ced07..8e8ca60af7e8 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -24,6 +24,11 @@ buildPythonPackage rec {
     sha256 = "sha256-ZaNrSkRH9pFhzZncCs37k1M0w5svPfrY0WxePUnUlms=";
   };
 
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "protobuf>=3.12.2,<4.0" "protobuf>=3.12.2"
+  '';
+
   propagatedBuildInputs = [
     noiseprotocol
     protobuf

From 1b1125a703aab37ee89a8df803f767232347391f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:29:38 +0200
Subject: [PATCH 315/403] python3Packages.hangups: relax protobuf constraint

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

diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix
index 18dd31f8af56..9782a89114a9 100644
--- a/pkgs/development/python-modules/hangups/default.nix
+++ b/pkgs/development/python-modules/hangups/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "protobuf>=3.1.0,<3.20" "protobuf" \
+      --replace "protobuf>=3.1.0,<4" "protobuf" \
       --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup"
   '';
 

From bea969ab40690ee997638f432a76208402ade228 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:34:54 +0200
Subject: [PATCH 316/403] home-assistant: drop pydantic override

---
 pkgs/servers/home-assistant/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 0cd59c21ad18..01dc882c156a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -177,19 +177,6 @@ let
       });
     })
 
-    # pyunifiprotect excludes pydantic==1.9.1
-    (self: super: {
-      pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec {
-        version = "1.9.0";
-        src = fetchFromGitHub {
-          owner = "samuelcolvin";
-          repo = "pydantic";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM=";
-        };
-      });
-    })
-
     (self: super: {
       pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
         doCheck = false; # requires pytest-aiohttp>=1.0.0

From ad67fa694727de2aad5cca8343420ea27095615d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:35:13 +0200
Subject: [PATCH 317/403] python3Packages.pyunifiprotect: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index 03070e5a3374..11d325750913 100644
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -20,6 +20,7 @@
 , python-dotenv
 , pythonOlder
 , pytz
+, setuptools
 , termcolor
 , typer
 , ffmpeg
@@ -46,6 +47,10 @@ buildPythonPackage rec {
       --replace "pydantic!=1.9.1" "pydantic"
   '';
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     aiofiles
     aiohttp

From 1fbc586713727bdc5f8efd8ed85f2a2c0d64b44e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:35:29 +0200
Subject: [PATCH 318/403] python3Packages.pychromecast: relax protobuf
 constraint

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

diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index 9dce1cfa7938..727a46375bed 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -21,6 +21,11 @@ buildPythonPackage rec {
     sha256 = "sha256-nlfcmFpKBdtb3NXaIZy/bO0lVIygk/jXS8EHs8VU7AA=";
   };
 
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "protobuf>=3.19.1,<4" "protobuf>=3.19.1"
+  '';
+
   propagatedBuildInputs = [
     casttube
     protobuf

From 2428c85be99b628be0b9b6bd41cb50de9083d8ff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:38:06 +0200
Subject: [PATCH 319/403] python3Packages.meteofrance-api: switch to
 poetry-core

---
 .../python-modules/meteofrance-api/default.nix     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix
index 5e738adb62bf..4e8d96c3301b 100644
--- a/pkgs/development/python-modules/meteofrance-api/default.nix
+++ b/pkgs/development/python-modules/meteofrance-api/default.nix
@@ -1,7 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, poetry
+, fetchpatch
+, poetry-core
 , pytestCheckHook
 , pythonOlder
 , pytz
@@ -25,9 +26,16 @@ buildPythonPackage rec {
     hash = "sha256-X8f0z9ZPXH7Wc3GqHmPptxpNxbHeezdOzw4gZCprumU=";
   };
 
+  patches = [
+    (fetchpatch {
+      #  Switch to poetry-core
+      url = "https://github.com/hacf-fr/meteofrance-api/commit/7536993fe38dfe3d0833da3fd750be9277aeffa6.patch";
+      hash = "sha256-/4VgzoJxhaXoj1N1GNLJNvkQvv6IW9OcBJV6vg6kthM=";
+    })
+  ];
+
   nativeBuildInputs = [
-    # Doesn't work with poetry-core at the moment
-    poetry
+    poetry-core
   ];
 
   propagatedBuildInputs = [

From ec82b18808889036d3e3fcff00912d71763a321c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:42:56 +0200
Subject: [PATCH 320/403] python3Packages.pycountry: propagate setuptools

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

diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index 3583826f69a3..a0048e7e75c9 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , pytestCheckHook
 }:
 
@@ -13,6 +14,10 @@ buildPythonPackage rec {
     sha256 = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY=";
   };
 
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];

From 7084f8c779aaadfb17d4928857c6894116faec29 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:43:14 +0200
Subject: [PATCH 321/403] python3Packages.poetry: relax crashtest constraint

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

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 07dcb96f4074..3105187c98a7 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -53,6 +53,11 @@ buildPythonPackage rec {
     hash = "sha256-+Nsg7oPh9tAHEKt1R9C+nY9UPy+9vbf/+A6vQWgTi+4=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'crashtest = "^0.3.0"' 'crashtest = "*"'
+  '';
+
   nativeBuildInputs = [
     installShellFiles
   ];

From 7851a32a7fecc7bc8898413ce59aa494299fa2bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:44:45 +0200
Subject: [PATCH 322/403] python3Packages.amqtt: propagate setuptools

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

diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix
index 5e42a6ea1f5b..ecf326a9a21a 100644
--- a/pkgs/development/python-modules/amqtt/default.nix
+++ b/pkgs/development/python-modules/amqtt/default.nix
@@ -11,6 +11,7 @@
 , pytestCheckHook
 , pythonOlder
 , pyyaml
+, setuptools
 , transitions
 , websockets
 }:
@@ -42,6 +43,7 @@ buildPythonPackage rec {
     docopt
     passlib
     pyyaml
+    setuptools
     transitions
     websockets
   ];

From cdd4d3e16552f29e10f2d53e332f02aa9d97ec4f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Sep 2022 15:45:40 +0200
Subject: [PATCH 323/403] python3Packages.bsblan: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix
index e371079b3605..760d300f905a 100644
--- a/pkgs/development/python-modules/bsblan/default.nix
+++ b/pkgs/development/python-modules/bsblan/default.nix
@@ -11,6 +11,7 @@
 , pytest-mock
 , pytestCheckHook
 , pythonOlder
+, setuptools
 , yarl
 }:
 
@@ -30,6 +31,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     poetry-core
+    setuptools
   ];
 
   propagatedBuildInputs = [

From 699bdb6c10abeb73b29b053b0a8c079b8ce1716c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 18 Sep 2022 00:23:13 +0200
Subject: [PATCH 324/403] python310Packages.pytest-console-scripts: propagate
 setuptools

---
 .../python-modules/pytest-console-scripts/default.nix    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix
index 32ccd22c9692..b01d2d2b7d0a 100644
--- a/pkgs/development/python-modules/pytest-console-scripts/default.nix
+++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix
@@ -1,11 +1,12 @@
 { lib
 , buildPythonPackage
+, mock
 , fetchPypi
 , pytestCheckHook
 , python
-, mock
-, setuptools-scm
 , pythonOlder
+, setuptools-scm
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -26,6 +27,10 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     mock
     pytestCheckHook

From 590889055030a13c6b77371c881cdcee44a2d925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 18 Sep 2022 01:58:31 +0200
Subject: [PATCH 325/403] python310Packages.smart-open: 6.0.0 -> 6.2.0

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

diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix
index b124a7c887e9..668cdb1643da 100644
--- a/pkgs/development/python-modules/smart-open/default.nix
+++ b/pkgs/development/python-modules/smart-open/default.nix
@@ -9,12 +9,13 @@
 , google-cloud-storage
 , requests
 , moto
+, paramiko
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "smart-open";
-  version = "6.0.0";
+  version = "6.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     owner = "RaRe-Technologies";
     repo = "smart_open";
     rev = "v${version}";
-    sha256 = "sha256-FEIJ1DBW0mz7n+J03C1Lg8uAs2ZxI0giM7+mvuNPyGg=";
+    sha256 = "sha256-AtFIluoI2QeHUX2dclEmOxsv/cEtusWq7GyViRBhL5g=";
   };
 
   propagatedBuildInputs = [
@@ -37,6 +38,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     moto
+    paramiko
     pytestCheckHook
   ];
 

From 5b1dd911171380aa74b9a53a55eecec7937201ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 02:15:04 +0200
Subject: [PATCH 326/403] protobufc: 1.3.3 -> 1.4.1

---
 pkgs/development/libraries/protobufc/1.3.nix     | 11 -----------
 .../protobufc/{generic.nix => default.nix}       | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix                  |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/protobufc/1.3.nix
 rename pkgs/development/libraries/protobufc/{generic.nix => default.nix} (55%)

diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix
deleted file mode 100644
index 82126727282c..000000000000
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.3.3";
-  src = fetchFromGitHub {
-    owner = "protobuf-c";
-    repo = "protobuf-c";
-    rev = "v${version}";
-    sha256 = "13948amsjj9xpa4yl6amlyk3ksr96bbd4ngshh2yzflwcslhg6gv";
-  };
-})
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/default.nix
similarity index 55%
rename from pkgs/development/libraries/protobufc/generic.nix
rename to pkgs/development/libraries/protobufc/default.nix
index b64d75076baf..28c15f0ef45e 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/default.nix
@@ -1,15 +1,20 @@
-{ lib, stdenv, src, version
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook, pkg-config, protobuf, zlib
-, ...
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "protobuf-c";
-  inherit version;
+  version = "1.4.1";
 
-  inherit src;
+  src = fetchFromGitHub {
+    owner = "protobuf-c";
+    repo = "protobuf-c";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM=";
+  };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
+
   buildInputs = [ protobuf zlib ];
 
   meta = with lib; {
@@ -17,5 +22,6 @@ stdenv.mkDerivation {
     description = "C bindings for Google's Protocol Buffers";
     license = licenses.bsd2;
     platforms = platforms.all;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78c8b3cb65d2..7b51a1a1858a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21165,7 +21165,7 @@ with pkgs;
   protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { };
   protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { };
 
-  protobufc = callPackage ../development/libraries/protobufc/1.3.nix { };
+  protobufc = callPackage ../development/libraries/protobufc { };
 
   protolock = callPackage ../development/libraries/protolock { };
 

From d77eab14fe6522364f98b0fdb3b8a619586b0519 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 02:18:59 +0200
Subject: [PATCH 327/403] python3Packages.python-ldap: 3.4.2 -> 3.4.3

The newer version has not been published to PyPi in two days, so Git
seems to be the more reliable channel to pull this package from.
---
 .../python-modules/python-ldap/default.nix           | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix
index ea9e8ca852d7..7b3c2bdbc0ba 100644
--- a/pkgs/development/python-modules/python-ldap/default.nix
+++ b/pkgs/development/python-modules/python-ldap/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pyasn1
 , pyasn1-modules
 , pythonAtLeast
@@ -13,12 +13,14 @@
 
 buildPythonPackage rec {
   pname = "python-ldap";
-  version = "3.4.2";
+  version = "3.4.3";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc=";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "refs/tags/python-ldap-${version}";
+    hash = "sha256-/ehvSs2qjuTPhaaOP0agPbWyyRugBpUlPq/Ny9t2C58=";
   };
 
   buildInputs = [

From 809cf4639c5812f3f88e7bc46899b83dc1e92c7c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 02:32:41 +0200
Subject: [PATCH 328/403] python3Packages.dask: 2022.7.0 -> 2022.9.1

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 8453b3e0ec9c..8502c01956ec 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2022.7.0";
+  version = "2022.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = pname;
     rev = version;
-    hash = "sha256-O5/TNeta0V0v9WTpPmF/kJMJ40ANo6rcRtzurr5/SwA=";
+    hash = "sha256-4Tok9eYhi2FF+8bpKnwKT3KIRGHIMtxczTkZ6qD8x7g=";
   };
 
   propagatedBuildInputs = [
@@ -97,9 +97,8 @@ buildPythonPackage rec {
     "--reruns 3"
     # Don't run tests that require network access
     "-m 'not network'"
-    # Ignore warning about pyarrow 5.0.0 feautres
-    "-W"
-    "ignore::FutureWarning"
+    # DeprecationWarning: The 'sym_pos' keyword is deprecated and should be replaced by using 'assume_a = "pos"'. 'sym_pos' will be removed in SciPy 1.11.0.
+    "-W" "ignore::DeprecationWarning"
   ];
 
   disabledTests = lib.optionals stdenv.isDarwin [

From e07eca17af37aac51777fa24bbed6eedfe32d171 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 02:37:13 +0200
Subject: [PATCH 329/403] python3Packages.fountains: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix
index 1d65c4e643c8..2b95431ac4e0 100644
--- a/pkgs/development/python-modules/fountains/default.nix
+++ b/pkgs/development/python-modules/fountains/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , bitlist
 , pythonOlder
 }:
@@ -17,6 +18,10 @@ buildPythonPackage rec {
     hash = "sha256-9ASOgqkE1vwCKGAZXEJaHoABMXomIWTGv3jAsNssdsU=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     bitlist
   ];

From cd9776aa25d617e49adb06cbc21d0f1ce66dac2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:11:06 +0200
Subject: [PATCH 330/403] python3Packages.ansi: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix
index 5847e3ad0f9e..e2e4e7c93fb9 100644
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/pkgs/development/python-modules/ansi/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
 , pytestCheckHook
 }:
 
@@ -16,6 +17,10 @@ buildPythonPackage rec {
     hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];

From 54aea04762c996144a5ec1caee04f5d3dcfa80fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:14:16 +0200
Subject: [PATCH 331/403] python3Packages.rangehttpserver: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/rangehttpserver/default.nix b/pkgs/development/python-modules/rangehttpserver/default.nix
index 217bffb174b8..006dc747fe6f 100644
--- a/pkgs/development/python-modules/rangehttpserver/default.nix
+++ b/pkgs/development/python-modules/rangehttpserver/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
 , nose
 , requests
 }:
@@ -17,6 +18,10 @@ buildPythonPackage rec {
     sha256 = "1sy9j6y8kp5jiwv2vd652v94kspp1yd4dwxrfqfn6zwnfyv2mzv5";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     nose
     requests

From b79055e58275902dc5319fce007700dacbc2d463 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:20:21 +0200
Subject: [PATCH 332/403] python3Packages.aiogithubapi: relax backoff
 constraint, use legacy asyncio-mode for tests

---
 .../python-modules/aiogithubapi/default.nix     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix
index 38bd95989f6a..f4b8c306c1ab 100644
--- a/pkgs/development/python-modules/aiogithubapi/default.nix
+++ b/pkgs/development/python-modules/aiogithubapi/default.nix
@@ -25,6 +25,14 @@ buildPythonPackage rec {
     hash = "sha256-5gKANZtDhIoyfyLdS15JDWTxHBFkaHDUlbVVhRs7MSE=";
   };
 
+  postPatch = ''
+    # Upstream is releasing with the help of a CI to PyPI, GitHub releases
+    # are not in their focus
+    substituteInPlace pyproject.toml \
+      --replace 'version = "0"' 'version = "${version}"' \
+      --replace 'backoff = "^1.10.0"' 'backoff = "*"'
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];
@@ -41,12 +49,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    # Upstream is releasing with the help of a CI to PyPI, GitHub releases
-    # are not in their focus
-    substituteInPlace pyproject.toml \
-      --replace 'version = "0"' 'version = "${version}"'
-  '';
+  pytestFlagsArray = [
+    "--asyncio-mode=legacy"
+  ];
 
   pythonImportsCheck = [
     "aiogithubapi"

From 558bf96f8bad658591558e2f918422d2d8cb5ab1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:25:19 +0200
Subject: [PATCH 333/403] python3Packages.timetagger: propagate bcrypt

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

diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index 6ecacbca809d..b9454f9ad097 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , asgineer
+, bcrypt
 , itemdb
 , jinja2
 , markdown
@@ -26,6 +27,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     asgineer
+    bcrypt
     itemdb
     jinja2
     markdown

From 6bce590ab4455ef5cb6706fd8825eb9bbafaee29 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:26:15 +0200
Subject: [PATCH 334/403] python3Packages.rich-rst: add setuptools to
 nativeBuildInputs

---
 pkgs/development/python-modules/rich-rst/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix
index 4c543febb813..f15e565bd043 100644
--- a/pkgs/development/python-modules/rich-rst/default.nix
+++ b/pkgs/development/python-modules/rich-rst/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
 , docutils
 , rich
 }:
@@ -17,6 +18,10 @@ buildPythonPackage rec {
     sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ docutils rich ];
 
   # Module has no tests

From 7bdade5cde3ce35f3295f6f20c691079ba8e6622 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:27:57 +0200
Subject: [PATCH 335/403] python3Packages.multimethod: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix
index fe2bb2ef45c1..ef8004d20829 100644
--- a/pkgs/development/python-modules/multimethod/default.nix
+++ b/pkgs/development/python-modules/multimethod/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
 , pytestCheckHook
 }:
 
@@ -16,6 +17,10 @@ buildPythonPackage rec {
     sha256 = "09vrxzv8q0lqsbh6d83wjdd29ja66rj31y7wmyha14jk603fd9k0";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];

From fc8447f1bfe5f0fa7e327e56593b7a0331b65d1c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:28:26 +0200
Subject: [PATCH 336/403] python3Packages.wheel-filename: add setuptools to
 nativeBuildInputs

---
 pkgs/development/python-modules/wheel-filename/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix
index 3140870289d8..d4dd51ab2c89 100644
--- a/pkgs/development/python-modules/wheel-filename/default.nix
+++ b/pkgs/development/python-modules/wheel-filename/default.nix
@@ -1,9 +1,9 @@
 { lib
-, attrs
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -20,8 +20,8 @@ buildPythonPackage rec {
     hash = "sha256-M3XGHG733X5qKuMS6mvFSFHYOwWPaBMXw+w0eYo6ByE=";
   };
 
-  buildInputs = [
-    attrs
+  nativeBuildInputs = [
+    setuptools
   ];
 
   checkInputs = [

From 8b2278eaf3314ad89eff3c719c6791cf9d8b90b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:33:53 +0200
Subject: [PATCH 337/403] python3Packages.wsgidav: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix
index 882f4091040f..4c61b476486e 100644
--- a/pkgs/development/python-modules/wsgidav/default.nix
+++ b/pkgs/development/python-modules/wsgidav/default.nix
@@ -10,6 +10,7 @@
 , python-pam
 , pyyaml
 , requests
+, setuptools
 , webtest
 }:
 
@@ -27,6 +28,10 @@ buildPythonPackage rec {
     hash = "sha256-LQdS9d2DB4PXqRSzmtZCSyCQI47ncLCG+RSB+goZYoA=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     defusedxml
     jinja2

From 5166c6f28580c309ce0f47f963dea071db4fbacf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:37:39 +0200
Subject: [PATCH 338/403] python3Packages.cle: 9.2.15 -> 9.2.18

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

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index e2cf9dac779f..b0fad5cd155b 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -10,12 +10,13 @@
 , pythonOlder
 , pyvex
 , pyxbe
+, setuptools
 , sortedcontainers
 }:
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.15";
+  version = "9.2.18";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
@@ -37,9 +38,13 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vGIthytW0gZy0X2OXuFwdBnPuvcWkV47FeaXZY8FCVc=";
+    hash = "sha256-hg6G07rSPRFGBaJdJduDqb7BVGt/sZtCA4I0Hhl4wfw=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     cffi
     minidump

From bfb51b91f1c30a755ad6286357086ea8d35c2a58 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 03:49:16 +0200
Subject: [PATCH 339/403] python3Packages.amazon-ion: 0.9.2 -> 0.9.3

---
 pkgs/development/python-modules/amazon-ion/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix
index 0e97eda4701f..365e4cc14a64 100644
--- a/pkgs/development/python-modules/amazon-ion/default.nix
+++ b/pkgs/development/python-modules/amazon-ion/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "amazon-ion";
-  version = "0.9.2";
+  version = "0.9.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     repo = "ion-python";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-BLlKxm63KsmMFajS4uJne/LPNXboOfy4uVm8HqO9Wfo=";
+    hash = "sha256-FLwzHcge+vLcRY4gOzrxS3kWlprCkRXX5KeGOoTJDSw=";
   };
 
   postPatch = ''
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # ValueError: Exceeds the limit (4300) for integer string conversion
+    "test_roundtrips"
+  ];
+
   pythonImportsCheck = [
     "amazon.ion"
   ];

From e67db7f066f510415d80b4ae390fe836aad09d52 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 16:15:54 +0200
Subject: [PATCH 340/403] python3Packages.tensorflow: 2.10.0-rc0 -> 2.10.0

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

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 338affcbf156..31fff4832052 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -76,7 +76,7 @@ let
 
   tfFeature = x: if x then "1" else "0";
 
-  version = "2.10.0-rc0";
+  version = "2.10.0";
   variant = if cudaSupport then "-gpu" else "";
   pname = "tensorflow${variant}";
 
@@ -190,7 +190,7 @@ let
       owner = "tensorflow";
       repo = "tensorflow";
       rev = "v${version}";
-      hash = "sha256-zN8I0wxKrxWcI0RuOqDz6srdW0Q+kgaZhJdXM46N1e8=";
+      hash = "sha256-Y6cujiMoQXKQlsLBr7d0T278ltdd00IfsTRycJbRVN4=";
     };
 
     # On update, it can be useful to steal the changes from gentoo
@@ -445,7 +445,8 @@ in buildPythonPackage {
       -e "s/'gast[^']*',/'gast',/" \
       -e "/'libclang[^']*',/d" \
       -e "/'keras[^']*')\?,/d" \
-      -e "/'tensorflow-io-gcs-filesystem[^']*',/d"
+      -e "/'tensorflow-io-gcs-filesystem[^']*',/d" \
+      -e "s/'protobuf[^']*',/'protobuf',/" \
   '';
 
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow

From f29b39a6b4012712f7cf9fae05611b788901665d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 16:43:48 +0200
Subject: [PATCH 341/403] python3Packages.nested-lookup: 0.2.23 -> 0.2.25

---
 .../python-modules/nested-lookup/default.nix        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/nested-lookup/default.nix b/pkgs/development/python-modules/nested-lookup/default.nix
index 7e56158ff145..dc186606f41c 100644
--- a/pkgs/development/python-modules/nested-lookup/default.nix
+++ b/pkgs/development/python-modules/nested-lookup/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , lib
 , pytestCheckHook
 , six
@@ -7,14 +7,11 @@
 
 buildPythonPackage rec {
   pname = "nested-lookup";
-  version = "0.2.23";
+  version = "0.2.25";
 
-  src = fetchFromGitHub {
-    owner = "russellballestrini";
-    repo = "nested-lookup";
-    # https://github.com/russellballestrini/nested-lookup/issues/47
-    rev = "c1b0421479efa378545bc71efa3b72882e8fec17";
-    sha256 = "sha256-jgfYLSsFLQSsOH4NzbDPKFIG+tWWZ1zTWcZEaX2lthg=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-b6gydIyQOB8ikdhQgJ4ySSUZ7l8lPWpay8Kdk37KAug=";
   };
 
   propagatedBuildInputs = [

From f92156e12156e47cf59fdadd4a722470aba39f3d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 16:47:52 +0200
Subject: [PATCH 342/403] python3Packages.ansible-doctor: 1.4.1 -> 1.4.4

---
 .../development/python-modules/ansible-doctor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix
index 67dc34f19b84..c07a1e5d5f3e 100644
--- a/pkgs/development/python-modules/ansible-doctor/default.nix
+++ b/pkgs/development/python-modules/ansible-doctor/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "ansible-doctor";
-  version = "1.4.1";
+  version = "1.4.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "thegeeklab";
     repo = "ansible-doctor";
     rev = "refs/tags/v${version}";
-    hash = "sha256-kfBEV3PXU+C7FD9xiBMvdamb3b2KXp+Qi23/xUnoXHM=";
+    hash = "sha256-blCBlSCp7W6tlCa5381ex7yq37iY9v6u7ITHmJEUxl0=";
   };
 
   nativeBuildInputs = [
@@ -56,9 +56,9 @@ buildPythonPackage rec {
       --replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \
       --replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \
       --replace 'environs = "9.5.0"' 'environs = "*"' \
-      --replace 'jsonschema = "4.6.0"' 'jsonschema = "*"' \
+      --replace 'jsonschema = "4.15.0"' 'jsonschema = "*"' \
       --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' \
-      --replace 'python-json-logger = "2.0.2"' 'python-json-logger = "*"'
+      --replace 'python-json-logger = "2.0.4"' 'python-json-logger = "*"'
   '';
 
   # Module has no tests

From a975e15be11c270570e8986576e812aefe84252a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 16:48:55 +0200
Subject: [PATCH 343/403] python3Packages.ansible-later: 2.0.16 -> 2.0.20

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

diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix
index 9e0af254b3f9..c989dba4d16c 100644
--- a/pkgs/development/python-modules/ansible-later/default.nix
+++ b/pkgs/development/python-modules/ansible-later/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "ansible-later";
-  version = "2.0.16";
+  version = "2.0.20";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "thegeeklab";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-AlLy8rqqNrJtoI01OHq8W1Oi8iN8RiBdtq2sZ7zlTyM=";
+    hash = "sha256-LoJ02PGOo/qrwH4PJYI0CFZ/cMxhjNj1JiUPnK2FIlA=";
   };
 
   postPatch = ''

From 7275d316f84221b1628584da924990a9b8a2777f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Sep 2022 16:56:11 +0200
Subject: [PATCH 344/403] awscli: 1.25.42 -> 1.25.76

---
 pkgs/tools/admin/awscli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index df3953b030fd..dbf990807e98 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -35,11 +35,11 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli";
-  version = "1.25.42"; # N.B: if you change this, change botocore and boto3 to a matching version too
+  version = "1.25.76"; # N.B: if you change this, change botocore and boto3 to a matching version too
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5DH3Ik0DHmHfZ+XfFjmC2CL5WRoA9ENgzDeYfCgwtTI=";
+    hash = "sha256-PSr0zZEGXFxcFSN7QQ5Ux0Z4aCwwm9na+2hIv/gR6+s=";
   };
 
   # https://github.com/aws/aws-cli/issues/4837

From d47e9bf0cd9237c353432c4edec37ab5d6b61205 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Mon, 19 Sep 2022 06:09:14 +1000
Subject: [PATCH 345/403] awsebcli: fixup botocore, pathspec, termcolor
 dependencies

---
 pkgs/tools/virtualization/awsebcli/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index f3ebb7cc5dfc..d1c4d1035f3f 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -50,8 +50,9 @@ with localPython.pkgs; buildPythonApplication rec {
     substituteInPlace setup.py \
       --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \
       --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \
-      --replace "jmespath>=0.7.1,<1.0.0" "jmespath==1.0.1" \
-      --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.49"
+      --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.76" \
+      --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \
+      --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0"
   '';
 
   buildInputs = [

From 795ca663c06c229c0d8ff6b38d66c0aaf3aec767 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 01:11:09 +0200
Subject: [PATCH 346/403] python3Packages.eth-keys: disable failing tests

---
 pkgs/development/python-modules/eth-keys/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix
index 47e43efef681..903d9bf95018 100644
--- a/pkgs/development/python-modules/eth-keys/default.nix
+++ b/pkgs/development/python-modules/eth-keys/default.nix
@@ -47,6 +47,8 @@ buildPythonPackage rec {
     "test_public_key_generation_is_equal"
     "test_signing_is_equal"
     "test_native_to_coincurve_recover"
+    "test_public_key_compression_is_equal"
+    "test_public_key_decompression_is_equal"
   ];
 
   pythonImportsCheck = [ "eth_keys" ];

From 4fff5ba5b6d3de7bcb346cc5e8810edb2c0fbf7a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 01:56:38 +0200
Subject: [PATCH 347/403] python3Packages.tifffile: disable failing tests

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

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index ea20059f5620..8e4bacad9aac 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -40,6 +40,8 @@ buildPythonPackage rec {
     "test_write_ome"
     # Test file is missing
     "test_write_predictor"
+    "test_issue_imagej_hyperstack_arg"
+    "test_issue_description_overwrite"
     # AssertionError
     "test_write_bigtiff"
     "test_write_imagej_raw"

From 059b20eca1cb5dc0712aac570858f3393d8bb23c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 02:15:46 +0200
Subject: [PATCH 348/403] python3Packages.distributed: 2022.9.0 -> 2022.9.1

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

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index a1a3449d8ac5..0b9236feeb00 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2022.9.0";
+  version = "2022.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uRXwWgWbVVW8B96gzwVwWfdR6eTn+1XFR3Y4PKDjYb8=";
+    hash = "sha256-upj1TipRhhvulyuhX4bfbQSWar9m7Xu3mIsi48G+ewE=";
   };
 
   postPatch = ''

From 3a5173ef18108adae59f9dfd4d4be444ca74e07d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 02:48:44 +0200
Subject: [PATCH 349/403] python3Packages.ailment: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index f90cc4683203..bf27864d8908 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , pythonOlder
 , pyvex
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -19,6 +20,10 @@ buildPythonPackage rec {
     hash = "sha256-CXJ9UVTrJzXumDJ6wghDbxVfZo9ZC67qBpz8B5D0DLo=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     pyvex
   ];

From c7c9be22739f32467a8849e66054141d2ab360c9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:06:05 +0200
Subject: [PATCH 350/403] python3Packages.glean-sdk: 51.1.0 -> 51.2.0

---
 pkgs/development/python-modules/glean-sdk/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix
index 8ede9275db89..68d50c435fc2 100644
--- a/pkgs/development/python-modules/glean-sdk/default.nix
+++ b/pkgs/development/python-modules/glean-sdk/default.nix
@@ -11,24 +11,25 @@
 , pythonOlder
 , rustc
 , rustPlatform
+, semver
 , setuptools-rust
 }:
 
 buildPythonPackage rec {
   pname = "glean-sdk";
-  version = "51.1.0";
+  version = "51.2.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Rt+N/sqX7IyoXbytzF9UkyXsx0vQXbGs+XJkaMhevE0=";
+    hash = "sha256-4EXCYthMabdmxWYltcnO0UTNeAYXwXQeRfwxt1WD3Ug=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-oY94YVs6I+/klogyajBoCrYexp9oUSrQ6znWVbigf2E=";
+    hash = "sha256-qOGoonutuIY+0UVaVSVVt0NbqEICdNs3qHWG0Epmkl0=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +43,7 @@ buildPythonPackage rec {
     cffi
     glean-parser
     iso8601
+    semver
   ];
 
   checkInputs = [

From 73e44107a8574724e1bcf81f86fc961f3779f00f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:14:30 +0200
Subject: [PATCH 351/403] paperless-ngx: disable eth-keys tests

Some other override in this package set makes them fail.
---
 pkgs/applications/office/paperless-ngx/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix
index e85f13b892f7..cfd1b0b596b3 100644
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@@ -46,6 +46,10 @@ let
           sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m";
         };
       });
+
+      eth-keys = super.eth-keys.overridePythonAttrs (_: {
+        doCheck = false;
+      });
     };
   };
 

From 69591251b2ed7883bd53ccdd61de9eb744c71489 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:41:31 +0200
Subject: [PATCH 352/403] check-esxi-hardware: build with format other

---
 pkgs/servers/monitoring/plugins/esxi.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix
index 1ca9e702e7ad..ccd77548c0c0 100644
--- a/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/pkgs/servers/monitoring/plugins/esxi.nix
@@ -6,6 +6,7 @@ let
 in python3Packages.buildPythonApplication rec {
   pname = lib.replaceStrings [ "_" ] [ "-" ] bName;
   version = "20200710";
+  format = "other";
 
   src = fetchFromGitHub {
     owner  = "Napsty";

From 82e9e32436d5886102f1e5f7c17aed8475504991 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:43:58 +0200
Subject: [PATCH 353/403] check-jsonschema: 0.16.2 -> 0.18.3

---
 pkgs/development/tools/check-jsonschema/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix
index 068bc752d32c..dd49074300af 100644
--- a/pkgs/development/tools/check-jsonschema/default.nix
+++ b/pkgs/development/tools/check-jsonschema/default.nix
@@ -4,13 +4,13 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "check-jsonschema";
-  version = "0.16.2";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "python-jsonschema";
     repo = "check-jsonschema";
     rev = version;
-    sha256 = "sha256-rPjXua5kITr+I+jqeAO2iGUFVhjkLnQkXlUzRvkXduA=";
+    sha256 = "sha256-9Ejcxr/22rJu8JoC7WspLfzF08elz4TaGagDeV0zIXk=";
   };
 
   propagatedBuildInputs = [
@@ -27,6 +27,11 @@ buildPythonApplication rec {
     responses
   ];
 
+  pytestFlagsArray = [
+    # DeprecationWarning: Accessing jsonschema.draft3_format_checker is deprecated and will be removed in a future release. Instead, use the FORMAT_CHECKER attribute on the corresponding Validator.
+    "-W" "ignore::DeprecationWarning"
+  ];
+
   preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
     # https://github.com/python/cpython/issues/74570#issuecomment-1093748531
     export no_proxy='*';

From 7715dd69e3839f2f2c288d7f19b2ead7adf00a34 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:46:02 +0200
Subject: [PATCH 354/403] i3-wk-switch: build with format other

---
 pkgs/applications/window-managers/i3/wk-switch.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
index d0055ef63653..e077254b70f4 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -3,6 +3,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "i3-wk-switch";
   version = "2020-03-18";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "tmfink";

From 8ab844d2787fb4dbc438509e6efbd21443b8269f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:46:15 +0200
Subject: [PATCH 355/403] buildbot-full: build with format other

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

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index ffef4a471d61..c5e8f8caf3dc 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -11,6 +11,7 @@ let
   withPlugins = plugins: buildPythonPackage {
     pname = "${package.pname}-with-plugins";
     inherit (package) version;
+    format = "other";
 
     dontUnpack = true;
     dontBuild = true;

From 76c0169c6e5a7d0253606e2657b352ac39a927f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:48:13 +0200
Subject: [PATCH 356/403] ioccheck: relax termcolor constraint

---
 pkgs/tools/security/ioccheck/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix
index 439567ecb038..fb5c887a8bf9 100644
--- a/pkgs/tools/security/ioccheck/default.nix
+++ b/pkgs/tools/security/ioccheck/default.nix
@@ -75,7 +75,8 @@ buildPythonApplication rec {
     substituteInPlace pyproject.toml \
       --replace '"hurry.filesize" = "^0.9"' "" \
       --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' \
-      --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"'
+      --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' \
+      --replace 'termcolor = "^1.1.0"' 'termcolor = "*"'
   '';
 
   pythonImportsCheck = [

From f5473de83273c1b50dba04caec4ac64c9a1279ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:50:20 +0200
Subject: [PATCH 357/403] liquidctl: add setuptools to nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix
index 37347331b587..699d2b0e5b20 100644
--- a/pkgs/development/python-modules/liquidctl/default.nix
+++ b/pkgs/development/python-modules/liquidctl/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , pythonOlder
 , installShellFiles
+, setuptools
 , docopt
 , hidapi
 , pyusb
@@ -25,7 +26,10 @@ buildPythonPackage rec {
     sha256 = "sha256-2mXWih3LchJ/YsjuwHwWse7SNJYx1vxtovl8vasKV4w=";
   };
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    setuptools
+  ];
 
   propagatedBuildInputs = [
     docopt

From a1b34543380c06ba45b648e05e8137d339eff2b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:51:23 +0200
Subject: [PATCH 358/403] markdown-anki-decks: relax typer constraint further

---
 pkgs/tools/misc/markdown-anki-decks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix
index 62c8ca86e6f0..375966da36b9 100644
--- a/pkgs/tools/misc/markdown-anki-decks/default.nix
+++ b/pkgs/tools/misc/markdown-anki-decks/default.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
     substituteInPlace pyproject.toml \
       --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \
       --replace 'genanki = "^0.10.1"' 'genanki = "*"' \
-      --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"'
+      --replace 'typer = "^0.3.2"' 'typer = "*"'
   '';
 
   # No tests available on Pypi and there is only a failing version assertion test in the repo.

From a65038de68e965a0aeddd233d5d670c2250162f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:53:24 +0200
Subject: [PATCH 359/403] magic-wormhole: disable failing test

---
 pkgs/development/python-modules/magic-wormhole/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 2fa85598fb15..12374ed1938b 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -53,6 +53,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # Expected: (<class 'wormhole.errors.WrongPasswordError'>,) Got: Failure instance: Traceback (failure with no frames): <class 'wormhole.errors.LonelyError'>:
+    "test_welcome"
+  ];
+
   postPatch = lib.optionalString stdenv.isLinux ''
     sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
   '';

From 8f8a5815f09a8f5ec355db517439631586ed7393 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:55:57 +0200
Subject: [PATCH 360/403] mloader: relax protobuf constraint

---
 pkgs/tools/misc/mloader/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix
index 8e8854a5e6f2..a943547f17e9 100644
--- a/pkgs/tools/misc/mloader/default.nix
+++ b/pkgs/tools/misc/mloader/default.nix
@@ -3,12 +3,18 @@
 python3Packages.buildPythonApplication rec {
   pname = "mloader";
   version = "1.1.9";
+  format = "setuptools";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
     sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "protobuf~=3.6" "protobuf"
+  '';
+
   propagatedBuildInputs = with python3Packages; [
     click
     protobuf

From 79e7f221541e31c82185beeb04cb9ebb5c7994c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:56:41 +0200
Subject: [PATCH 361/403] mitmproxy: disable failign test

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

diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index 1b89d73864b0..4b4cf1315b5f 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -117,6 +117,8 @@ buildPythonPackage rec {
     "test_integration"
     "test_contentview_flowview"
     "test_flowview"
+    # ValueError: Exceeds the limit (4300) for integer string conversion
+    "test_roundtrip_big_integer"
   ];
   dontUsePytestXdist = true;
 

From 55ae38c05aa3549fc4cf073a2c771b66f4cfb8c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:58:24 +0200
Subject: [PATCH 362/403] pandoc-eqnos: add setuptools to nativeBuildInputs

---
 pkgs/tools/misc/pandoc-eqnos/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix
index 310826c35b06..d808060fc23a 100644
--- a/pkgs/tools/misc/pandoc-eqnos/default.nix
+++ b/pkgs/tools/misc/pandoc-eqnos/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , lib
 , pandoc-xnos
+, setuptools
 }:
 
 buildPythonApplication rec {
@@ -16,6 +17,10 @@ buildPythonApplication rec {
     sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ pandoc-xnos ];
 
   # Different pandoc executables are not available

From b6d6d89311f11afe5ab187f1bbf411b1cf646512 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:58:54 +0200
Subject: [PATCH 363/403] pandoc-fignos: add setuptools to nativeBuildInputs

---
 pkgs/tools/misc/pandoc-fignos/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix
index 846d1abe8d7f..7ed7a8e710a7 100644
--- a/pkgs/tools/misc/pandoc-fignos/default.nix
+++ b/pkgs/tools/misc/pandoc-fignos/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , lib
 , pandoc-xnos
+, setuptools
 }:
 
 buildPythonApplication rec {
@@ -16,6 +17,10 @@ buildPythonApplication rec {
     sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ pandoc-xnos ];
 
   # Different pandoc executables are not available

From f83bc3746db5cd5c9fea94efcb38c629caa78788 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:59:21 +0200
Subject: [PATCH 364/403] pandoc-include: add setuptools to nativeBuildInputs

---
 pkgs/tools/misc/pandoc-include/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/tools/misc/pandoc-include/default.nix
index a0ce0f96b437..684af986b017 100644
--- a/pkgs/tools/misc/pandoc-include/default.nix
+++ b/pkgs/tools/misc/pandoc-include/default.nix
@@ -3,6 +3,7 @@
 , lib
 , natsort
 , panflute
+, setuptools
 }:
 
 buildPythonApplication rec {
@@ -17,6 +18,10 @@ buildPythonApplication rec {
     sha256 = "sha256-kuxud7m+sWcNqE8A+Fwb8ATgiUwxQvHeYBTyw1UzX4U=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ natsort panflute ];
 
   pythonImportsCheck = [ "pandoc_include.main" ];

From 6c52138903bb51a91fb571799452ad9bed060947 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 03:59:54 +0200
Subject: [PATCH 365/403] pandoc-secnos: add setuptools to nativeBuildInputs

---
 pkgs/tools/misc/pandoc-secnos/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix
index 95c67dde0ec0..507d7df400e3 100644
--- a/pkgs/tools/misc/pandoc-secnos/default.nix
+++ b/pkgs/tools/misc/pandoc-secnos/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , lib
 , pandoc-xnos
+, setuptools
 }:
 
 buildPythonApplication rec {
@@ -16,6 +17,10 @@ buildPythonApplication rec {
     sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ pandoc-xnos ];
 
   patches = [

From 689dc2633115105bc63b670ac000d6a10f0b1468 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:00:25 +0200
Subject: [PATCH 366/403] pandoc-tablenos: add setuptools to nativeBuildInputs

---
 pkgs/tools/misc/pandoc-tablenos/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix
index f3d67826a454..e1fb785a7a9f 100644
--- a/pkgs/tools/misc/pandoc-tablenos/default.nix
+++ b/pkgs/tools/misc/pandoc-tablenos/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , lib
 , pandoc-xnos
+, setuptools
 }:
 
 buildPythonApplication rec {
@@ -16,6 +17,10 @@ buildPythonApplication rec {
     sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ pandoc-xnos ];
 
   # Different pandoc executables are not available

From 532dc1474383cdd99ab52b8c25d7ef86ee0fb6e9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:01:18 +0200
Subject: [PATCH 367/403] pass2csv: add setuptools to nativeBuildInputs

---
 pkgs/tools/security/pass2csv/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/security/pass2csv/default.nix b/pkgs/tools/security/pass2csv/default.nix
index 1817d63f1ee6..2e48f541ca84 100644
--- a/pkgs/tools/security/pass2csv/default.nix
+++ b/pkgs/tools/security/pass2csv/default.nix
@@ -2,6 +2,7 @@
 , fetchPypi
 , lib
 , python-gnupg
+, setuptools
 }:
 
 buildPythonApplication rec {
@@ -14,6 +15,10 @@ buildPythonApplication rec {
     sha256 = "03a11bd0b0905737f4adb21d87aa1653d84cc1d9b5dcfdfb8a29092245d65db8";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     python-gnupg
   ];

From caf662452d34816e6d09225f37aa4ba2e1282d13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:01:48 +0200
Subject: [PATCH 368/403] persistent-evdev: build with format other

---
 pkgs/servers/persistent-evdev/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/servers/persistent-evdev/default.nix
index c666e9c8d799..97f0ea01219c 100644
--- a/pkgs/servers/persistent-evdev/default.nix
+++ b/pkgs/servers/persistent-evdev/default.nix
@@ -3,6 +3,7 @@
 buildPythonPackage rec {
   pname = "persistent-evdev";
   version = "unstable-2022-05-07";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "aiberia";

From 16497eb9da9f840dbf008abb4e87a7a02b1ba02f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:03:03 +0200
Subject: [PATCH 369/403] pferd: add setuptools to nativeBuildInputs

---
 pkgs/tools/misc/pferd/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix
index 8bd95b6fc651..d715e35e580f 100644
--- a/pkgs/tools/misc/pferd/default.nix
+++ b/pkgs/tools/misc/pferd/default.nix
@@ -15,6 +15,10 @@ python3Packages.buildPythonApplication rec {
     sha256 = "05f9b7wzld0jcalc7n5h2a6nqjr1w0fxwkd4cih6gkjc9117skii";
   };
 
+  nativeBuildInputs = with python3Packages; [
+    setuptools
+  ];
+
   propagatedBuildInputs = with python3Packages; [
     aiohttp
     beautifulsoup4

From bf17d03665e1d1019fbd4211760b08da82fd2e63 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:03:12 +0200
Subject: [PATCH 370/403] photon: build with format other

---
 pkgs/tools/networking/photon/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix
index d3f153e44aed..543d9f1a5b96 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/pkgs/tools/networking/photon/default.nix
@@ -3,6 +3,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "photon";
   version = "1.3.0";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "s0md3v";

From ee2427b69e3b19341a656b6647062fd3e3bcb3db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:05:12 +0200
Subject: [PATCH 371/403] pygmentex: build with format other

---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index c99face8d7d8..8da3df2773f0 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -336,6 +336,7 @@ latexindent = perlPackages.buildPerlPackage rec {
 pygmentex = python3Packages.buildPythonApplication rec {
   pname = "pygmentex";
   inherit (src) version;
+  format = "other";
 
   src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs);
 

From 5b5df09987cc53932b3fc85481d649ac42dfde6b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:06:11 +0200
Subject: [PATCH 372/403] waydroid: build with format other

---
 pkgs/os-specific/linux/waydroid/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix
index c9298ecec4e2..74f32cd85991 100644
--- a/pkgs/os-specific/linux/waydroid/default.nix
+++ b/pkgs/os-specific/linux/waydroid/default.nix
@@ -17,6 +17,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "waydroid";
   version = "1.3.0";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = pname;

From c604153913752f61558568cf78b008680d794756 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:07:15 +0200
Subject: [PATCH 373/403] tremc: build with format other

---
 pkgs/applications/networking/p2p/tremc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix
index 6ff10989b1d3..a4b78e250d5c 100644
--- a/pkgs/applications/networking/p2p/tremc/default.nix
+++ b/pkgs/applications/networking/p2p/tremc/default.nix
@@ -13,6 +13,7 @@ in
 python3Packages.buildPythonApplication rec {
   pname = "tremc";
   version = "0.9.2";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "tremc";

From 6350a2649656f7a49f2463be7adccebee1615212 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:08:49 +0200
Subject: [PATCH 374/403] stgit: add setuptools to nativeBuildInputs

---
 .../version-management/git-and-tools/stgit/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 1ed773bd65b4..b5bdecd85ad1 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-TsJr2Riygz/DZrn6UZMPvq1tTfvl3dFEZZNq2wVj1Nw=";
   };
 
-  nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ];
+  nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 python3Packages.setuptools ];
 
   format = "other";
 

From 2138aa977ed2313acbd10285dce6551f5628ecf6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:12:23 +0200
Subject: [PATCH 375/403] rofimoji: add setuptools to nativeBuildInputs

---
 pkgs/applications/misc/rofimoji/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix
index 45b12bab89e3..371da82e2b07 100644
--- a/pkgs/applications/misc/rofimoji/default.nix
+++ b/pkgs/applications/misc/rofimoji/default.nix
@@ -1,6 +1,7 @@
 { buildPythonApplication
 , fetchFromGitHub
 , lib
+, python3
 
 , waylandSupport ? true
 , x11Support ? true
@@ -25,6 +26,10 @@ buildPythonApplication rec {
     sha256 = "sha256-6W/59DjxrgejHSkNxpruDAws812Vjyf+GePDPbXzVbc=";
   };
 
+  nativeBuildInputs = [
+    python3.pkgs.setuptools
+  ];
+
   # `rofi` and the `waylandSupport` and `x11Support` dependencies
   # contain binaries needed at runtime.
   propagatedBuildInputs = with lib; [ configargparse rofi ]

From 5fe10e573a3303b22f9ff02937c290a84fcc2bef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:13:16 +0200
Subject: [PATCH 376/403] rofi-rbw: add setuptools to nativeBuildInputs

---
 pkgs/applications/misc/rofi-rbw/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix
index a02d486ca9e5..28602cf0240e 100644
--- a/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/pkgs/applications/misc/rofi-rbw/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, configargparse }:
+{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools }:
 
 buildPythonApplication rec {
   pname = "rofi-rbw";
@@ -12,6 +12,10 @@ buildPythonApplication rec {
     hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ configargparse ];
 
   pythonImportsCheck = [ "rofi_rbw" ];

From fc407047017fcaf1170f4212c3fc64f77d86dd36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:15:19 +0200
Subject: [PATCH 377/403] python3Packages.tiler: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/tiler/default.nix b/pkgs/development/python-modules/tiler/default.nix
index 0c1e44f1400d..de4517ff3278 100644
--- a/pkgs/development/python-modules/tiler/default.nix
+++ b/pkgs/development/python-modules/tiler/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , numpy
 , tqdm
 , pytestCheckHook
@@ -16,6 +17,10 @@ buildPythonPackage rec {
     sha256 = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     numpy
     tqdm

From 213cee6c1ab78c21f51952581921135f23b7934d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:16:03 +0200
Subject: [PATCH 378/403] python3Packages.termplotlib: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix
index fde1080491e0..89fd114ad739 100644
--- a/pkgs/development/python-modules/termplotlib/default.nix
+++ b/pkgs/development/python-modules/termplotlib/default.nix
@@ -6,6 +6,7 @@
 , exdown
 , numpy
 , gnuplot
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -19,6 +20,10 @@ buildPythonPackage rec {
     sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   format = "pyproject";
   checkInputs = [
     pytestCheckHook

From 2676a42a5be9e283139dc6d87c39b017019603cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:17:37 +0200
Subject: [PATCH 379/403] python3Packages.tensorflow-metadata: relax protobuf
 constraint

---
 .../python-modules/tensorflow-metadata/default.nix           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix
index 5204e2158dc7..994d821d9a25 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/default.nix
+++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix
@@ -21,6 +21,11 @@ buildPythonPackage rec {
     ./build.patch
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'protobuf>=3.13,<4' 'protobuf>=3.13'
+  '';
+
   # Default build pulls in Bazel + extra deps, given the actual build
   # is literally three lines (see below) - replace it with custom build.
   preBuild = ''

From a47595b39c4f1b4d1d6fc77ca854d269a9b0b540 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:29:27 +0200
Subject: [PATCH 380/403] python3Packages.pyweatherflowrest: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix
index a36f3a2ccfc2..b1384496325b 100644
--- a/pkgs/development/python-modules/pyweatherflowrest/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -19,6 +20,11 @@ buildPythonPackage rec {
     sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+
   propagatedBuildInputs = [
     aiohttp
   ];

From 6059df1b3b23f674bfd5e0ab8c2abdc92978822e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:33:10 +0200
Subject: [PATCH 381/403] python3Packages.pythonfinder: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix
index 64879d01969f..6d005a22292a 100644
--- a/pkgs/development/python-modules/pythonfinder/default.nix
+++ b/pkgs/development/python-modules/pythonfinder/default.nix
@@ -9,6 +9,7 @@
 , packaging
 , pytest-cov
 , pytest-timeout
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -23,6 +24,10 @@ buildPythonPackage rec {
     sha256 = "sha256-N/q9zi2SX38ivSpnjrx+bEzdR9cS2ivSgy42SR8cl+Q=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     attrs
     cached-property

From 72769f5839f019a6f66a4ed12964677b125d76fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:34:26 +0200
Subject: [PATCH 382/403] python3Packages.python-rabbitair: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix
index 7ebc98426d99..6578a0777525 100644
--- a/pkgs/development/python-modules/python-rabbitair/default.nix
+++ b/pkgs/development/python-modules/python-rabbitair/default.nix
@@ -5,6 +5,7 @@
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
+, setuptools
 , typing-extensions
 , zeroconf
 }:
@@ -23,6 +24,10 @@ buildPythonPackage rec {
     hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     cryptography
     zeroconf

From 1f28f9f5d43baeb968edbae4a7f6502c9d333668 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:34:58 +0200
Subject: [PATCH 383/403] rdkit: build with format other

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

diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix
index ad3bac33e24e..b42523dc8bf5 100644
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@@ -41,6 +41,7 @@ in
 buildPythonPackage rec {
   pname = "rdkit";
   version = "2022.03.5";
+  format = "other";
 
   src =
     let

From b7713d0bf6dbbfa25392971739a5dd458d9fe005 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:36:05 +0200
Subject: [PATCH 384/403] python3Packages.python-pushover: mark as broken

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

diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
index bc8509b450bc..0f8a5f2779c1 100644
--- a/pkgs/development/python-modules/pushover/default.nix
+++ b/pkgs/development/python-modules/pushover/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
+    broken = true; # Relies on 2to3 via setuptools
     description = "Bindings and command line utility for the Pushover notification service";
     homepage = "https://github.com/Thibauth/python-pushover";
     license = licenses.gpl3;

From 0a30b80a80cea114c6739d56953a24cd7b08f7db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:38:24 +0200
Subject: [PATCH 385/403] python3Packages.pyfma: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix
index 2e26cee84da4..103446dbe68f 100644
--- a/pkgs/development/python-modules/pyfma/default.nix
+++ b/pkgs/development/python-modules/pyfma/default.nix
@@ -6,11 +6,13 @@
 , pybind11
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "pyfma";
   version = "0.1.6";
+  format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
@@ -19,7 +21,10 @@ buildPythonPackage rec {
     rev = version;
     sha256 = "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn";
   };
-  format = "pyproject";
+
+  nativeBuildInputs = [
+    setuptools
+  ];
 
   buildInputs = [
     pybind11

From a21cb9dbffbc3aa7efd66e205c2c3c71c0b8c1db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:45:01 +0200
Subject: [PATCH 386/403] python3Packages.preprocess-cancellation: add
 setuptools to nativeBuildInputs

---
 .../python-modules/preprocess-cancellation/default.nix          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix
index 44a54810e443..5d2b722e6434 100644
--- a/pkgs/development/python-modules/preprocess-cancellation/default.nix
+++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix
@@ -3,6 +3,7 @@
 , pythonOlder
 , fetchFromGitHub
 , poetry-core
+, setuptools
 , shapely
 , pytestCheckHook
 }:
@@ -40,6 +41,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     poetry-core
+    setuptools
   ];
 
   propagatedBuildInputs = [

From 7d80dcc18f53fe422ed57ad4465aafe6fde19912 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:45:19 +0200
Subject: [PATCH 387/403] python3Packages.poppler-qt5: add setuptools to
 nativeBuildInputs

---
 pkgs/development/python-modules/poppler-qt5/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix
index a2dfaf8e4837..c2bbeab96daa 100644
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -9,6 +9,7 @@
 , pyqt-builder
 , poppler
 , pkg-config
+, setuptools
 , fetchpatch
 }:
 
@@ -32,7 +33,7 @@ buildPythonPackage rec {
   ];
 
   buildInputs = [ qtbase.dev poppler pyqt-builder ];
-  nativeBuildInputs = [ pkg-config qmake sip ];
+  nativeBuildInputs = [ pkg-config qmake sip setuptools ];
   propagatedBuildInputs = [ pyqt5.dev ];
 
   format = "pyproject";

From 94a2d5e4e52f2fb3c8727b9816899930bfaf5da2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:49:32 +0200
Subject: [PATCH 388/403] python3Packages.pip-tools: disable network test

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

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 84521397a707..2486a77dd771 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -56,6 +56,7 @@ buildPythonPackage rec {
     "network"
     "test_direct_reference_with_extras"
     "test_local_duplicate_subdependency_combined"
+    "test_bad_setup_file"
   ];
 
   pythonImportsCheck = [

From a741608ac991b617155a6f10c4cd2a918a69e17c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:57:07 +0200
Subject: [PATCH 389/403] python3Packages.mesonpep517: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix
index 5e33ae9c1033..b896076e2dc8 100644
--- a/pkgs/development/python-modules/mesonpep517/default.nix
+++ b/pkgs/development/python-modules/mesonpep517/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , meson
 , ninja
+, setuptools
 , toml
 }:
 
@@ -18,6 +19,10 @@ buildPythonPackage rec {
     sha256 = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [ toml ];
 
   # postPatch = ''

From 9a367d16337b51a74274a4cff591b40d82abbd7e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:58:10 +0200
Subject: [PATCH 390/403] python3Packages.meshio: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix
index 1df5a7f47807..2e8d4044ce3b 100644
--- a/pkgs/development/python-modules/meshio/default.nix
+++ b/pkgs/development/python-modules/meshio/default.nix
@@ -7,6 +7,7 @@
 , exdown
 , pytestCheckHook
 , rich
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -19,6 +20,10 @@ buildPythonPackage rec {
     sha256 = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     numpy
     netcdf4

From bd440ac0d056d77d12ebb3b13cff6d5fba36c059 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:58:18 +0200
Subject: [PATCH 391/403] python3Packages.lc7001: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/lc7001/default.nix b/pkgs/development/python-modules/lc7001/default.nix
index 0683794eda50..5e78d42471ce 100644
--- a/pkgs/development/python-modules/lc7001/default.nix
+++ b/pkgs/development/python-modules/lc7001/default.nix
@@ -4,6 +4,7 @@
 , fetchPypi
 , pythonOlder
 , poetry-core
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -20,6 +21,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     poetry-core
+    setuptools
   ];
 
   propagatedBuildInputs = [

From 8b416a1eba4ecd429a639ca49048af08e0e182b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 04:59:38 +0200
Subject: [PATCH 392/403] python3Packages.language-data: add setuptools to
 nativeBuildInputs

---
 pkgs/development/python-modules/language-data/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix
index 98d4885b1e94..803df3abaea5 100644
--- a/pkgs/development/python-modules/language-data/default.nix
+++ b/pkgs/development/python-modules/language-data/default.nix
@@ -4,6 +4,7 @@
 , marisa-trie
 , poetry-core
 , pythonOlder
+, setuptools
 }:
 
 buildPythonApplication rec {
@@ -22,6 +23,7 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [
     poetry-core
+    setuptools
   ];
 
   propagatedBuildInputs = [

From c0c5bc4eec368399b4f2adc89c23081888b760ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 05:03:55 +0200
Subject: [PATCH 393/403] mypaint: build with format other and add setuptools

---
 pkgs/applications/graphics/mypaint/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index b93b4794db81..7f1ba67acce6 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -23,6 +23,7 @@ let
 in buildPythonApplication rec {
   pname = "mypaint";
   version = "2.0.1";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "mypaint";
@@ -48,6 +49,7 @@ in buildPythonApplication rec {
     wrapGAppsHook
     gobject-introspection # for setup hook
     hicolor-icon-theme # fór setup hook
+    python3.pkgs.setuptools
   ];
 
   buildInputs = [

From 915faea21c372d746167a247138cc1b4b6610338 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 05:07:14 +0200
Subject: [PATCH 394/403] python3Packages.django-cryptography: add setuptools
 to nativeBuildInputs

---
 .../python-modules/django-cryptography/default.nix        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix
index 6443e74aa378..0aa6df4f2d2c 100644
--- a/pkgs/development/python-modules/django-cryptography/default.nix
+++ b/pkgs/development/python-modules/django-cryptography/default.nix
@@ -5,7 +5,9 @@
 , fetchFromGitHub
 , lib
 , python
-, pythonOlder }:
+, pythonOlder
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "django-cryptography";
@@ -20,6 +22,10 @@ buildPythonPackage rec {
     hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     cryptography
     django

From 59fc00babd4937d15fee47a76768bc63ab468297 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 05:08:12 +0200
Subject: [PATCH 395/403] python3Packages.dvclive: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 23755f10652b..1507156112d1 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , pytestCheckHook
 , pythonOlder
+, setuptools
 , tabulate
 }:
 
@@ -21,6 +22,10 @@ buildPythonPackage rec {
     hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     dvc-render
     tabulate # will be available as dvc-render.optional-dependencies.table

From e669ed15bb4ffaa82f23fd1e46c5bcc465c58195 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 05:09:15 +0200
Subject: [PATCH 396/403] python3Packages.dufte: add setuptools to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index 92081e08067c..dac0eddf751b 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -6,11 +6,13 @@
 , matplotlib
 , numpy
 , pytestCheckHook
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "dufte";
   version = "0.2.29";
+  format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
@@ -19,7 +21,10 @@ buildPythonPackage rec {
     rev = "v${version}";
     hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48";
   };
-  format = "pyproject";
+
+  nativeBuildInputs = [
+    setuptools
+  ];
 
   propagatedBuildInputs = [
     matplotlib

From a624a8ea482c3447c12a12ab7c1f3c8ad49d0c66 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 05:11:01 +0200
Subject: [PATCH 397/403] python3Packages.entry-points-txt: add setuptools to
 nativeBuildInputs

---
 pkgs/development/python-modules/entry-points-txt/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix
index 0e73f9768115..f6ec759b0a0a 100644
--- a/pkgs/development/python-modules/entry-points-txt/default.nix
+++ b/pkgs/development/python-modules/entry-points-txt/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -19,6 +20,10 @@ buildPythonPackage rec {
     hash = "sha256-klFSt3Od7xYgenpMP4DBFoZeQanGrmtJxDm5qeZ1Psc=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];

From 5f4562e5d7c190f95fad5b72b07f4895ecfd5bd1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 10:24:18 +0200
Subject: [PATCH 398/403] python3Packages.in-place: add setuptoos to
 nativeBuildInputs

---
 pkgs/development/python-modules/in-place/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/in-place/default.nix b/pkgs/development/python-modules/in-place/default.nix
index 6490aea35983..7114fae94e98 100644
--- a/pkgs/development/python-modules/in-place/default.nix
+++ b/pkgs/development/python-modules/in-place/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , lib
 , pytestCheckHook
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -20,6 +21,10 @@ buildPythonPackage rec {
     substituteInPlace tox.ini --replace "--cov=in_place --no-cov-on-fail" ""
   '';
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "in_place" ];

From ce6b75ad8ba3c53d9e635914e2f5f475a6db48e0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 10:27:16 +0200
Subject: [PATCH 399/403] python3Packages.fe25519: add setuptoos to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix
index 4c2d10278e0c..9e32640b8476 100644
--- a/pkgs/development/python-modules/fe25519/default.nix
+++ b/pkgs/development/python-modules/fe25519/default.nix
@@ -6,6 +6,7 @@
 , parts
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -20,6 +21,10 @@ buildPythonPackage rec {
     hash = "sha256-/grXAiWERDeTCWgFnNC1Ok8D5I9MBlwd1501TW0yK5c=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     bitlist
     fountains

From f6f01d932abfaea0096a01aba628559f2b7af7a5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 10:28:38 +0200
Subject: [PATCH 400/403] python3Packages.finitude: add setuptoos to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/finitude/default.nix b/pkgs/development/python-modules/finitude/default.nix
index eb4115914e10..aa6687a30862 100644
--- a/pkgs/development/python-modules/finitude/default.nix
+++ b/pkgs/development/python-modules/finitude/default.nix
@@ -5,6 +5,7 @@
 , pyserial
 , pythonOlder
 , pyyaml
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -21,6 +22,10 @@ buildPythonPackage rec {
     sha256 = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     pyserial
     prometheus-client

From 20af712f02f47ea50f69edda2fa40fbb2a34d371 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 10:34:59 +0200
Subject: [PATCH 401/403] python3Packages.etebase: 0.31.2 -> 0.31.5

Pin openssl_1_1, doesn't support openssl_3 yet.
---
 pkgs/development/python-modules/etebase/default.nix | 6 +++---
 pkgs/top-level/python-packages.nix                  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index 7b6a1a696fe4..bc99c09b402b 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "etebase";
-  version = "0.31.2";
+  version = "0.31.5";
 
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "etebase-py";
     rev = "v${version}";
-    hash = "sha256-enGmfXW8eV6FgdHfJqXr1orAsGbxDz9xUY6T706sf5U=";
+    hash = "sha256-87t3toMaApnOSPBKfTGGLo2VRLqU8irFac9lg3kA1eE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-4eJvFf6aY+DYkrYgam5Ok9941PX4uQOmtRznEY0+1TE=";
+    hash = "sha256-Qg0aJ6CZaPxGneIs4o402A+fhI/nlJ9X/XdMFqkD/YY=";
   };
 
   format = "pyproject";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3bca6b0d3ab..021c63ee8e4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3019,6 +3019,7 @@ in {
 
   etebase = callPackage ../development/python-modules/etebase {
     inherit (pkgs.darwin.apple_sdk.frameworks) Security;
+    openssl = pkgs.openssl_1_1;
   };
 
   etebase-server = callPackage ../servers/etebase { };

From 1fdfb1fb97c0f527a589a966a901092d7dfe8191 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 19 Sep 2022 10:36:30 +0200
Subject: [PATCH 402/403] python3Packages.hahomematic: add setuptoos to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 9e03183e2eb7..6ec939ff3f2f 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -7,6 +7,7 @@
 , pytestCheckHook
 , python-slugify
 , pythonOlder
+, setuptools
 , voluptuous
 , websocket-client
 , xmltodict
@@ -26,6 +27,10 @@ buildPythonPackage rec {
     sha256 = "sha256-LFgbZIEtHAnLPb5JPU//tAXKsvSidqT/JsVIr5uoKNs=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     aiohttp
     python-slugify

From c41353b28d88da96d140006c534d0d6e88682583 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 18 Sep 2022 17:47:20 +0000
Subject: [PATCH 403/403] file: disable tests on musl

Fixes: 4c510f32feb ("file: 5.42 -> 5.43")
---
 pkgs/tools/misc/file/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index f1e21e5920a9..980502a269a4 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ]
     ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
 
-  doCheck = true;
+  # https://bugs.astron.com/view.php?id=382
+  doCheck = !stdenv.hostPlatform.isMusl;
 
   makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";