Merge remote-tracking branch 'origin/staging' into staging-next

pkgs/applications/blockchains/chia/default.nix

@@ -6,21 +6,16 @@
 
 let chia = python3Packages.buildPythonApplication rec {
   pname = "chia";
-  version = "1.6.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "Chia-Network";
     repo = "chia-blockchain";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg=";
+    hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8=";
   };
 
-  patches = [
-    # chia tries to put lock files in the python modules directory
-    ./dont_lock_in_store.patch
-  ];
-
   postPatch = ''
     substituteInPlace setup.py \
       --replace "==" ">="
@@ -59,6 +54,7 @@ let chia = python3Packages.buildPythonApplication rec {
     fasteners
     filelock
     keyrings-cryptfile
+    psutil
     pyyaml
     setproctitle
     setuptools # needs pkg_resources at runtime

pkgs/applications/blockchains/chia/dont_lock_in_store.patch

@@ -1,21 +0,0 @@
---- a/chia/wallet/puzzles/load_clvm.py
-+++ b/chia/wallet/puzzles/load_clvm.py
-@@ -82,18 +82,6 @@ def load_serialized_clvm(clvm_filename, package_or_requirement=__name__) -> Seri
-     """
-     hex_filename = f"{clvm_filename}.hex"
- 
--    try:
--        if pkg_resources.resource_exists(package_or_requirement, clvm_filename):
--            # Establish whether the size is zero on entry
--            full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename))
--            output = full_path.parent / hex_filename
--            compile_clvm(full_path, output, search_paths=[full_path.parent])
--
--    except NotImplementedError:
--        # pyinstaller doesn't support `pkg_resources.resource_exists`
--        # so we just fall through to loading the hex clvm
--        pass
--
-     clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8")
-     assert len(clvm_hex.strip()) != 0
-     clvm_blob = bytes.fromhex(clvm_hex)

pkgs/applications/editors/jupyter-kernels/octave/default.nix

@@ -20,7 +20,7 @@ in
 rec {
   launcher = runCommand "octave-kernel-launcher" {
     inherit octave;
-    python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]);
+    python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel ps.metakernel kernel ]);
     nativeBuildInputs = [ makeWrapper ];
   } ''
     mkdir -p $out/bin

pkgs/applications/science/math/sage/sagelib.nix

@@ -49,7 +49,7 @@
 , boost
 , singular
 , pip
-, jupyter_core
+, jupyter-core
 , sage-setup
 , libhomfly
 , libbraiding
@@ -87,7 +87,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     iml
     perl
-    jupyter_core
+    jupyter-core
     pkg-config
     sage-setup
     pip # needed to query installed packages

pkgs/applications/science/networking/sumo/default.nix

@@ -1,7 +1,7 @@
 { lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
   git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
   libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
-  python37Packages, stdenv, swig, xercesc, xorg, zlib }:
+  python3Packages, stdenv, swig, xercesc, xorg, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "sumo";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     libxcrypt
     openscenegraph
     proj
-    python37Packages.setuptools
+    python3Packages.setuptools
     xercesc
     zlib
     python3

pkgs/applications/version-management/commitizen/default.nix

@@ -7,6 +7,7 @@
 , lib
 , packaging
 , poetry-core
+, py
 , pytest-freezegun
 , pytest-mock
 , pytest-regressions
@@ -29,7 +30,7 @@ buildPythonApplication rec {
     owner = "commitizen-tools";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Fri5WdLfDCn3NOtCGneKnAN+eOkLAJgPYBR+WBmc/bo=";
+    hash = "sha256-W+k+hqH0TKQAXf1Em6A1/VdqzJkhYp99I3lbqH6iDDc=";
     deepClone = true;
   };
 
@@ -37,6 +38,11 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [ poetry-core ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"'
+  '';
+
   propagatedBuildInputs = [
     termcolor
     questionary
@@ -54,6 +60,7 @@ buildPythonApplication rec {
 
   checkInputs = [
     pre-commit
+    py
     pytestCheckHook
     pytest-freezegun
     pytest-mock
@@ -81,6 +88,8 @@ buildPythonApplication rec {
     "test_bump_pre_commit_changelog"
     "test_bump_pre_commit_changelog_fails_always"
     "test_get_commits_with_signature"
+    # fatal: not a git repository (or any of the parent directories): .git
+    "test_commitizen_debug_excepthook"
   ];
 
   passthru.updateScript = nix-update-script { };

pkgs/applications/video/catt/default.nix

@@ -13,7 +13,7 @@ let
           owner = "jstasiak";
           repo = "python-zeroconf";
           rev = version;
-          sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
+          hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU=";
         };
       });
 
@@ -29,7 +29,7 @@ let
         version = "9.2.0";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d";
+          hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo=";
         };
       });
     };

pkgs/common-updater/scripts/mark-broken

@@ -48,7 +48,6 @@ denyFileList=(
 # to be conditionally disabled
 denyAttrList=(
         python27Packages
-        python37Packages
         linuxPackages_
         rubyPackages_
 )

pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch

@@ -1,30 +0,0 @@
-From a612c481f6116955d420db5ae1fe4c1eb93eb2f2 Mon Sep 17 00:00:00 2001
-From: Marcin Niemira <marcin.niemira@gmail.com>
-Date: Sun, 9 Jun 2019 07:05:06 +1000
-Subject: [PATCH] bpo-11122: fix hardcoded path checking for rpmbuild in
- bdist_rpm.py (GH-10594) (cherry picked from commit
- 45a14942c969ed508b35abd5e116cb18f84ce5b4)
-
-Co-authored-by: Marcin Niemira <marcin.niemira@gmail.com>
----
- Lib/distutils/command/bdist_rpm.py                           | 5 +----
- .../next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst    | 1 +
- 2 files changed, 2 insertions(+), 4 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst
-
-diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
-index 20ca7ac6dcffa..74381cc69a6ce 100644
---- a/Lib/distutils/command/bdist_rpm.py
-+++ b/Lib/distutils/command/bdist_rpm.py
-@@ -309,10 +309,7 @@ def run(self):
- 
-         # build package
-         log.info("building RPMs")
--        rpm_cmd = ['rpm']
--        if os.path.exists('/usr/bin/rpmbuild') or \
--           os.path.exists('/bin/rpmbuild'):
--            rpm_cmd = ['rpmbuild']
-+        rpm_cmd = ['rpmbuild']
- 
-         if self.source_only: # what kind of RPMs?
-             rpm_cmd.append('-bs')

pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch

@@ -1,108 +0,0 @@
-From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Mon, 28 Aug 2017 09:24:06 +0200
-Subject: [PATCH] Don't use ldconfig
-
----
- Lib/ctypes/util.py | 78 ++--------------------------------------------
- 1 file changed, 2 insertions(+), 76 deletions(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 0c2510e..79635a8 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -100,54 +100,7 @@ elif os.name == "posix":
-             return thefile.read(4) == elf_header
- 
-     def _findLib_gcc(name):
--        # Run GCC's linker with the -t (aka --trace) option and examine the
--        # library name it prints out. The GCC command will fail because we
--        # haven't supplied a proper program with main(), but that does not
--        # matter.
--        expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
--
--        c_compiler = shutil.which('gcc')
--        if not c_compiler:
--            c_compiler = shutil.which('cc')
--        if not c_compiler:
--            # No C compiler available, give up
--            return None
--
--        temp = tempfile.NamedTemporaryFile()
--        try:
--            args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
--
--            env = dict(os.environ)
--            env['LC_ALL'] = 'C'
--            env['LANG'] = 'C'
--            try:
--                proc = subprocess.Popen(args,
--                                        stdout=subprocess.PIPE,
--                                        stderr=subprocess.STDOUT,
--                                        env=env)
--            except OSError:  # E.g. bad executable
--                return None
--            with proc:
--                trace = proc.stdout.read()
--        finally:
--            try:
--                temp.close()
--            except FileNotFoundError:
--                # Raised if the file was already removed, which is the normal
--                # behaviour of GCC if linking fails
--                pass
--        res = re.findall(expr, trace)
--        if not res:
--            return None
--
--        for file in res:
--            # Check if the given file is an elf file: gcc can report
--            # some files that are linker scripts and not actual
--            # shared objects. See bpo-41976 for more details
--            if not _is_elf(file):
--                continue
--            return os.fsdecode(file)
--
-+        return None
- 
-     if sys.platform == "sunos5":
-         # use /usr/ccs/bin/dump on solaris
-@@ -268,34 +221,7 @@ elif os.name == "posix":
-     else:
- 
-         def _findSoname_ldconfig(name):
--            import struct
--            if struct.calcsize('l') == 4:
--                machine = os.uname().machine + '-32'
--            else:
--                machine = os.uname().machine + '-64'
--            mach_map = {
--                'x86_64-64': 'libc6,x86-64',
--                'ppc64-64': 'libc6,64bit',
--                'sparc64-64': 'libc6,64bit',
--                's390x-64': 'libc6,64bit',
--                'ia64-64': 'libc6,IA-64',
--                }
--            abi_type = mach_map.get(machine, 'libc6')
--
--            # XXX assuming GLIBC's ldconfig (with option -p)
--            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
--            regex = os.fsencode(regex % (re.escape(name), abi_type))
--            try:
--                with subprocess.Popen(['/sbin/ldconfig', '-p'],
--                                      stdin=subprocess.DEVNULL,
--                                      stderr=subprocess.DEVNULL,
--                                      stdout=subprocess.PIPE,
--                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
--                    res = re.search(regex, p.stdout.read())
--                    if res:
--                        return os.fsdecode(res.group(1))
--            except OSError:
--                pass
-+            return None
- 
-         def _findLib_ld(name):
-             # See issue #9998 for why this is needed
--- 
-2.30.0
-

pkgs/development/interpreters/python/cpython/3.7/profile-task.patch

@@ -1,21 +0,0 @@
-Backport from CPython 3.8 of a good list of tests to run for PGO.
-
-Upstream commit:
-  https://github.com/python/cpython/commit/4e16a4a31
-
-Upstream discussion:
-  https://bugs.python.org/issue36044
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 00fdd21ce..713dc1e53 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -259,7 +259,7 @@ TCLTK_LIBS=
- # The task to run while instrumented when building the profile-opt target.
- # We exclude unittests with -x that take a rediculious amount of time to
- # run in the instrumented training build or do not provide much value.
--PROFILE_TASK=-m test.regrtest --pgo
-+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c
- 
- # report files for gcov / lcov coverage report
- COVERAGE_INFO= $(abs_builddir)/coverage.info

pkgs/development/interpreters/python/cpython/default.nix

@@ -240,23 +240,11 @@ in with passthru; stdenv.mkDerivation {
   ] ++ optionals mimetypesSupport [
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch
-  ] ++ optionals isPy37 [
-    # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7.
-    # See: https://bugs.python.org/issue11122
-    ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
-    # The workaround is for unittests on Win64, which we don't support.
-    # It does break aarch64-darwin, which we do support. See:
-    # * https://bugs.python.org/issue35523
-    # * https://github.com/python/cpython/commit/e6b247c8e524
-    ./3.7/no-win64-workaround.patch
   ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [
     # Fix darwin build https://bugs.python.org/issue34027
     ./3.7/darwin-libutil.patch
   ] ++ optionals (pythonAtLeast "3.11") [
     ./3.11/darwin-libutil.patch
-  ] ++ optionals (pythonOlder "3.8") [
-    # Backport from CPython 3.8 of a good list of tests to run for PGO.
-    ./3.7/profile-task.patch
   ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [
     # Stop checking for TCL/TK in global macOS locations
     ./3.9/darwin-tcl-tk.patch

pkgs/development/interpreters/python/default.nix

@@ -151,19 +151,6 @@ in {
     inherit passthruFun;
   };
 
-  python37 = callPackage ./cpython {
-    self = __splicedPackages.python37;
-    sourceVersion = {
-      major = "3";
-      minor = "7";
-      patch = "16";
-      suffix = "";
-    };
-    sha256 = "sha256-gzjwwiIthH6QTJVTaRVdwb7u7YBujV7wSwDvR4cji/0=";
-    inherit (darwin) configd;
-    inherit passthruFun;
-  };
-
   python38 = callPackage ./cpython {
     self = __splicedPackages.python38;
     sourceVersion = {

pkgs/development/libraries/protobuf/3.21.nix

@@ -1,6 +1,6 @@
 { callPackage, abseil-cpp, ... }:
 
 callPackage ./generic-v3-cmake.nix {
-  version = "3.21.8";
-  sha256 = "sha256-cSNHX18CvMmydpYWqfe6WWk9rGxIlFfY/85rfSyznU4=";
+  version = "3.21.12";
+  sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU=";
 }

pkgs/development/python-modules/JPype1/default.nix

@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , isPy27
+, packaging
 , pythonOlder
 , typing-extensions
 , pytest
@@ -9,15 +10,17 @@
 
 buildPythonPackage rec {
   pname = "JPype1";
-  version = "1.4.0";
+  version = "1.4.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-DF9mXuPm4xwn6dLUjdEr9OtP5oWII+ahEgGgNSdMz+E=";
+    sha256 = "sha256-3I7oVAc0dK15rhaNkML2iThU9Yk2z6GPNYfK2uDTaW0=";
   };
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
+  propagatedBuildInputs = [
+    packaging
+  ] ++ lib.optionals (pythonOlder "3.8") [
     typing-extensions
   ];
 

pkgs/development/python-modules/Mako/default.nix

@@ -19,13 +19,13 @@
 
 buildPythonPackage rec {
   pname = "Mako";
-  version = "1.2.2";
+  version = "1.2.4";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NySGmzY7pjCicqX4n2jAcDUhN7j9F1dlABe34G/aFj8=";
+    sha256 = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/aardwolf/default.nix

@@ -2,14 +2,17 @@
 , arc4
 , asn1crypto
 , asn1tools
+, asyauth
 , asysocks
 , buildPythonPackage
 , colorama
-, fetchPypi
+, fetchFromGitHub
 , minikerberos
 , pillow
 , pyperclip
 , pythonOlder
+, rustPlatform
+, setuptools-rust
 , tqdm
 , unicrypto
 , winsspi
@@ -17,20 +20,40 @@
 
 buildPythonPackage rec {
   pname = "aardwolf";
-  version = "0.0.8";
+  version = "0.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-plz1D+Lr5rV8iJo7IUmuXfjxLvVxX9lgyxyYXUlPH0k=";
+  src = fetchFromGitHub {
+    owner = "skelsec";
+    repo = "aardwolf";
+    rev = "86c4b511e0dfeeb767081902af2244f6297a68eb";
+    hash = "sha256-ULczCJWVLrj0is6UYZxJNyLV6opzoJAFStqsjEmjaIA=";
   };
 
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    sourceRoot = "source/aardwolf/utils/rlers";
+    name = "${pname}-${version}";
+    hash = "sha256-F6NLWc5B577iH0uKAdj2y2TtQfo4eeXkMIK6he1tpvQ=";
+  };
+
+  cargoRoot = "aardwolf/utils/rlers";
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    setuptools-rust
+  ] ++ (with rustPlatform.rust; [
+    cargo
+    rustc
+  ]);
+
   propagatedBuildInputs = [
     arc4
     asn1crypto
     asn1tools
+    asyauth
     asysocks
     colorama
     minikerberos

pkgs/development/python-modules/absl-py/default.nix

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc=";
+    sha256 = "sha256-Rjw4oI0uTO9sSYt2ulvUhY5MbvUdoaWh8nE5oCLiAkg=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/advantage-air/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "advantage-air";
-  version = "0.4.1";
+  version = "0.4.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "advantage_air";
     inherit version;
-    hash = "sha256-I9HMDLZX9xKDJuYSAweM2r4v3ZKevHTn5dHTYxN3EuE=";
+    hash = "sha256-3t6ujBmhDVghnDSmJWb/7CHKNsvr4QFsfIqd4p8BHlA=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/aeppl/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aeppl";
-  version = "0.0.39";
+  version = "0.0.50";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "aesara-devs";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ILyE3tqoDHNmrKpHPBUJ02jrGevsU5864rjhgmgjwvo=";
+    hash = "sha256-cc41MspG2mXlNwLz7ViPPqXH/ayskVmms5SXqBo9g3Y=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/aiohttp/default.nix

@@ -30,6 +30,8 @@
 buildPythonPackage rec {
   pname = "aiohttp";
   version = "3.8.3";
+  format = "pyproject";
+
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
@@ -39,6 +41,9 @@ buildPythonPackage rec {
 
   postPatch = ''
     sed -i '/--cov/d' setup.cfg
+
+    substituteInPlace setup.cfg \
+      --replace "charset-normalizer >=2.0, < 3.0" "charset-normalizer >=2.0, < 4.0"
   '';
 
   propagatedBuildInputs = [

pkgs/development/python-modules/aiojobs/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiojobs";
-  version = "1.0.0";
+  version = "1.1.0";
   format = "flit";
 
   disabled = pythonOlder "3.6";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "EQwD0b2B9qFVd/8thKInaio0hpPzvVIjvCN0TcARu2w=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/aiolifx-themes/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aiolifx-themes";
-  version = "0.4.0";
+  version = "0.4.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Djelibeybi";
     repo = "aiolifx-themes";
     rev = "refs/tags/v${version}";
-    hash = "sha256-U3hIKmgnafkuVLi1r42BBXDKVcSSvLaRnmOEANasEyY=";
+    hash = "sha256-ND+0jukCU3jB34Sf4qAZg/+pyXVCoIoMqOoBW7srCSQ=";
   };
 
   prePatch = ''

pkgs/development/python-modules/aiomysensors/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "aiomysensors";
-  version = "0.3.3";
+  version = "0.3.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-VvGhFf9x257YdSmOxjztGZW9FLBNd028rH3+BvXAQ4o=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-jVqOOQLu/vL0L5WWtfU2rL4gNhPX+9HvchBp29aw+qA=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/aioresponses/default.nix

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "aioresponses";
-  version = "0.7.3";
+  version = "0.7.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LGTtVxDujLTpWMVpGE2tEvTJzVk5E1yzj4jGqCYczrM=";
+    sha256 = "sha256-m4wQizY1TARjO60Op1K1XZVqdgL+PjI0uTn8RK+W8dg=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/aiosmtpd/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aiosmtpd";
-  version = "1.4.2";
+  version = "1.4.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
-    rev = version;
-    sha256 = "0hbpyns1j1fpvpj7gyb8cz359j7l4hzfqbig74xp4xih59sih0wj";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-QtLtw+2jEPLOxa45vDEbWEaSZ8RIyxf1zkZjR34Wu+8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/aiosqlite/default.nix

@@ -2,6 +2,7 @@
 , aiounittest
 , buildPythonPackage
 , fetchPypi
+, flit-core
 , isPy27
 , pytestCheckHook
 , typing-extensions
@@ -9,14 +10,19 @@
 
 buildPythonPackage rec {
   pname = "aiosqlite";
-  version = "0.17.0";
+  version = "0.18.0";
+  format = "pyproject";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-8OaswkvEhkFJJnrIL7Rt+zvkRV+Z/iHfgmCcxua67lE=";
+    hash = "sha256-+qhD71+wi6/pqbOFkBLT2db3fONjeJneIGBrf8OaohM=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   checkInputs = [
     aiounittest
     pytestCheckHook

pkgs/development/python-modules/aiowatttime/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aiowatttime";
-  version = "2021.10.0";
+  version = "2022.10.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-cWXhQMgRYBzOVgUQWONIwWFB5n/f0lqkSjUb9IoPwtI=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/alembic/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.8.1";
+  version = "1.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-zQteRbFLcGQmuDPwY2m5ptXuA/gm7DI4cjzoyq9uX/o=";
+    sha256 = "sha256-+fduQQYfXr4n1P6SYA353WElIadoP5BNqzKLoCz/paI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/allure-behave/default.nix

@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "allure-behave";
-  version = "2.10.0";
+  version = "2.12.0";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-BzDu/LJBstuchkvUAeCDSIDIiFLZmC4y0s3d+1paGxs=";
+    sha256 = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/allure-pytest/default.nix

@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "allure-pytest";
-  version = "2.10.0";
+  version = "2.12.0";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Oyq2din0y9hher2BfSsiKSxut+/VWE+ZLRr4FDrqbuc=";
+    sha256 = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w=";
   };
 
   buildInputs = [

pkgs/development/python-modules/allure-python-commons-test/default.nix

@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "allure-python-commons-test";
-  version = "2.11.0";
+  version = "2.12.0";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-69iSW5pUbYQpA/dgpCr088CUaa1BGIwlijltmFZnEa0=";
+    sha256 = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/allure-python-commons/default.nix

@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "allure-python-commons";
-  version = "2.10.0";
+  version = "2.12.0";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1NMTRLDwA3pKEeFrkbKM8O6yP/oOUMJ/z8aqvnIhLTw=";
+    sha256 = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/amarna/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "amarna";
-  version = "0.1.3";
+  version = "0.1.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crytic";
     repo = "amarna";
-    rev = "v${version}";
-    hash = "sha256-cE7OhACLpRmbJWzMsGTidbbw9FOKBbz47LEJwTW6wck=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/ansible/default.nix

@@ -20,7 +20,7 @@
 
 let
   pname = "ansible";
-  version = "6.6.0";
+  version = "7.1.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -30,7 +30,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI=";
+    sha256 = "sha256-HkcjjEqp5owMU2ej/XB7psOUm0qvkSsGRArXjdK/AY0=";
   };
 
   postPatch = ''

pkgs/development/python-modules/anybadge/default.nix

@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "anybadge";
-  version = "1.11.1";
+  version = "1.14.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "jongracecox";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-6br4WUwE1ovAneYUeTHcUN3PH5Wm1rnLYCpXDUshk7Q=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A=";
   };
 
   # setup.py reads its version from the TRAVIS_TAG environment variable

pkgs/development/python-modules/anyio/default.nix

@@ -71,9 +71,17 @@ buildPythonPackage rec {
     mock
   ];
 
+  pytestFlagsArray = [
+    "-W" "ignore::trio.TrioDeprecationWarning"
+  ];
+
   disabledTests = [
     # block devices access
     "test_is_block_device"
+    # INTERNALERROR> AttributeError: 'NonBaseMultiError' object has no attribute '_exceptions'. Did you mean: 'exceptions'?
+    "test_exception_group_children"
+    "test_exception_group_host"
+    "test_exception_group_filtering"
   ];
 
   disabledTestPaths = [

pkgs/development/python-modules/apache-airflow/default.nix

@@ -77,7 +77,7 @@
 , enabledProviders ? []
 }:
 let
-  version = "2.4.3";
+  version = "2.5.0";
 
   airflow-src = fetchFromGitHub rec {
     owner = "apache";
@@ -86,7 +86,7 @@ let
     # Download using the git protocol rather than using tarballs, because the
     # GitHub archive tarballs don't appear to include tests
     forceFetchGit = true;
-    sha256 = "sha256-7E7Em6ZCWjxJiDKQ0j/vozUo58XsAxv8uW0dVVST4Ak=";
+    sha256 = "sha256-gE/kPFb5PyPOi6sqtA9YqMokbjVSKgclGNQ6fbiCdgQ=";
   };
 
   # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.

pkgs/development/python-modules/apache-beam/default.nix

@@ -45,13 +45,13 @@
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.40.0";
+  version = "2.43.0";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
-    rev = "v${version}";
-    sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo=";
   };
 
   patches = [

pkgs/development/python-modules/apispec/default.nix

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "apispec";
-  version = "5.2.2";
+  version = "6.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bqZULh6//p/ZW6Ae8/UTUerGwgCpdFYsdHMFm5zSCqc=";
+    hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/asf-search/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "asf-search";
-  version = "5.0.2";
+  version = "6.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "asfadmin";
     repo = "Discovery-asf_search";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk=";
+    hash = "sha256-kbeIGIn8HMXROPiQSmwx3lo7wEX8SDuHYgxh4ws89Mo=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/astral/default.nix

@@ -1,23 +1,46 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+
+# build
+, poetry-core
+
+# runtime
+, backports-zoneinfo
+
+# tests
+, pytestCheckHook
+, freezegun
+}:
 
 buildPythonPackage rec {
   pname = "astral";
-  version = "2.2";
-  disabled = isPy27;
+  version = "3.2";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe";
+    hash = "sha256-m3w7QS6eadFyz7JL4Oat3MnxvQGijbi+vmbXXMxTPYg=";
   };
 
-  propagatedBuildInputs = [ pytz requests freezegun ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
 
-  checkInputs = [ pytest ];
-  checkPhase = ''
-    py.test -m "not webtest"
-  '';
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
+    backports-zoneinfo
+  ];
+
+  checkInputs = [
+    freezegun
+    pytestCheckHook
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/sffjunkie/astral/releases/tag/${version}";
     description = "Calculations for the position of the sun and the moon";
     homepage = "https://github.com/sffjunkie/astral/";
     license = licenses.asl20;

pkgs/development/python-modules/astroid/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "2.12.12"; # Check whether the version is compatible with pylint
+  version = "2.12.13"; # Check whether the version is compatible with pylint
   format = "pyproject";
 
   disabled = pythonOlder "3.7.2";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-FN/bBAxx9p1iAB3WXIZyyKv/zse7xtXzslclADMbouA=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-C4A/JOFdIRgaZuV/YOLc4nC05XTtRCC1i0BcGBEG5ps=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/astropy/default.nix

@@ -19,7 +19,7 @@
 
 let
   pname = "astropy";
-  version = "5.1";
+  version = "5.2";
 in
 buildPythonPackage {
   inherit pname version;
@@ -29,7 +29,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HbGyx+3fx3PKZvozvQeyXVucO17uK5NODKJ3+lsbe34=";
+    sha256 = "sha256-0zVgQCX24W98m/gtW6KOXbR0WoLlgjqdF73Zub1GsqI=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/asttokens/default.nix

@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "asttokens";
-  version = "2.1.0";
+  version = "2.2.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SqdkAaFRyMxXLZBqrXrqKoQXgINKGdeA9DIcD+G1RjU=";
+    hash = "sha256-RiIRCypvMLd+FHOv+ql+cRvC8H0/EISEIP8YmO2+lPM=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/async-modbus/default.nix

@@ -2,6 +2,7 @@
 , buildPythonPackage
 , connio
 , fetchFromGitHub
+, fetchpatch
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
@@ -11,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "async-modbus";
-  version = "0.2.0";
+  version = "0.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,9 +21,17 @@ buildPythonPackage rec {
     owner = "tiagocoutinho";
     repo = "async_modbus";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TB+ndUvLZ9G3XXEBpLb4ULHlYZC2CoqGnL2BjMQrhRg=";
+    hash = "sha256-OTt/rUa3KLVSFOIUyMNHnqHvPtISxTposNFAgoixRfk=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Fix tests; https://github.com/tiagocoutinho/async_modbus/pull/13
+      url = "https://github.com/tiagocoutinho/async_modbus/commit/d81d8ffe94870f0f505e0c8a0694768c98053ecc.patch";
+      hash = "sha256-mG3XO2nAFYitatkswU7er29BJc/A0IL1rL2Zu4daZ7k=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace '"--cov=async_modbus",' "" \

pkgs/development/python-modules/async-modbus/fix-tests.patch

@@ -0,0 +1,73 @@
+diff --git a/tests/test_async_modbus.py b/tests/test_async_modbus.py
+index b0bd3fd..6b8df87 100644
+--- a/tests/test_async_modbus.py
++++ b/tests/test_async_modbus.py
+@@ -194,7 +194,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply):
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply
+ 
+     server = Server(slave_id, starting_address, expected_reply)
+     client = AsyncClient(server, protocol)
+@@ -204,7 +204,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply):
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply
+ 
+ 
+ @pytest.mark.asyncio
+@@ -273,7 +273,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply
+ 
+     server = Server(slave_id, starting_address, expected_reply)
+     client = AsyncClient(server, protocol)
+@@ -283,7 +283,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply
+ 
+ 
+ @pytest.mark.asyncio
+@@ -306,7 +306,7 @@ async def test_read_holding_registers(
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply
+ 
+     server = Server(slave_id, starting_address, expected_reply)
+     client = AsyncClient(server, protocol)
+@@ -316,7 +316,7 @@ async def test_read_holding_registers(
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply
+ 
+ 
+ @pytest.mark.asyncio
+@@ -383,7 +383,7 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply
+ 
+     server = Server(slave_id, starting_address, expected_reply)
+     client = AsyncClient(server, protocol)
+@@ -393,4 +393,4 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_
+             await coro
+     else:
+         reply = await coro
+-        assert (reply == expected_reply).all()
++        assert reply == expected_reply

pkgs/development/python-modules/asyncclick/default.nix

@@ -36,6 +36,10 @@ buildPythonPackage rec {
     trio
   ];
 
+  pytestFlagsArray = [
+    "-W" "ignore::trio.TrioDeprecationWarning"
+  ];
+
   disabledTests = [
     # RuntimeWarning: coroutine 'Context.invoke' was never awaited
     "test_context_invoke_type"

pkgs/development/python-modules/asyncio_mqtt/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "asyncio-mqtt";
-  version = "0.14.0";
+  version = "0.16.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "sbtinstruments";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ByVslOx/XsxVan2/xdRi+wOQR9oVpIGtHPcHlIcHMEk=";
+    hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -60,6 +60,7 @@ buildPythonPackage rec {
     "test_client_websockets"
     "test_client_pending_calls_threshold"
     "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls"
+    "test_multiple_messages_generators"
   ];
 
   meta = with lib; {

pkgs/development/python-modules/atlassian-python-api/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "atlassian-python-api";
-  version = "3.28.1";
+  version = "3.32.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "atlassian-api";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-ZKRmjfH3s35DU1Mut63YuN6opKzg2gpyunWYjg/FbHA=";
+    sha256 = "sha256-Jh3JdrA/ahge/tJipeMGag2CUk4uuGzMXC9I7UWha9E=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/attrs/default.nix

@@ -3,18 +3,24 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "attrs";
-  version = "22.1.0";
-  disabled = pythonOlder "3.5";
+  version = "22.2.0";
+  disabled = pythonOlder "3.6";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ka3CZlRH5RkdDnxWj954sh+WctNEKB0MbhqwhUKbIrY=";
+    hash = "sha256-ySJ7/C8BmTwD9o2zfR0VyWkBiDI8BnxkHxo1ylgYX5k=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   outputs = [
     "out"
     "testout"
@@ -23,7 +29,7 @@ buildPythonPackage rec {
   postInstall = ''
     # Install tests as the tests output.
     mkdir $testout
-    cp -R tests $testout/tests
+    cp -R conftest.py tests $testout
   '';
 
   pythonImportsCheck = [

pkgs/development/python-modules/attrs/tests.nix

@@ -7,6 +7,7 @@
 buildPythonPackage {
   pname = "attrs-tests";
   inherit (attrs) version;
+  format = "other";
 
   srcs = attrs.testout;
 

pkgs/development/python-modules/authcaptureproxy/default.nix

@@ -25,14 +25,6 @@ buildPythonPackage rec {
     sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c=";
   };
 
-  postPatch = ''
-    # https://github.com/alandtse/auth_capture_proxy/issues/14
-    # https://github.com/alandtse/auth_capture_proxy/issues/15
-    substituteInPlace pyproject.toml \
-       --replace "poetry.masonry.api" "poetry.core.masonry.api" \
-       --replace 'importlib-metadata = "^3.4.0"' 'importlib-metadata = "*"'
-  '';
-
   nativeBuildInputs = [
     poetry-core
   ];

pkgs/development/python-modules/autobahn/default.nix

@@ -83,8 +83,6 @@ buildPythonPackage rec {
     mock
     pytest-asyncio
     pytestCheckHook
-    # FIXME: remove the following dependencies when web3 gets added
-    eth-account
   ] ++ passthru.optional-dependencies.scram
   ++ passthru.optional-dependencies.serialization
   ++ passthru.optional-dependencies.xbr;

pkgs/development/python-modules/automat/default.nix

@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , attrs
 , pytest-benchmark
 , pytestCheckHook
@@ -10,25 +9,15 @@
 }:
 
 let automat = buildPythonPackage rec {
-  version = "20.2.0";
+  version = "22.10.0";
   pname = "automat";
 
   src = fetchPypi {
     pname = "Automat";
     inherit version;
-    sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33";
+    hash = "sha256-5WvrhO2tGdzBHTDo2biV913ute9elrhKRnBms7hLsE4=";
   };
 
-  patches = [
-    # don't depend on m2r
-    (fetchpatch {
-      name = "dont-depend-on-m2r.patch";
-      url = "https://github.com/glyph/automat/compare/v20.2.0..2562fa4ddeba5b5945d9482baa4c26a414f5e831.patch";
-      includes = [ "setup.py" ];
-      hash = "sha256-jlPLJMu1QbBpiVYHDiqPydrXjEoZgYZTVVGNxSA0NxY=";
-    })
-  ];
-
   nativeBuildInputs = [
     setuptools-scm
   ];

pkgs/development/python-modules/autopep8/default.nix

@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , fetchpatch
 , buildPythonPackage
+, pythonOlder
 , pycodestyle
 , glibcLocales
 , tomli
@@ -10,25 +11,21 @@
 
 buildPythonPackage rec {
   pname = "autopep8";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "hhatto";
     repo = "autopep8";
-    rev = "v${version}";
-    sha256 = "sha256-77ZVprACHUP8BmylTtvHvJMjb70E1YFKKdQDigAZG6s=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-pycodestyle-2.10.0.patch";
-      url = "https://github.com/hhatto/autopep8/pull/659.patch";
-      hash = "sha256-ulvQqJ3lUm8/9QZwH+whzrxbz8c11/ntc8zH2zfmXiE=";
-    })
+  propagatedBuildInputs = [
+    pycodestyle
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
   ];
 
-  propagatedBuildInputs = [ pycodestyle tomli ];
-
   checkInputs = [
     glibcLocales
     pytestCheckHook
@@ -37,8 +34,9 @@ buildPythonPackage rec {
   LC_ALL = "en_US.UTF-8";
 
   meta = with lib; {
+    changelog = "https://github.com/hhatto/autopep8/releases/tag/v${version}";
     description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
-    homepage = "https://pypi.org/project/autopep8/";
+    homepage = "https://github.com/hhatto/autopep8";
     license = licenses.mit;
     maintainers = with maintainers; [ bjornfor ];
   };

pkgs/development/python-modules/awkward-cpp/default.nix

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "awkward-cpp";
-  version = "2";
+  version = "5";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XmP0PjE19224Hgkkp07PSHD1hcEan0MlaLN3wEAohow=";
+    hash = "sha256-5dapDZihTas2WYAV5pJDufg7iFFVYQTL53jKnHmSNlY=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/awkward/default.nix

@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "2.0.0";
+  version = "2.0.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-N4KzRkMIPW7nZE6f2z2ur8S2AwpmfyGf1hy3sjSXa2g=";
+    hash = "sha256-/DbvWTTO14ttikC8lNPqWWZ3JVFrNq/qXtHveUJjp8c=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/aws-sam-translator/default.nix

@@ -5,16 +5,19 @@
 , jsonschema
 , mock
 , parameterized
+, pydantic
 , pytest-env
+, pytest-rerunfailures
+, pytest-xdist
 , pytestCheckHook
 , pythonOlder
 , pyyaml
-, six
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.47.0";
+  version = "1.55.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,13 +26,14 @@ buildPythonPackage rec {
     owner = "aws";
     repo = "serverless-application-model";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-FYEJ+mMxb8+OXUVeyLbAqOnujNi/wNhvAl4Lh4ZeE0I=";
+    sha256 = "sha256-YDqdd4zKInttHDl04kvAgHKtc1vBryW12QfE0wiLU54=";
   };
 
   propagatedBuildInputs = [
     boto3
     jsonschema
-    six
+    pydantic
+    typing-extensions
   ];
 
   postPatch = ''
@@ -43,6 +47,8 @@ buildPythonPackage rec {
     mock
     parameterized
     pytest-env
+    pytest-rerunfailures
+    pytest-xdist
     pytestCheckHook
     pyyaml
   ];
@@ -52,6 +58,16 @@ buildPythonPackage rec {
     "test_errors_13_error_definitionuri"
   ];
 
+  pytestFlagsArray = [
+    # samtranslator.translator.arn_generator.NoRegionFound: AWS Region cannot be found
+    "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app"
+    "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing"
+    "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks"
+    "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing"
+    "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls"
+    "--deselect tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2"
+  ];
+
   pythonImportsCheck = [
     "samtranslator"
   ];

pkgs/development/python-modules/aws-xray-sdk/default.nix

@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "aws-xray-sdk";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-mxSST9BijPkpNgVYZGVTVAA/CxrMPhw//eZAPQeZ3Xo=";
+    sha256 = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-core/default.nix

@@ -17,7 +17,7 @@
 , typing-extensions }:
 
 buildPythonPackage rec {
-  version = "1.25.1";
+  version = "1.26.1";
   pname = "azure-core";
   disabled = pythonOlder "3.6";
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-PBzzaGUOduwAnAfNEXSpXNy0cbJHu3LRgkX31WwYCbI=";
+    sha256 = "sha256-IjsOkMvdHwPEGxlbAyOYmYQ/INAJZNu4XmQ4aHNBSi0=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-data-tables/default.nix

@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "azure-data-tables";
-  version = "12.4.0";
+  version = "12.4.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw=";
+    sha256 = "sha256-FvEo6PZubKBcB/t4/MxxNJMjHfHYXjPE4lp5yURVhko=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-mgmt-batch/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-batch";
-  version = "16.2.0";
+  version = "17.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI=";
+    hash = "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cognitiveservices";
-  version = "13.2.0";
+  version = "13.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-XUsi5fNpirCTQ9Zz4AdYPvX8/WS7N5sQcT5t2q2YDkg=";
+    hash = "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-mgmt-compute/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-compute";
-  version = "27.2.0";
+  version = "29.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-5caVUxZvt+7L/1LDfcD/SiUwvFVF1KXdS6mDIVrSKJ0=";
+    hash = "sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-mgmt-datafactory/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datafactory";
-  version = "2.8.1";
+  version = "2.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-HuCp9J7uukK9QK0w2aHPZXiAsp4Az+6hx60ItbJvfkQ=";
+    hash = "sha256-IT1LQfdNpvc1yNX4Z/qMK2sL2MkaOA4krRFWz1SAz3s=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-multiapi-storage/default.nix

@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.10.0";
+  version = "1.0.0";
   pname = "azure-multiapi-storage";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-QhC2s/onnlbFVxMmK6SJg2hatxp4WTrYWtMV0pXtAZ8=";
+    sha256 = "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-servicebus/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "azure-servicebus";
-  version = "7.8.0";
+  version = "7.8.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-KTvJXOJ3o2KUL9iPcus6m0qS3hAAB3Wz0uPgCttFqlk=";
+    hash = "sha256-gI5eCyXGFkQgY0rhyGLioLXj1a4I6vV64Nm/EKyFEks=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-synapse-artifacts/default.nix

@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "azure-synapse-artifacts";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-WJZtE7efs1xwalyb0Sr2J+pmPIt9gn2o01/prncb2uM=";
+    sha256 = "sha256-Q1gGq7EZ/JvYjD7y0mp3kEy15QKZI84UQTdlIBoQLMs=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/backoff/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "backoff";
-  version = "2.1.2";
+  version = "2.2.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "litl";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI=";
+    sha256 = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/base58/default.nix

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, py
 , pyhamcrest
 , pytest-benchmark
 , pytestCheckHook
@@ -10,6 +11,7 @@
 buildPythonPackage rec {
   pname = "base58";
   version = "2.1.1";
+  format = "setuptools";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
@@ -18,6 +20,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
+    py
     pyhamcrest
     pytest-benchmark
     pytestCheckHook

pkgs/development/python-modules/bids-validator/default.nix

@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.9.8";
+  version = "1.9.9";
   pname = "bids-validator";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/zl5m7IF+S1vLDIvC47/DRwCiPQpGgsY/OYa+k39fz4=";
+    sha256 = "sha256-KdYZ5sOpSdUdi7AvnrEfDBnfml4P6thTLM0dUPC/toA=";
   };
 
   # needs packages which are not available in nixpkgs

pkgs/development/python-modules/biliass/default.nix

@@ -1,23 +1,43 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
+, poetry-core
 , protobuf
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "biliass";
-  version = "1.3.5";
-  disabled = pythonOlder "3.6";
+  version = "1.3.7";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "yutto-dev";
+    repo = "biliass";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Opb4rlGe+LDJZs3F7e/NZYfuMtHEWUZeMm8VZQfEzKI=";
   };
 
-  propagatedBuildInputs = [ protobuf ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
 
-  pythonImportsCheck = [ "biliass" ];
+  propagatedBuildInputs = [
+    protobuf
+  ];
+
+  doCheck = false; # test artifacts missing
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "biliass"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/yutto-dev/biliass";

pkgs/development/python-modules/billiard/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "billiard";
-  version = "4.0.0";
+  version = "4.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k=";
+    sha256 = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU=";
   };
 
   checkInputs = [

pkgs/development/python-modules/bimmer-connected/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "bimmer-connected";
-  version = "0.10.4";
+  version = "0.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "bimmerconnected";
     repo = "bimmer_connected";
     rev = "refs/tags/${version}";
-    hash = "sha256-o4h84WM/p4gVrxv7YDNgwDpyBYu7Aileagwc8PXNwPs=";
+    hash = "sha256-2WT6+KYQ9wKS7al1qfEDfDcEFaOR/fC1tBi+t1Iyqbw=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/biopython/default.nix

@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "biopython";
-  version = "1.79";
+  version = "1.80";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b";
+    sha256 = "sha256-UoBemviHZ+RQ4t+BE7W8Welk4uinu4A6g1cL27UcDkM=";
   };
 
   disabled = !isPy3k;

pkgs/development/python-modules/bitarray/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "2.6.0";
+  version = "2.6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0=";
+    hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA=";
   };
 
   checkPhase = ''

pkgs/development/python-modules/bleak/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bleak";
-  version = "0.19.4";
+  version = "0.19.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "hbldh";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Sdgsf1gFA0UcyFuaScwqmvHV2E6Crb6vSQgUbBox5hw=";
+    hash = "sha256-KKZrp5yNuslEPn/TS4eAOMT48C4A5Da5/NhklyFcy7M=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/blspy/default.nix

@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "blspy";
-  version = "1.0.13";
+  version = "1.0.16";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-feuHVtBgjzGBjY1eSKh47feTT8prdkSwvs993lJSSiI=";
+    hash = "sha256-XABdS6CCUJpZ9N1Vra078V0HoDU32u1l3yz96ZKHwFc=";
   };
 
   patches = [

pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6922167..23d8da6 100644
+index 7922652..d85b058 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH
@@ -10,7 +10,7 @@ index 6922167..23d8da6 100644
 -  # Latest commit at the moment this was added here
 -  # Anchored to libsodium v1.0.18
 -  GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65
-+  URL @sodium_src@
++  URL /nix/store/2nj48a8vb7rzxhwaigdcpa0yyax7yrv7-source
  )
  set(SODIUM_PCH "on" CACHE STRING "")
  set(SODIUM_DISABLE_TESTS "on" CACHE STRING "")
@@ -30,12 +30,12 @@ index 6922167..23d8da6 100644
    relic
 -  GIT_REPOSITORY https://github.com/Chia-Network/relic.git
 -  GIT_TAG ${RELIC_GIT_TAG}
-+  SOURCE_DIR @relic_src@
++  SOURCE_DIR /nix/store/6r9v1cmmy535q2y0pk0bkjh3ppyzb2ch-source
  )
  
  # Relic related options
 diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt
-index 5a8c381..d9aa940 100644
+index 2e331c3..d9aa940 100644
 --- a/python-bindings/CMakeLists.txt
 +++ b/python-bindings/CMakeLists.txt
 @@ -1,8 +1,7 @@
@@ -43,13 +43,13 @@ index 5a8c381..d9aa940 100644
  FetchContent_Declare(
    pybind11
 -  GIT_REPOSITORY https://github.com/pybind/pybind11.git
--  GIT_TAG        v2.6.2
+-  GIT_TAG        v2.10.0
 +  SOURCE_DIR @pybind11_src@
  )
  FetchContent_MakeAvailable(pybind11 relic)
  
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 449164a..15a955e 100644
+index 3164f7f..15a955e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -37,8 +37,7 @@ install(FILES $<TARGET_FILE:bls> DESTINATION lib)

pkgs/development/python-modules/bokeh/default.nix

@@ -28,16 +28,19 @@
 , icalendar
 , pandas
 , pythonImportsCheckHook
+, contourpy
+, xyzservices
 }:
 
 buildPythonPackage rec {
   pname = "bokeh";
   # update together with panel which is not straightforward
-  version = "2.4.3";
+  version = "3.0.3";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM=";
+    hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo=";
   };
 
   patches = [
@@ -70,10 +73,10 @@ buildPythonPackage rec {
     requests
     nbconvert
     icalendar
-    pandas
   ];
 
   propagatedBuildInputs = [
+    contourpy
     pillow
     jinja2
     python-dateutil
@@ -81,8 +84,10 @@ buildPythonPackage rec {
     pyyaml
     tornado
     numpy
+    pandas
     packaging
     typing-extensions
+    xyzservices
   ]
   ++ lib.optionals ( isPy27 ) [
     futures

pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch

@@ -1,9 +1,9 @@
-diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py
-index a752aad7d..8af05ff63 100644
---- a/bokeh/util/compiler.py
-+++ b/bokeh/util/compiler.py
-@@ -442,8 +442,8 @@ def _detect_nodejs():
-     raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version +
+diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py
+index 9af8691..4b93543 100644
+--- a/src/bokeh/util/compiler.py
++++ b/src/bokeh/util/compiler.py
+@@ -415,8 +415,8 @@ def _detect_nodejs() -> str:
+     raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' +
                         '("conda install nodejs" or follow https://nodejs.org/en/download/)')
  
 -_nodejs = None
@@ -11,5 +11,5 @@ index a752aad7d..8af05ff63 100644
 +_nodejs = "@node_bin@"
 +_npmjs = "@npm_bin@"
  
- def _nodejs_path():
+ def _nodejs_path() -> str:
      global _nodejs

pkgs/development/python-modules/botocore/default.nix

@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.29.38"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.29.40"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-K5jH2oZozcAitNila1BoZFTQoQwRUYcC/eQYgdIGGLY=";
+    hash = "sha256-5YKsBykBjaQVsLXeFOox/9CtBIOp/bgUeQJSbQY0f7c=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/branca/default.nix

@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "branca";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-5vL366fdNozu+PY4Irhn9eEdTTq90Jmnh9ue0rcGWuE=";
+    sha256 = "sha256-VZSYVSFFBMdYO3G5oDqE3OLpaoQCdhO7U7QtBIRM4k4=";
   };
 
   checkInputs = [ pytest selenium ];

pkgs/development/python-modules/browser-cookie3/default.nix

@@ -6,20 +6,20 @@
 , lz4
 , keyring
 , pbkdf2
-, pycryptodome
+, pycryptodomex
 , pyaes
 }:
 
 buildPythonPackage rec {
   pname = "browser-cookie3";
-  version = "0.16.2";
+  version = "0.16.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IB0Ms+mCHh7lfG3XYfvE2h/2lec5Tq9AAjqANz7x0hE=";
+    hash = "sha256-LWqXml6ShNU7gHZChdETwkSmLhipnSCgnyCWnBs7MXw=";
   };
 
   propagatedBuildInputs = [
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     keyring
     pbkdf2
     pyaes
-    pycryptodome
+    pycryptodomex
   ];
 
   # No tests implemented

pkgs/development/python-modules/bthome-ble/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "bthome-ble";
-  version = "2.3.1";
+  version = "2.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-4KsMYQQN/4A2sbk2Fj8CYOBf7/UAciJ4wTSFYZaCfdk=";
+    hash = "sha256-BLRXoKZkSWgzGIztwmO8El8pF25QBrTEX05FWXZrHxc=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/btrees/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "btrees";
-  version = "4.11.0";
+  version = "4.11.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "BTrees";
     inherit version;
-    hash = "sha256-AFwDtIAp1noojnYIeYw3rCSfLAabb1GDZAqUmdzY+qM=";
+    hash = "sha256-kIUAsCD/mJsAlG+Kb2Vz84qbGAjQd+UuPc8Ej7FwwTo=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/bytecode/default.nix

@@ -3,20 +3,28 @@
 , fetchFromGitHub
 , pythonOlder
 , pytestCheckHook
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "bytecode";
-  version = "0.13.0";
+  version = "0.14.0";
+  format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "vstinner";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-aY19qMYW7KziiXVY3lxdnHk7OCAJaNh+aTvlQyJWmDw=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-nGZ4qcms27lYr1dYvVe4ebd/jc5qIb1EDhSpSZmKKIo=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];

pkgs/development/python-modules/catboost/default.nix

@@ -5,15 +5,15 @@
 
 buildPythonPackage rec {
   pname = "catboost";
-  version = "1.0.5";
+  version = "1.1.1";
 
   disabled = pythonOlder "3.4";
 
   src = fetchFromGitHub {
     owner = "catboost";
     repo = "catboost";
-    rev = "v${version}";
-    sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY=";
   };
 
   nativeBuildInputs = [ clang_12 ];

pkgs/development/python-modules/cbor2/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "cbor2";
-  version = "5.4.3";
+  version = "5.4.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Yrhjxe5s7UAyr+lI88FITzdVUJldO4SYFFI3/ijlRsI=";
+    hash = "sha256-uJNQDbD+Az5XDDrclWr27vxX4oACa9LYb9U9qfHllNc=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/celery/default.nix

@@ -38,10 +38,15 @@ buildPythonPackage rec {
 
   patches = [
     (fetchpatch {
-      name = "billiard-4.0-comat.patch";
+      name = "billiard-4.0-compat.patch";
       url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch";
       hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto=";
     })
+    (fetchpatch  {
+      name = "billiard-4.1-compat.patch";
+      url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch";
+      hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE=";
+    })
   ];
 
   postPatch = ''

pkgs/development/python-modules/cepa/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cepa";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "HcbwsyTTei7SyidGSOzo/SyWodL0QPWMDKF6/Ute3no=";
+    sha256 = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY=";
   };
 
   postPatch = ''

pkgs/development/python-modules/certbot/default.nix

@@ -26,13 +26,13 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "1.31.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-JDhesUU6SQBEf0CG3vo1AhlRfGpltTEUmSqrpGIpptg=";
+    sha256 = "sha256-fCKTDAJiulwL2SOw4bV3vu0VEsvXGF+1ry8esYori8o=";
   };
 
   sourceRoot = "source/${pname}";

pkgs/development/python-modules/cffi/default.nix

@@ -32,6 +32,24 @@ if isPyPy then null else buildPythonPackage rec {
     # deemed safe to trust in cffi.
     #
     ./darwin-use-libffi-closures.diff
+    (fetchpatch {
+      # Drop py.code usage from tests, no longer depend on the deprecated py package
+      url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch";
+      excludes = [
+        "README.md"
+        "requirements.txt"
+      ];
+      hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k=";
+    })
+    (fetchpatch {
+      #  Replace py.test usage with pytest
+      url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch";
+      excludes = [
+        "README.md"
+        "requirements.txt"
+      ];
+      hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws=";
+    })
   ] ++  lib.optionals (pythonAtLeast "3.11") [
     # Fix test that failed because python seems to have changed the exception format in the
     # final release. This patch should be included in the next version and can be removed when

pkgs/development/python-modules/cfn-lint/default.nix

@@ -19,13 +19,13 @@
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "0.61.2";
+  version = "0.72.5";
 
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = "cfn-python-lint";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-282h1fBWhAfwqCuP+dU3ajn0gQtmOcPNTMKZ0a2+vHU=";
+    sha256 = "sha256-UDjCTl4AAOrwiXbKYIFsZCaSDjIFXYwNnp8/hIfXbM0=";
   };
 
   postPatch = ''

pkgs/development/python-modules/chardet/default.nix

@@ -4,18 +4,24 @@
 , hypothesis
 , pythonOlder
 , pytestCheckHook
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "chardet";
-  version = "5.0.0";
+  version = "5.1.0";
+  format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-A2jfK/14tfwgVyu06bt/tT4sCU9grpmTM56GcdCvuKo=";
+    hash = "sha256-DWJxK5VrwVT4X7CiZuKjxZE8KWfgA0hwGzJBHW3vMeU=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     hypothesis
     pytestCheckHook
@@ -29,6 +35,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "chardet" ];
 
   meta = with lib; {
+    changelog = "https://github.com/chardet/chardet/releases/tag/${version}";
     description = "Universal encoding detector";
     homepage = "https://github.com/chardet/chardet";
     license = licenses.lgpl21Plus;

pkgs/development/python-modules/charset-normalizer/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "charset-normalizer";
-  version = "2.1.0";
+  version = "3.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "Ousret";
     repo = "charset_normalizer";
     rev = "refs/tags/${version}";
-    hash = "sha256-ntNMHjkQJqzSElEeyFmPIjUh6ZxQkTktPipfPHiJ/Vc=";
+    hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk=";
   };
 
   checkInputs = [

pkgs/development/python-modules/chart-studio/default.nix

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "chart-studio";
-  version = "5.10.0";
+  version = "5.11.0";
 
   # chart-studio was split from plotly
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-j1MiLUSIun0xnUFCcyZ5p8eGF5Q34jCwoVuQG5xSlkU=";
+    sha256 = "sha256-Reti8tvBpBxpfNjnZs8wWuS76oEWIKPCxzSdTEO+ykA=";
   };
 
   sourceRoot = "source/packages/python/chart-studio";

pkgs/development/python-modules/cheroot/default.nix

@@ -20,13 +20,13 @@
 
 buildPythonPackage rec {
   pname = "cheroot";
-  version = "8.6.0";
+  version = "9.0.0";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU=";
+    hash = "sha256-PUetnuGey+wUS0dYOZA2aS/b9npAuW7vH7FFQ2ez0zg=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/cherrypy/default.nix

@@ -78,6 +78,9 @@ buildPythonPackage rec {
 
     "test_antistampede"
     "test_file_stream"
+    "test_basic_request"
+    "test_3_Redirect"
+    "test_4_File_deletion"
   ] ++ lib.optionals stdenv.isDarwin [
     "test_block"
   ];