From 21c0a5bedb2e7daa1d7e5bd99028bd522977ddf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Oct 2022 19:32:30 +0000
Subject: [PATCH 001/953] libavif: 0.10.0 -> 0.11.1

---
 pkgs/development/libraries/libavif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index d5a2a686b893..bdb384f2496c 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libavif";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-EGu2avkqQXHFX4gKWsVfVdQN99f4J7Hm86C0sAhuP1Y=";
+    sha256 = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs=";
   };
 
   # reco: encode libaom slowest but best, decode dav1d fastest

From a5eb3b03ffff6e709412c7f3e1e57e04df2349ed Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 28 Nov 2022 14:46:44 +0100
Subject: [PATCH 002/953] cups: fix cups.socket unit

The cups.socket unit shouldn't be part of cups.service: stopping the
service would stop the socket and break subsequent socket activations.

See https://github.com/apple/cups/issues/6005
---
 pkgs/misc/cups/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index c844dbffee40..a9c818a12f57 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -57,6 +57,11 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace cups/testfile.c \
       --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin'
+
+      # The cups.socket unit shouldn't be part of cups.service: stopping the
+      # service would stop the socket and break subsequent socket activations.
+      # See https://github.com/apple/cups/issues/6005
+      sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in
   '';
 
   nativeBuildInputs = [ pkg-config removeReferencesTo ];

From f5b5432450264c8a2c571061259d9cfe0f65a1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 20 Nov 2022 13:50:53 +0100
Subject: [PATCH 003/953] ruby: fix cross compiling extensions

Update pkgs/development/interpreters/ruby/default.nix

Co-authored-by: Artturi <Artturin@artturin.com>
---
 pkgs/development/interpreters/ruby/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index dc7594da17d9..538d78b8494b 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -187,6 +187,18 @@ let
               sed -i '/CC_VERSION_MESSAGE/d' $rbConfig
             ''
           }
+
+          # Allow to override compiler. This is important for cross compiling as
+          # we need to set a compiler that is different from the build one.
+          awk -i inplace -F' = ' \
+            ' # operate on the line starting with
+              /^  CONFIG\["CC"\]/ {
+                # replace the right hand side
+                sub($2, "ENV[\"CC\"] || \"1\"")
+              }; { print }' "$rbConfig"
+          # test that the line isn't mangled in case upstream made the above unnecessary
+          grep -qx '  CONFIG\["CC"\] = ENV\["CC"\] || "1"' "$rbConfig"
+
           # Remove unnecessary external intermediate files created by gems
           extMakefiles=$(find $out/lib/ruby/gems -name Makefile)
           for makefile in $extMakefiles; do

From d402e05f6a6a2b87b15cde6d04cf251d6ee94407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 4 Dec 2022 10:26:22 +0100
Subject: [PATCH 004/953] libdevil: cleanup, add proper option for X support

---
 .../libraries/libdevil/default.nix            | 46 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index a79e5371c01b..35637512e0a5 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -1,23 +1,37 @@
-{ lib, stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL
-, libX11, pkg-config, OpenGL
+{ lib
+, stdenv
+, fetchurl
+, libjpeg
+, libpng
+, libmng
+, lcms1
+, libtiff
+, openexr
+, libGL
+, libX11
+, pkg-config
+, OpenGL
+, runtimeShell
+, withXorg ? true
 }:
 
 stdenv.mkDerivation rec {
-
   pname = "libdevil";
   version = "1.7.8";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz";
     sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8";
   };
 
-  outputs = [ "out" "dev" ];
-
-  buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ]
-    ++ lib.optionals stdenv.isDarwin [ OpenGL ];
   nativeBuildInputs = [ pkg-config ];
 
+  buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ]
+    ++ lib.optionals withXorg [ libX11 libGL ]
+    ++ lib.optionals stdenv.isDarwin [ OpenGL ];
+
   configureFlags = [ "--enable-ILU" "--enable-ILUT" ];
 
   preConfigure = ''
@@ -31,29 +45,29 @@ stdenv.mkDerivation rec {
     sed -i '/RESTRICT_KEYWORD/d' include/IL/config.h
   '';
 
-  patches =
-    [ ( fetchurl {
+  patches = [
+    (fetchurl {
         url = "https://sources.debian.org/data/main/d/devil/1.7.8-10/debian/patches/03_CVE-2009-3994.diff";
         sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc";
-      } )
-      ./ftbfs-libpng15.patch
-      ./il_endian.h.patch
-    ];
+    })
+    ./ftbfs-libpng15.patch
+    ./il_endian.h.patch
+  ];
 
   enableParallelBuilding = true;
 
   postPatch = ''
     for a in test/Makefile.in test/format_test/format_checks.sh.in ; do
       substituteInPlace $a \
-        --replace /bin/bash ${stdenv.shell}
+        --replace /bin/bash ${runtimeShell}
     done
   '';
 
   meta = with lib; {
-    homepage = "http://openil.sourceforge.net/";
+    homepage = "https://openil.sourceforge.net/";
     description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
     license = licenses.lgpl2;
     platforms = platforms.mesaPlatforms;
-    maintainers = [ ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f7e3a7f6002..5cee437b21ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20275,8 +20275,7 @@ with pkgs;
   };
 
   libdevil-nox = libdevil.override {
-    libX11 = null;
-    libGL = null;
+    withXorg = false;
   };
 
   libdecor = callPackage ../development/libraries/libdecor { };

From 7c473eb699d1c92db5f8aa1fe96d79eb2ae4aebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 4 Dec 2022 10:38:20 +0100
Subject: [PATCH 005/953] gd: add withXorg flag, little cleanups

---
 pkgs/development/libraries/gd/default.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index 7ea8ce6d29b4..c9845feb9678 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurl
+{ lib
+, stdenv
+, fetchurl
 , fetchpatch
 , autoconf
 , automake
@@ -8,6 +10,7 @@
 , libjpeg
 , libwebp
 , libtiff
+, withXorg ? true
 , libXpm
 , libavif
 , fontconfig
@@ -33,20 +36,22 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  configureFlags =
-    [
-      "--enable-gd-formats"
-    ]
+  configureFlags = [
+    "--enable-gd-formats"
+  ]
     # -pthread gets passed to clang, causing warnings
     ++ lib.optional stdenv.isDarwin "--enable-werror=no";
 
   nativeBuildInputs = [ autoconf automake pkg-config ];
 
-  buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libXpm libavif ];
+  buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libavif ]
+    ++ lib.optional withXorg libXpm;
 
   outputs = [ "bin" "dev" "out" ];
 
-  postFixup = ''moveToOutput "bin/gdlib-config" $dev'';
+  postFixup = ''
+    moveToOutput "bin/gdlib-config" $dev
+  '';
 
   enableParallelBuilding = true;
 
@@ -57,5 +62,6 @@ stdenv.mkDerivation rec {
     description = "A dynamic image creation library";
     license = licenses.free; # some custom license
     platforms = platforms.unix;
+    maintainers = with maintainers; [ ];
   };
 }

From 88800d588b6ccc28ff8dfa0bd7420945996e7cec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Dec 2022 08:29:16 +0000
Subject: [PATCH 006/953] dnsmasq: 2.87 -> 2.88

---
 pkgs/tools/networking/dnsmasq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 1eb8b85166fe..6d4e28f6cb6b 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "dnsmasq";
-  version = "2.87";
+  version = "2.88";
 
   src = fetchurl {
     url = "https://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz";
-    sha256 = "sha256-AijANkp/I1b9fn8VSZN8vzCZp407LrG6W7DDHiuJ3no=";
+    sha256 = "sha256-I1RN7aEDQMBTvqbxWpP+1up/WqqFMWv8Zx/6bSL7wbM=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

From 8a041c63c00ab9f03cfc468dcdecf2138e31513e Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 4 Dec 2022 20:52:06 -0500
Subject: [PATCH 007/953] rustPlatform.buildRustPackage: build auditable
 binaries

---
 .../rust/build-rust-package/default.nix       |  6 +++
 .../rust/hooks/cargo-build-hook.sh            |  2 +-
 .../rust/hooks/cargo-check-hook.sh            |  2 +-
 .../rust/hooks/cargo-nextest-hook.sh          |  2 +-
 pkgs/development/compilers/rust/cargo.nix     |  3 ++
 .../tools/rust/cargo-auditable/default.nix    | 51 ++++++++++++-------
 6 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 679e10a3442e..a7a9d9b52fc0 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -11,6 +11,7 @@
 , cargoInstallHook
 , cargoNextestHook
 , cargoSetupHook
+, cargo-auditable
 , rustc
 , libiconv
 , windows
@@ -42,6 +43,7 @@
 , buildFeatures ? [ ]
 , checkFeatures ? buildFeatures
 , useNextest ? false
+, auditable ? true
 , depsExtraArgs ? {}
 
 # Toggles whether a custom sysroot is created when the target is a .json file.
@@ -113,6 +115,8 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
 
   cargoCheckFeatures = checkFeatures;
 
+  cargoCommand = if auditable then "cargo auditable" else "cargo";
+
   patchRegistryDeps = ./patch-registry-deps;
 
   nativeBuildInputs = nativeBuildInputs ++ [
@@ -123,6 +127,8 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
     cargoInstallHook
     cargoSetupHook
     rustc
+  ] ++ lib.optionals auditable [
+    cargo-auditable
   ];
 
   buildInputs = buildInputs
diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
index 7503fae4cd7f..0fe07d6e856e 100644
--- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -31,7 +31,7 @@ cargoBuildHook() {
       "CXX_@rustBuildPlatform@=@cxxForBuild@" \
       "CC_@rustTargetPlatform@=@ccForHost@" \
       "CXX_@rustTargetPlatform@=@cxxForHost@" \
-      cargo build -j $NIX_BUILD_CORES \
+      ${cargoCommand-cargo} build -j $NIX_BUILD_CORES \
         --target @rustTargetPlatformSpec@ \
         --frozen \
         ${cargoBuildProfileFlag} \
diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
index 57fc2779cfe9..c2a909c76f6f 100644
--- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -33,7 +33,7 @@ cargoCheckHook() {
 
     (
         set -x
-        cargo test \
+        ${cargoCommand-cargo} test \
               -j $NIX_BUILD_CORES \
               ${argstr} -- \
               --test-threads=${threads} \
diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
index de85683ead2a..a4ab778c298a 100644
--- a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
@@ -33,7 +33,7 @@ cargoNextestHook() {
 
     (
         set -x
-        cargo nextest run \
+        ${cargoCommand-cargo} nextest run \
               -j ${threads} \
               ${argstr} -- \
               ${checkFlags} \
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 2c9a3b1af472..ec80533cc069 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -2,6 +2,7 @@
 , file, curl, pkg-config, python3, openssl, cmake, zlib
 , installShellFiles, makeWrapper, cacert, rustPlatform, rustc
 , libiconv, CoreFoundation, Security
+, auditable ? true
 }:
 
 rustPlatform.buildRustPackage {
@@ -12,6 +13,8 @@ rustPlatform.buildRustPackage {
   cargoVendorDir = "vendor";
   buildAndTestSubdir = "src/tools/cargo";
 
+  inherit auditable;
+
   passthru = {
     rustc = rustc;
     inherit (rustc) tests;
diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix
index 64580d8ad8b3..52d647b2b0a5 100644
--- a/pkgs/development/tools/rust/cargo-auditable/default.nix
+++ b/pkgs/development/tools/rust/cargo-auditable/default.nix
@@ -1,23 +1,38 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, fetchFromGitHub, makeRustPlatform, rustc, cargo }:
 
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-auditable";
-  version = "0.5.5";
+let
+  args = rec {
+    pname = "cargo-auditable";
+    version = "0.5.5";
 
-  src = fetchFromGitHub {
-    owner = "rust-secure-code";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-mEmTgd7sC2jmYeb5pEO985v/aWWKlq/mSQUAGi32loY=";
+    src = fetchFromGitHub {
+      owner = "rust-secure-code";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "sha256-mEmTgd7sC2jmYeb5pEO985v/aWWKlq/mSQUAGi32loY=";
+    };
+
+    cargoSha256 = "sha256-G72UUqvFaTY/GQSkpz1wIzjb7vIWuAjvKMZosUB6YsA=";
+
+    meta = with lib; {
+      description = "A tool to make production Rust binaries auditable";
+      homepage = "https://github.com/rust-secure-code/cargo-auditable";
+      changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md";
+      license = with licenses; [ mit /* or */ asl20 ];
+      maintainers = with maintainers; [ figsoda ];
+    };
   };
 
-  cargoSha256 = "sha256-G72UUqvFaTY/GQSkpz1wIzjb7vIWuAjvKMZosUB6YsA=";
-
-  meta = with lib; {
-    description = "A tool to make production Rust binaries auditable";
-    homepage = "https://github.com/rust-secure-code/cargo-auditable";
-    changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md";
-    license = with licenses; [ mit /* or */ asl20 ];
-    maintainers = with maintainers; [ figsoda ];
+  rustPlatform = makeRustPlatform {
+    inherit rustc;
+    cargo = cargo.override {
+      auditable = false;
+    };
   };
-}
+
+  bootstrap = rustPlatform.buildRustPackage (args // {
+    auditable = false;
+  });
+in
+
+rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } args

From 6c01681679f7d2da1d300b6d16d11d58ba8b2286 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 6 Dec 2022 00:05:28 +0200
Subject: [PATCH 008/953] make-symlinks-relative: fix no such file or directory
 if output is created in postFixup

wlroots(and others) have
```
wlroots> +++ find /nix/store/3a0xwszw8n5dzzhsgfnilvsqi4hk565s-wlroots-0.15.1-examples -type l -print0
wlroots> find: '/nix/store/3a0xwszw8n5dzzhsgfnilvsqi4hk565s-wlroots-0.15.1-examples': No such file or directory
```

because the examples output is created in postFixup while this hook runs in fixupPhase
---
 pkgs/build-support/setup-hooks/make-symlinks-relative.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
index 0608d3ca81c4..cd9c2eaa2d80 100644
--- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
+++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
@@ -1,4 +1,4 @@
-fixupOutputHooks+=(_makeSymlinksRelative)
+postFixupHooks+=(_makeSymlinksRelative)
 
 # For every symlink in $output that refers to another file in $output
 # ensure that the symlink is relative. This removes references to the output

From 0e5137f267ecf7dc0c9d68cc1b6fde13f5dc77ef Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 18:43:06 -0500
Subject: [PATCH 009/953] rustPlatform.buildRustPackage: make it not auditable
 by default

---
 pkgs/build-support/rust/build-rust-package/default.nix  | 3 ++-
 pkgs/development/compilers/rust/cargo.nix               | 2 +-
 pkgs/development/tools/rust/cargo-auditable/default.nix | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index a7a9d9b52fc0..6da9566f8813 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -43,7 +43,8 @@
 , buildFeatures ? [ ]
 , checkFeatures ? buildFeatures
 , useNextest ? false
-, auditable ? true
+, auditable ? false # TODO: change to true
+
 , depsExtraArgs ? {}
 
 # Toggles whether a custom sysroot is created when the target is a .json file.
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index ec80533cc069..5571918fdc62 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -2,7 +2,7 @@
 , file, curl, pkg-config, python3, openssl, cmake, zlib
 , installShellFiles, makeWrapper, cacert, rustPlatform, rustc
 , libiconv, CoreFoundation, Security
-, auditable ? true
+, auditable ? false # TODO: change to true when this is the default
 }:
 
 rustPlatform.buildRustPackage {
diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix
index 52d647b2b0a5..6d8424040d02 100644
--- a/pkgs/development/tools/rust/cargo-auditable/default.nix
+++ b/pkgs/development/tools/rust/cargo-auditable/default.nix
@@ -35,4 +35,6 @@ let
   });
 in
 
-rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } args
+rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (args // {
+  auditable = true; # TODO: remove when this is the default
+})

From 0024ffa7c26ecaff146cae9f04f465dd5ee144cc Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 18:43:34 -0500
Subject: [PATCH 010/953] alacritty: make auditable

---
 pkgs/applications/terminal-emulators/alacritty/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
index 7c0bd8b6410a..272b875cd7a8 100644
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -60,6 +60,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw=";
 
+  auditable = true; # TODO: remove when this is the default
+
   nativeBuildInputs = [
     cmake
     installShellFiles

From 6f52f4b6776cb711ff2fe93128767d828bd066af Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 18:43:48 -0500
Subject: [PATCH 011/953] rust-analyzer: make auditable

---
 pkgs/development/tools/rust/rust-analyzer/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index f9ec10f34301..e70d7b955b14 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -22,6 +22,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-D0YwkSqwtD08twtCtN5q0a8S0Y26kgDWg1ruRNEQEOw=";
   };
 
+  auditable = true; # TODO: remove when this is the default
+
   cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
   cargoTestFlags = [ "--package" "rust-analyzer" "--package" "proc-macro-srv-cli" ];
 

From e4186ccd21b5e7c4253ec12768648f77180fb03b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 18:44:07 -0500
Subject: [PATCH 012/953] jumpy: make auditable

---
 pkgs/games/jumpy/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix
index 645069e4354d..4fea663af533 100644
--- a/pkgs/games/jumpy/default.nix
+++ b/pkgs/games/jumpy/default.nix
@@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A=";
 
+  auditable = true; # TODO: remove when this is the default
+
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     pkg-config
   ];

From 506762f643c53fc3687bd72821e9f88b52243596 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 18:44:22 -0500
Subject: [PATCH 013/953] fd: make auditable

---
 pkgs/tools/misc/fd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 6dd0e7a6e7cb..dc640dc438a6 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-QFh47Pr+7lIdT++huziKgMJxvsZElTTwu11c7/wjyHE=";
 
+  auditable = true; # TODO: remove when this is the default
+
   nativeBuildInputs = [ installShellFiles ];
 
   preFixup = ''

From f053bc8339e2fa2598eac55814ef10d4ce7cd157 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 18:44:30 -0500
Subject: [PATCH 014/953] ripgrep: make auditable

---
 pkgs/tools/text/ripgrep/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 022f8bd25bb7..be989994dbff 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -22,6 +22,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp";
 
+  auditable = true; # TODO: remove when this is the default
+
   nativeBuildInputs = [ asciidoctor installShellFiles ]
     ++ lib.optional withPCRE2 pkg-config;
   buildInputs = lib.optional withPCRE2 pcre2

From b632d78aeacc6259065e4471c1817d3a99b4f305 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 18:57:49 -0500
Subject: [PATCH 015/953] rav1e: make auditable

---
 pkgs/tools/video/rav1e/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index ed6a8f542343..b664f32b4df9 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -13,17 +13,19 @@ in rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-V9QbztkFj3t5yBV+yySysDy3Q6IUY4gNzBL8h23aEg4=";
 
+  auditable = true; # TODO: remove when this is the default
+
   nativeBuildInputs = [ nasm cargo-c ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 
   checkType = "debug";
 
   postBuild = ''
-    cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
+    $cargoCommand cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
   '';
 
   postInstall = ''
-    cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
+    $cargoCommand cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
   '';
 
   meta = with lib; {

From 9e3db33a6b05806ec098f54d89d2bdb74fdbbfb1 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 19:10:32 -0500
Subject: [PATCH 016/953] mdbook: make auditable

---
 pkgs/tools/text/mdbook/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 56d60eb7fb55..3376937880c1 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-KVoMC8ypikABVkIj5dCSHzYZ9CV8UMuAFxSEYLaQTSk=";
 
+  auditable = true; # TODO: remove when this is the default
+
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
   # Tests rely on unset 'RUST_LOG' value to emit INFO messages.

From ac17e99f6c3022ce5d8fae790dc98431395a105e Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 6 Dec 2022 23:15:57 -0500
Subject: [PATCH 017/953] cargo-auditable: 0.5.5 -> unstable-2022-12-07

Diff: https://github.com/rust-secure-code/cargo-auditable/compare/v0.5.5...246468da22d619c816227797fb176c44026c7105
---
 pkgs/development/tools/rust/cargo-auditable/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix
index 6d8424040d02..b60c0fe62050 100644
--- a/pkgs/development/tools/rust/cargo-auditable/default.nix
+++ b/pkgs/development/tools/rust/cargo-auditable/default.nix
@@ -3,16 +3,16 @@
 let
   args = rec {
     pname = "cargo-auditable";
-    version = "0.5.5";
+    version = "unstable-2022-12-07";
 
     src = fetchFromGitHub {
       owner = "rust-secure-code";
       repo = pname;
-      rev = "v${version}";
-      sha256 = "sha256-mEmTgd7sC2jmYeb5pEO985v/aWWKlq/mSQUAGi32loY=";
+      rev = "246468da22d619c816227797fb176c44026c7105";
+      sha256 = "sha256-tZ6qA20TM+mZa2bYWWdFeM+6104e+hVE9Swst2n6Mx8=";
     };
 
-    cargoSha256 = "sha256-G72UUqvFaTY/GQSkpz1wIzjb7vIWuAjvKMZosUB6YsA=";
+    cargoSha256 = "sha256-LkFP/m/pTIDnIueNDwM89lk7FNXnT4Fl8EIdXgR9oOg=";
 
     meta = with lib; {
       description = "A tool to make production Rust binaries auditable";

From a6137b73f9656c0c5d7c8422c0f7444abbdfc14b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 7 Dec 2022 00:18:58 -0500
Subject: [PATCH 018/953] cargo-auditable-cargo-wrapper: init

---
 .../rust/build-rust-package/default.nix             | 11 ++++++-----
 pkgs/build-support/rust/hooks/cargo-build-hook.sh   |  2 +-
 pkgs/build-support/rust/hooks/cargo-check-hook.sh   |  2 +-
 pkgs/build-support/rust/hooks/cargo-nextest-hook.sh |  2 +-
 .../tools/rust/cargo-auditable/cargo-wrapper.nix    | 13 +++++++++++++
 pkgs/tools/video/rav1e/default.nix                  |  4 ++--
 pkgs/top-level/all-packages.nix                     |  1 +
 7 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/tools/rust/cargo-auditable/cargo-wrapper.nix

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 6da9566f8813..20fb41d0aaa7 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -12,6 +12,7 @@
 , cargoNextestHook
 , cargoSetupHook
 , cargo-auditable
+, cargo-auditable-cargo-wrapper
 , rustc
 , libiconv
 , windows
@@ -116,11 +117,13 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
 
   cargoCheckFeatures = checkFeatures;
 
-  cargoCommand = if auditable then "cargo auditable" else "cargo";
-
   patchRegistryDeps = ./patch-registry-deps;
 
-  nativeBuildInputs = nativeBuildInputs ++ [
+  nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [
+    (cargo-auditable-cargo-wrapper.override {
+      inherit cargo-auditable;
+    })
+  ] ++ [
     cacert
     git
     cargoBuildHook
@@ -128,8 +131,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
     cargoInstallHook
     cargoSetupHook
     rustc
-  ] ++ lib.optionals auditable [
-    cargo-auditable
   ];
 
   buildInputs = buildInputs
diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
index 0fe07d6e856e..7503fae4cd7f 100644
--- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -31,7 +31,7 @@ cargoBuildHook() {
       "CXX_@rustBuildPlatform@=@cxxForBuild@" \
       "CC_@rustTargetPlatform@=@ccForHost@" \
       "CXX_@rustTargetPlatform@=@cxxForHost@" \
-      ${cargoCommand-cargo} build -j $NIX_BUILD_CORES \
+      cargo build -j $NIX_BUILD_CORES \
         --target @rustTargetPlatformSpec@ \
         --frozen \
         ${cargoBuildProfileFlag} \
diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
index c2a909c76f6f..57fc2779cfe9 100644
--- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -33,7 +33,7 @@ cargoCheckHook() {
 
     (
         set -x
-        ${cargoCommand-cargo} test \
+        cargo test \
               -j $NIX_BUILD_CORES \
               ${argstr} -- \
               --test-threads=${threads} \
diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
index a4ab778c298a..de85683ead2a 100644
--- a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
@@ -33,7 +33,7 @@ cargoNextestHook() {
 
     (
         set -x
-        ${cargoCommand-cargo} nextest run \
+        cargo nextest run \
               -j ${threads} \
               ${argstr} -- \
               ${checkFlags} \
diff --git a/pkgs/development/tools/rust/cargo-auditable/cargo-wrapper.nix b/pkgs/development/tools/rust/cargo-auditable/cargo-wrapper.nix
new file mode 100644
index 000000000000..3afa59739a37
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-auditable/cargo-wrapper.nix
@@ -0,0 +1,13 @@
+{ lib, writeShellApplication, cargo, cargo-auditable }:
+
+(writeShellApplication {
+  name = "cargo";
+  runtimeInputs = [ cargo cargo-auditable ];
+  text = ''
+    CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 cargo auditable "$@"
+  '';
+}) // {
+  meta = cargo-auditable.meta // {
+    mainProgram = "cargo";
+  };
+}
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index b664f32b4df9..c1b5643f6733 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -21,11 +21,11 @@ in rustPlatform.buildRustPackage rec {
   checkType = "debug";
 
   postBuild = ''
-    $cargoCommand cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
+    cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
   '';
 
   postInstall = ''
-    $cargoCommand cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
+    cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 141d3bb52acb..b63e54d04125 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15206,6 +15206,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   cargo-auditable = callPackage ../development/tools/rust/cargo-auditable { };
+  cargo-auditable-cargo-wrapper = callPackage ../development/tools/rust/cargo-auditable/cargo-wrapper.nix { };
   cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc {
     inherit (darwin.apple_sdk.frameworks) Security;
     openssl = openssl_1_1;

From 4ab0618bc585ce69c2f34c0e1f12c7d86522f114 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 7 Dec 2022 00:21:46 -0500
Subject: [PATCH 019/953] librsvg: make auditable

---
 pkgs/development/libraries/librsvg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 6b174a7dfa4d..a60da602e070 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -15,7 +15,7 @@
 , rustPlatform
 , rustc
 , rust
-, cargo
+, cargo-auditable-cargo-wrapper
 , gi-docgen
 , python3Packages
 , gnome
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     pkg-config
     rustc
-    cargo
+    cargo-auditable-cargo-wrapper
     python3Packages.docutils
     vala
     rustPlatform.cargoSetupHook

From e1b4c1f7bdf9a568c034839998a2dd37671ded5d Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 7 Dec 2022 12:19:51 +0100
Subject: [PATCH 020/953] ghostscript_headless: init

---
 pkgs/top-level/all-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 734cb670af49..e9b4d188a1da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36639,6 +36639,11 @@ with pkgs;
     x11Support = true;
   };
 
+  ghostscript_headless = ghostscript.override {
+    cupsSupport = false;
+    x11Support = false;
+  };
+
   glava = callPackage ../applications/misc/glava {};
 
   gnuk = callPackage ../misc/gnuk {

From d896fa5370e423b5d7dd5b51ffb12620c5da813e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 7 Dec 2022 12:19:39 +0100
Subject: [PATCH 021/953] texlive: Use ghostscriptX -> ghostscript_headless

The code and typical use case suggest that ghostscript is not used
graphically. Removing this dependency reduces the build closure of
many tools that use texlive for documentation.

If this needs to be reverted, please state the graphical use case
in a comment, so we don't make this mistake again.
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index e58bdde501a6..180897e0bce2 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -3,7 +3,7 @@
   - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive
 */
 { stdenv, lib, fetchurl, runCommand, writeText, buildEnv
-, callPackage, ghostscriptX, harfbuzz
+, callPackage, ghostscript_headless, harfbuzz
 , makeWrapper, python3, ruby, perl, gnused, gnugrep, coreutils
 , libfaketime
 , useFixedHashes ? true
@@ -12,7 +12,7 @@
 let
   # various binaries (compiled)
   bin = callPackage ./bin.nix {
-    ghostscript = ghostscriptX;
+    ghostscript = ghostscript_headless;
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
     };
@@ -25,7 +25,7 @@ let
   combine = import ./combine.nix {
     inherit bin combinePkgs buildEnv lib makeWrapper writeText
       stdenv python3 ruby perl gnused gnugrep coreutils libfaketime;
-    ghostscript = ghostscriptX; # could be without X, probably, but we use X above
+    ghostscript = ghostscript_headless;
   };
 
   # the set of TeX Live packages, collections, and schemes; using upstream naming

From 64c6e21de5a3eb05303912eec356d9e1b6727119 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 7 Dec 2022 12:20:09 +0100
Subject: [PATCH 022/953] matplotlib: Use ghostscript_headless

matplotlib does not seem to use ghostscript in its graphical /
interactive capacity, based on quick scan through the docs and
github code search.

If this needs to be reverted, please state the graphical use case
in a comment, so we don't make this mistake again.
---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99221acb73b1..705d12f26414 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5594,6 +5594,7 @@ self: super: with self; {
   matplotlib = callPackage ../development/python-modules/matplotlib {
     stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
+    ghostscript = pkgs.ghostscript_headless;
   };
 
   matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { };

From 47d9e7d3d7d8ad19e29be1445171726bf7d602b6 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 28 Nov 2022 14:50:41 +0100
Subject: [PATCH 023/953] nixos/hardware/printers: stop cupsd when unneeded

If socket activation is enable (the default) and printers are configured
declaratively, the ensure-printers service will always start cupsd and
leave it running, thus defeating the point of socket activation.

With this change ensure-printers continues to start the cups.service at
boot, but automatically stops it afterwards if socket activation is
enabled.

Note: Later restarts of ensure-printers will also restart cupsd, but
it's not an issue since it will be reactivate, if necessary.
---
 nixos/modules/hardware/printers.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix
index 64c29bb0a5b3..a8211b8c17cd 100644
--- a/nixos/modules/hardware/printers.nix
+++ b/nixos/modules/hardware/printers.nix
@@ -110,21 +110,26 @@ in {
   };
 
   config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) {
-    systemd.services.ensure-printers = let
-      cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service";
-    in {
+    systemd.services.ensure-printers = {
       description = "Ensure NixOS-configured CUPS printers";
       wantedBy = [ "multi-user.target" ];
-      requires = [ cupsUnit ];
-      after = [ cupsUnit ];
+      wants = [ "cups.service" ];
+      after = [ "cups.service" ];
 
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
       };
 
-      script = concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters
-        + optionalString (cfg.ensureDefaultPrinter != null) (ensureDefaultPrinter cfg.ensureDefaultPrinter);
+      script = concatStringsSep "\n" [
+        (concatMapStrings ensurePrinter cfg.ensurePrinters)
+        (optionalString (cfg.ensureDefaultPrinter != null)
+          (ensureDefaultPrinter cfg.ensureDefaultPrinter))
+        # Note: if cupsd is "stateless" the service can't be stopped,
+        # otherwise the configuration will be wiped on the next start.
+        (optionalString (with config.services.printing; startWhenNeeded && !stateless)
+          "systemctl stop cups.service")
+      ];
     };
   };
 }

From 43cb1eb2f9b02356f130637dabcdc7fe10ee20fe Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 30 Nov 2022 16:11:13 +0100
Subject: [PATCH 024/953] nixos/cupsd: stop managing /run/cups directory

The directory is already set up by cups.socket: managing it with
RuntimeDirectory in cups.service is unnecesary and has the unwanted
effect that upon stopping cupsd systemd will remove it. This includes
the /run/cups/cups.sock socket, so it breaks socket activation.
---
 nixos/modules/services/printing/cupsd.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index ae59dcc226de..009f0fb030f7 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -395,10 +395,7 @@ in
             ''}
           '';
 
-          serviceConfig = {
-            PrivateTmp = true;
-            RuntimeDirectory = [ "cups" ];
-          };
+          serviceConfig.PrivateTmp = true;
       };
 
     systemd.services.cups-browsed = mkIf avahiEnabled

From 28034190def8d40c7cce31fb98960072a84a9a1a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 7 Dec 2022 15:31:09 +0100
Subject: [PATCH 025/953] nixos/cupsd: fix /var/run/ warning in cups.socket
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Silence the systemd warning

    ListenStream= references a path below legacy directory /var/run/, updating /var/run/cups/cups.sock → /run/cups/cups.sock; please update the unit file accordingly

by resetting the value coming from the upstream unit.
---
 nixos/modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 009f0fb030f7..9ac89e057620 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -341,7 +341,7 @@ in
 
     systemd.sockets.cups = mkIf cfg.startWhenNeeded {
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "/run/cups/cups.sock" ]
+      listenStreams = [ "" "/run/cups/cups.sock" ]
         ++ map (x: replaceStrings ["localhost"] ["127.0.0.1"] (removePrefix "*:" x)) cfg.listenAddresses;
     };
 

From 4f67365482305a0fec444b725b131c82c563982b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 7 Dec 2022 15:52:08 +0100
Subject: [PATCH 026/953] nixos/tests/printing: split into service/socket

This splits the tests into two: one where cups.socket is started
normally, the order with socket activation.

Why? It's almost impossible to follow the test with 4 different
machines printing at the same time. It should also be more efficient
because only two VMs at a time were needed anyway.
---
 nixos/release-combined.nix |   3 +-
 nixos/tests/all-tests.nix  |   3 +-
 nixos/tests/printing.nix   | 177 ++++++++++++++++++-------------------
 3 files changed, 89 insertions(+), 94 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 337b5192776f..ed698b63ee63 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -146,7 +146,8 @@ in rec {
         (onFullSupported "nixos.tests.predictable-interface-names.predictable")
         (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd")
         (onFullSupported "nixos.tests.predictable-interface-names.unpredictable")
-        (onFullSupported "nixos.tests.printing")
+        (onFullSupported "nixos.tests.printing-service")
+        (onFullSupported "nixos.tests.printing-socket")
         (onFullSupported "nixos.tests.proxy")
         (onFullSupported "nixos.tests.sddm.default")
         (onFullSupported "nixos.tests.shadow")
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 726884d7cd9c..6a14c575662d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -525,7 +525,8 @@ in {
   power-profiles-daemon = handleTest ./power-profiles-daemon.nix {};
   pppd = handleTest ./pppd.nix {};
   predictable-interface-names = handleTest ./predictable-interface-names.nix {};
-  printing = handleTest ./printing.nix {};
+  printing-socket = handleTest ./printing.nix { socket = true; };
+  printing-service = handleTest ./printing.nix { socket = false; };
   privacyidea = handleTest ./privacyidea.nix {};
   privoxy = handleTest ./privoxy.nix {};
   prometheus = handleTest ./prometheus.nix {};
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index cfebe232d92a..7df042e72e90 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -1,19 +1,31 @@
 # Test printing via CUPS.
 
-import ./make-test-python.nix ({pkgs, ... }:
-let
-  printingServer = startWhenNeeded: {
-    services.printing.enable = true;
-    services.printing.stateless = true;
-    services.printing.startWhenNeeded = startWhenNeeded;
-    services.printing.listenAddresses = [ "*:631" ];
-    services.printing.defaultShared = true;
-    services.printing.extraConf = ''
-      <Location />
-        Order allow,deny
-        Allow from all
-      </Location>
-    '';
+import ./make-test-python.nix (
+{ pkgs
+, socket ? true # whether to use socket activation
+, ...
+}:
+
+{
+  name = "printing";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ domenkozar eelco matthewbauer ];
+  };
+
+  nodes.server = { ... }: {
+    services.printing = {
+      enable = true;
+      stateless = true;
+      startWhenNeeded = socket;
+      listenAddresses = [ "*:631" ];
+      defaultShared = true;
+      extraConf = ''
+        <Location />
+          Order allow,deny
+          Allow from all
+        </Location>
+      '';
+    };
     networking.firewall.allowedTCPPorts = [ 631 ];
     # Add a HP Deskjet printer connected via USB to the server.
     hardware.printers.ensurePrinters = [{
@@ -22,32 +34,19 @@ let
       model = "drv:///sample.drv/deskjet.ppd";
     }];
   };
-  printingClient = startWhenNeeded: {
+
+  nodes.client = { ... }: {
     services.printing.enable = true;
-    services.printing.startWhenNeeded = startWhenNeeded;
+    services.printing.startWhenNeeded = socket;
     # Add printer to the client as well, via IPP.
     hardware.printers.ensurePrinters = [{
       name = "DeskjetRemote";
-      deviceUri = "ipp://${if startWhenNeeded then "socketActivatedServer" else "serviceServer"}/printers/DeskjetLocal";
+      deviceUri = "ipp://server/printers/DeskjetLocal";
       model = "drv:///sample.drv/deskjet.ppd";
     }];
     hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
   };
 
-in {
-  name = "printing";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ domenkozar eelco matthewbauer ];
-  };
-
-  nodes = {
-    socketActivatedServer = { ... }: (printingServer true);
-    serviceServer = { ... }: (printingServer false);
-
-    socketActivatedClient = { ... }: (printingClient true);
-    serviceClient = { ... }: (printingClient false);
-  };
-
   testScript = ''
     import os
     import re
@@ -55,75 +54,69 @@ in {
     start_all()
 
     with subtest("Make sure that cups is up on both sides and printers are set up"):
-        serviceServer.wait_for_unit("cups.service")
-        serviceClient.wait_for_unit("cups.service")
-        socketActivatedClient.wait_for_unit("ensure-printers.service")
+        server.wait_for_unit("cups.${if socket then "socket" else "service"}")
+        client.wait_for_unit("cups.${if socket then "socket" else "service"}")
 
+    assert "scheduler is running" in client.succeed("lpstat -r")
 
-    def test_printing(client, server):
-        assert "scheduler is running" in client.succeed("lpstat -r")
+    with subtest("UNIX socket is used for connections"):
+        assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
 
-        with subtest("UNIX socket is used for connections"):
-            assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
-        with subtest("HTTP server is available too"):
-            client.succeed("curl --fail http://localhost:631/")
-            client.succeed(f"curl --fail http://{server.name}:631/")
-            server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
+    with subtest("HTTP server is available too"):
+        client.succeed("curl --fail http://localhost:631/")
+        client.succeed(f"curl --fail http://{server.name}:631/")
+        server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
 
-        with subtest("LP status checks"):
-            assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a")
-            assert "DeskjetLocal accepting requests" in client.succeed(
-                f"lpstat -h {server.name}:631 -a"
-            )
-            client.succeed("cupsdisable DeskjetRemote")
-            out = client.succeed("lpq")
-            print(out)
-            assert re.search(
-                "DeskjetRemote is not ready.*no entries",
-                client.succeed("lpq"),
-                flags=re.DOTALL,
-            )
-            client.succeed("cupsenable DeskjetRemote")
-            assert re.match(
-                "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL
+    with subtest("LP status checks"):
+        assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a")
+        assert "DeskjetLocal accepting requests" in client.succeed(
+            f"lpstat -h {server.name}:631 -a"
+        )
+        client.succeed("cupsdisable DeskjetRemote")
+        out = client.succeed("lpq")
+        print(out)
+        assert re.search(
+            "DeskjetRemote is not ready.*no entries",
+            client.succeed("lpq"),
+            flags=re.DOTALL,
+        )
+        client.succeed("cupsenable DeskjetRemote")
+        assert re.match(
+            "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL
+        )
+
+    # Test printing various file types.
+    for file in [
+        "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
+        "${pkgs.groff.doc}/share/doc/*/meref.ps",
+        "${pkgs.cups.out}/share/doc/cups/images/cups.png",
+        "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt",
+    ]:
+        file_name = os.path.basename(file)
+        with subtest(f"print {file_name}"):
+            # Print the file on the client.
+            print(client.succeed("lpq"))
+            client.succeed(f"lp {file}")
+            client.wait_until_succeeds(
+                f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'"
             )
 
-        # Test printing various file types.
-        for file in [
-            "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
-            "${pkgs.groff.doc}/share/doc/*/meref.ps",
-            "${pkgs.cups.out}/share/doc/cups/images/cups.png",
-            "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt",
-        ]:
-            file_name = os.path.basename(file)
-            with subtest(f"print {file_name}"):
-                # Print the file on the client.
-                print(client.succeed("lpq"))
-                client.succeed(f"lp {file}")
-                client.wait_until_succeeds(
-                    f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'"
-                )
+            # Ensure that a raw PCL file appeared in the server's queue
+            # (showing that the right filters have been applied).  Of
+            # course, since there is no actual USB printer attached, the
+            # file will stay in the queue forever.
+            server.wait_for_file("/var/spool/cups/d*-001")
+            server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'")
 
-                # Ensure that a raw PCL file appeared in the server's queue
-                # (showing that the right filters have been applied).  Of
-                # course, since there is no actual USB printer attached, the
-                # file will stay in the queue forever.
-                server.wait_for_file("/var/spool/cups/d*-001")
-                server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'")
+            # Delete the job on the client.  It should disappear on the
+            # server as well.
+            client.succeed("lprm")
+            client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'")
 
-                # Delete the job on the client.  It should disappear on the
-                # server as well.
-                client.succeed("lprm")
-                client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'")
+            retry(lambda _: "no entries" in server.succeed("lpq -a"))
 
-                retry(lambda _: "no entries" in server.succeed("lpq -a"))
-
-                # The queue is empty already, so this should be safe.
-                # Otherwise, pairs of "c*"-"d*-001" files might persist.
-                server.execute("rm /var/spool/cups/*")
-
-
-    test_printing(serviceClient, serviceServer)
-    test_printing(socketActivatedClient, socketActivatedServer)
+            # The queue is empty already, so this should be safe.
+            # Otherwise, pairs of "c*"-"d*-001" files might persist.
+            server.execute("rm /var/spool/cups/*")
   '';
 })

From 06c51c4604dc73feea77dd612ea4b3d85097fcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 6 Dec 2022 21:19:24 +0100
Subject: [PATCH 027/953] boehmgc: little cleanup

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

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 34e26f547093..de5aff6c3b6e 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, autoreconfHook
 # doc: https://github.com/ivmai/bdwgc/blob/v8.2.2/doc/README.macros (LARGE_CONFIG)
 , enableLargeConfig ? false
 , enableMmap ? true
@@ -36,14 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
   # don't forget to disable the fix (and if the next release does
   # not fix the problem the test failure will be a reminder to
   # extend the set of versions requiring the workaround).
-  makeFlags = if (stdenv.hostPlatform.isPower64 &&
+  makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 &&
                   finalAttrs.version == "8.2.2")
-    then [
+    [
       # do not use /proc primitives to track dirty bits; see:
       # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537
       # https://github.com/ivmai/bdwgc/blob/54522af853de28f45195044dadfd795c4e5942aa/include/private/gcconfig.h#L741
       "CFLAGS_EXTRA=-DNO_SOFT_VDB"
-    ] else null;
+    ];
 
   # `gctest` fails under emulation on aarch64-darwin
   doCheck = !(stdenv.isDarwin && stdenv.isx86_64);

From fa132338fd56264bc85019e5bb441b68d03fc3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 7 Dec 2022 23:13:14 +0100
Subject: [PATCH 028/953] python310Packages.jsonschema: 4.17.0 -> 4.17.3

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

diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index 69dba8bd472e..833a76399edd 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "jsonschema";
-  version = "4.17.0";
+  version = "4.17.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-W/zyvKFqCHreF+ArKC00r3zNdJ73YkHn+b18DLipQk0=";
+    sha256 = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0=";
   };
 
   postPatch = ''

From 0f4a7276c4840bfe1db3dd4467eece3e76d4ee43 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 7 Dec 2022 18:01:08 -0500
Subject: [PATCH 029/953] cargo-auditable: unstable-2022-12-07 -> 0.6.0

---
 pkgs/development/tools/rust/cargo-auditable/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix
index b60c0fe62050..1c621276021a 100644
--- a/pkgs/development/tools/rust/cargo-auditable/default.nix
+++ b/pkgs/development/tools/rust/cargo-auditable/default.nix
@@ -3,16 +3,16 @@
 let
   args = rec {
     pname = "cargo-auditable";
-    version = "unstable-2022-12-07";
+    version = "0.6.0";
 
     src = fetchFromGitHub {
       owner = "rust-secure-code";
       repo = pname;
-      rev = "246468da22d619c816227797fb176c44026c7105";
-      sha256 = "sha256-tZ6qA20TM+mZa2bYWWdFeM+6104e+hVE9Swst2n6Mx8=";
+      rev = "v${version}";
+      sha256 = "sha256-mSiEC+9QtRjWmywJnGgUqp+q8fhY0qUYrgjrAVaY114=";
     };
 
-    cargoSha256 = "sha256-LkFP/m/pTIDnIueNDwM89lk7FNXnT4Fl8EIdXgR9oOg=";
+    cargoSha256 = "sha256-Wz5My/QxPpZVsPBUe3KHT3ttD6CTU8NCY8rhFEC+UlA=";
 
     meta = with lib; {
       description = "A tool to make production Rust binaries auditable";

From 238a6053c43f7ac2e3dcc3d3c7f29f1e0c0be589 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 1 Jun 2022 00:34:59 +0300
Subject: [PATCH 030/953] stdenv: support opt-in __structuredAttrs

Co-authored-by: Robin Gloster <mail@glob.in>

stdenv: print message if structuredAttrs is enabled

stdenv: add _append

reduces the chance of a user doing it wrong

fix nix develop issue

output hooks don't work yet in nix develop though

making $outputs be the same on non-structuredAttrs and structuredAttrs
is too much trouble.

lets instead make a function that gets the output names

reading environment file '/nix/store/2x7m69a2sm2kh0r6v0q5s9z1dh41m4xf-xz-5.2.5-env-bin'
nix: src/nix/develop.cc:299: std::string Common::makeRcScript(nix::ref<nix::Store>, const BuildEnvironment&, const Path&): Assertion `outputs != buildEnvironment.vars.end()' failed.

use a function to get all output names instead of using $outputs

copy env functionality from https://github.com/NixOS/nixpkgs/pull/76732/commits
---
 .../cluster/nomad-autoscaler/default.nix      |   2 +-
 .../bintools-wrapper/default.nix              |   4 +-
 pkgs/build-support/release/nix-build.nix      |   2 +-
 .../setup-hooks/auto-patchelf.sh              |   2 +-
 pkgs/build-support/setup-hooks/move-docs.sh   |  12 +-
 .../setup-hooks/multiple-outputs.sh           |  32 ++-
 .../patch-ppd-files/patch-ppd-hook.sh         |   2 +-
 pkgs/build-support/setup-hooks/strip.sh       |  21 +-
 .../build-support/setup-hooks/win-dll-link.sh |   2 +-
 pkgs/build-support/testers/expect-failure.sh  |   2 +-
 .../data/icons/catppuccin-cursors/default.nix |   2 +-
 pkgs/data/icons/comixcursors/default.nix      |   2 +-
 pkgs/desktops/gnome/core/gdm/default.nix      |   2 +-
 pkgs/development/compilers/openjdk/11.nix     |   4 +-
 pkgs/development/compilers/openjdk/12.nix     |   4 +-
 pkgs/development/compilers/openjdk/13.nix     |   4 +-
 pkgs/development/compilers/openjdk/14.nix     |   4 +-
 pkgs/development/compilers/openjdk/15.nix     |   4 +-
 pkgs/development/compilers/openjdk/16.nix     |   4 +-
 pkgs/development/compilers/openjdk/17.nix     |   4 +-
 pkgs/development/compilers/openjdk/18.nix     |   4 +-
 pkgs/development/compilers/openjdk/19.nix     |   4 +-
 pkgs/development/compilers/openjdk/8.nix      |   4 +-
 pkgs/development/libraries/polkit/default.nix |   2 +-
 .../darwin/signing-utils/auto-sign-hook.sh    |   2 +-
 pkgs/stdenv/generic/default-builder.sh        |   4 +
 pkgs/stdenv/generic/make-derivation.nix       |  31 ++-
 pkgs/stdenv/generic/setup.sh                  | 222 +++++++++++++-----
 pkgs/tools/typesetting/tex/texlive/bin.nix    |   2 +-
 29 files changed, 271 insertions(+), 119 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
index 6329ff9ed11c..eb185f9743c1 100644
--- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
+++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
@@ -45,7 +45,7 @@ let
       mv bin/nomad-autoscaler $bin/bin
       ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler
 
-      for d in $outputs; do
+      for d in $(getAllOutputNames); do
         mkdir -p ''${!d}/share
       done
       rmdir $bin/share
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 121b50fe0f52..ea925e90fa47 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -68,7 +68,7 @@ let
   # The dynamic linker has different names on different platforms. This is a
   # shell glob that ought to match it.
   dynamicLinker =
-    /**/ if sharedLibraryLoader == null then null
+    /**/ if sharedLibraryLoader == null then ""
     else if targetPlatform.libc == "musl"             then "${sharedLibraryLoader}/lib/ld-musl-*"
     else if targetPlatform.libc == "uclibc"           then "${sharedLibraryLoader}/lib/ld*-uClibc.so.1"
     else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker"
@@ -87,7 +87,7 @@ let
     else if targetPlatform.isDarwin                   then "/usr/lib/dyld"
     else if targetPlatform.isFreeBSD                  then "/libexec/ld-elf.so.1"
     else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
-    else null;
+    else "";
 
   expand-response-params =
     if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null"
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index ac51b90e0163..5ed2b0752efc 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (
       echo "$system" > $out/nix-support/system
 
       if [ -z "${toString doingAnalysis}" ]; then
-          for i in $outputs; do
+          for i in $(getAllOutputNames); do
               if [ "$i" = out ]; then j=none; else j="$i"; fi
               mkdir -p ''${!i}/nix-support
               echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 7f5ff146e30b..8a74a69bdceb 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -84,7 +84,7 @@ autoPatchelf() {
 # (Expressions don't expand in single quotes, use double quotes for that.)
 postFixupHooks+=('
     if [ -z "${dontAutoPatchelf-}" ]; then
-        autoPatchelf -- $(for output in $outputs; do
+        autoPatchelf -- $(for output in $(getAllOutputNames); do
             [ -e "${!output}" ] || continue
             echo "${!output}"
         done)
diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index e4460f98816d..833113aa0fc8 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -5,10 +5,17 @@
 preFixupHooks+=(_moveToShare)
 
 _moveToShare() {
-    forceShare=${forceShare:=man doc info}
+    if [ -n "$__structuredAttrs" ]; then
+        if [ -z "${forceShare-}" ]; then
+            forceShare=( man doc info )
+        fi
+    else
+        forceShare=( ${forceShare:-man doc info} )
+    fi
+
     if [[ -z "$out" ]]; then return; fi
 
-    for d in $forceShare; do
+    for d in "${forceShare[@]}"; do
         if [ -d "$out/$d" ]; then
             if [ -d "$out/share/$d" ]; then
                 echo "both $d/ and share/$d/ exist!"
@@ -20,4 +27,3 @@ _moveToShare() {
         fi
     done
 }
-
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 881cf6c90f48..8a2fc2f915e9 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -47,7 +47,7 @@ _overrideFirst outputInfo "info" "$outputBin"
 
 # Add standard flags to put files into the desired outputs.
 _multioutConfig() {
-    if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
+    if [ "$(getAllOutputNames)" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
 
     # try to detect share/doc/${shareDocName}
     # Note: sadly, $configureScript detection comes later in configurePhase,
@@ -66,19 +66,17 @@ _multioutConfig() {
         fi
     fi
 
-    configureFlags="\
-        --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \
-        --includedir=${!outputInclude}/include --oldincludedir=${!outputInclude}/include \
-        --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
-        --docdir=${!outputDoc}/share/doc/${shareDocName} \
-        --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
-        --localedir=${!outputLib}/share/locale \
-        $configureFlags"
+    prependToVar configureFlags \
+        --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \
+        --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \
+        --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \
+        --docdir="${!outputDoc}"/share/doc/"${shareDocName}" \
+        --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \
+        --localedir="${!outputLib}"/share/locale
 
-    installFlags="\
-        pkgconfigdir=${!outputDev}/lib/pkgconfig \
-        m4datadir=${!outputDev}/share/aclocal aclocaldir=${!outputDev}/share/aclocal \
-        $installFlags"
+    prependToVar installFlags \
+        pkgconfigdir="${!outputDev}"/lib/pkgconfig \
+        m4datadir="${!outputDev}"/share/aclocal aclocaldir="${!outputDev}"/share/aclocal
 }
 
 
@@ -94,7 +92,7 @@ moveToOutput() {
     local patt="$1"
     local dstOut="$2"
     local output
-    for output in $outputs; do
+    for output in $(getAllOutputNames); do
         if [ "${!output}" = "$dstOut" ]; then continue; fi
         local srcPath
         for srcPath in "${!output}"/$patt; do
@@ -149,7 +147,7 @@ _multioutDocs() {
 
 # Move development-only stuff to the desired outputs.
 _multioutDevs() {
-    if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi;
+    if [ "$(getAllOutputNames)" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi;
     moveToOutput include "${!outputInclude}"
     # these files are sometimes provided even without using the corresponding tool
     moveToOutput lib/pkgconfig "${!outputDev}"
@@ -166,10 +164,10 @@ _multioutDevs() {
 
 # Make the "dev" propagate other outputs needed for development.
 _multioutPropagateDev() {
-    if [ "$outputs" = "out" ]; then return; fi;
+    if [ "$(getAllOutputNames)" = "out" ]; then return; fi;
 
     local outputFirst
-    for outputFirst in $outputs; do
+    for outputFirst in $(getAllOutputNames); do
         break
     done
     local propagaterOutput="$outputDev"
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh b/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh
index a450ecd7f963..77322b245b27 100644
--- a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh
+++ b/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh
@@ -70,7 +70,7 @@ patchPpdFileCommands () {
     # * outputs of current build before buildInputs
     # * `/lib/cups/filter' before `/bin`
     # * add HOST_PATH at end, so we don't miss anything
-    for path in $outputs; do
+    for path in $(getAllOutputNames); do
         addToSearchPath cupspath "${!path}/lib/cups/filter"
         addToSearchPath cupspath "${!path}/bin"
     done
diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
index 9bd7b24cab54..104b5515b3db 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/pkgs/build-support/setup-hooks/strip.sh
@@ -12,11 +12,20 @@ _doStrip() {
     local -ra stripCmds=(STRIP STRIP_FOR_TARGET)
     local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET)
 
+    # TODO(structured-attrs): This doesn't work correctly if one of
+    #   the items in strip*List or strip*Flags contains a space,
+    #   even with structured attrs enabled.  This is OK for now
+    #   because very few packages set any of these, and it doesn't
+    #   affect any of them.
+    #
+    #   After __structuredAttrs = true is universal, come back and
+    #   push arrays all the way through this logic.
+
     # Strip only host paths by default. Leave targets as is.
-    stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
-    stripDebugListTarget=${stripDebugListTarget:-}
-    stripAllList=${stripAllList:-}
-    stripAllListTarget=${stripAllListTarget:-}
+    stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin}
+    stripDebugListTarget=${stripDebugListTarget[*]:-}
+    stripAllList=${stripAllList[*]:-}
+    stripAllListTarget=${stripAllListTarget[*]:-}
 
     local i
     for i in ${!stripCmds[@]}; do
@@ -30,8 +39,8 @@ _doStrip() {
         if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null
         then continue; fi
 
-        stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags:--S}"
-        stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags:--s}"
+        stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S}"
+        stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s}"
     done
 }
 
diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh
index 6130f32bef86..ca4cbb349b6c 100644
--- a/pkgs/build-support/setup-hooks/win-dll-link.sh
+++ b/pkgs/build-support/setup-hooks/win-dll-link.sh
@@ -15,7 +15,7 @@ _linkDLLs() {
     #   prefix $PATH by currently-built outputs
     local DLLPATH=""
     local outName
-    for outName in $outputs; do
+    for outName in $(getAllOutputNames); do
         addToSearchPath DLLPATH "${!outName}/bin"
     done
     DLLPATH="$DLLPATH:$PATH"
diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh
index 0e1bbe9a678c..052ee8527176 100644
--- a/pkgs/build-support/testers/expect-failure.sh
+++ b/pkgs/build-support/testers/expect-failure.sh
@@ -35,7 +35,7 @@ echo "testBuildFailure: Original builder produced exit code: $r"
 # -----------------------------------------
 # Write the build log to the default output
 
-outs=( $outputs )
+outs=( $(getAllOutputNames) )
 defOut=${outs[0]}
 defOutPath=${!defOut}
 
diff --git a/pkgs/data/icons/catppuccin-cursors/default.nix b/pkgs/data/icons/catppuccin-cursors/default.nix
index d9eccc96a029..4559705c169b 100644
--- a/pkgs/data/icons/catppuccin-cursors/default.nix
+++ b/pkgs/data/icons/catppuccin-cursors/default.nix
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    for output in $outputs; do
+    for output in $(getAllOutputNames); do
       if [ "$output" != "out" ]; then
         local outputDir="''${!output}"
         local iconsDir="$outputDir"/share/icons
diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/data/icons/comixcursors/default.nix
index b63877b28209..1c4fdc195180 100644
--- a/pkgs/data/icons/comixcursors/default.nix
+++ b/pkgs/data/icons/comixcursors/default.nix
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   installPhase = ''
-    for outputName in $outputs ; do
+    for outputName in $(getAllOutputNames) ; do
       if [ $outputName != out ]; then
         local outputDir=''${!outputName};
         local iconsDir=$outputDir/share/icons
diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix
index f1fbe7e49d30..a2265387e1ef 100644
--- a/pkgs/desktops/gnome/core/gdm/default.nix
+++ b/pkgs/desktops/gnome/core/gdm/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
     # We use rsync to merge the directories.
     rsync --archive "${DESTDIR}/etc" "$out"
     rm --recursive "${DESTDIR}/etc"
-    for o in $outputs; do
+    for o in $(getAllOutputNames); do
         if [[ "$o" = "debug" ]]; then continue; fi
         rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
         rm --recursive "${DESTDIR}/''${!o}"
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 95abb373272c..33c3177d2927 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -132,12 +132,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 60100a5ecc16..f56cf4a79220 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -136,12 +136,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index 68a0a9fa7007..ce84d334b426 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -136,12 +136,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index 37c3a6a3de3a..8e92b906189c 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -132,12 +132,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix
index 6ea1d0b1dd31..c33e937f9f24 100644
--- a/pkgs/development/compilers/openjdk/15.nix
+++ b/pkgs/development/compilers/openjdk/15.nix
@@ -131,12 +131,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
index 0e1911bb1a70..461cd724144e 100644
--- a/pkgs/development/compilers/openjdk/16.nix
+++ b/pkgs/development/compilers/openjdk/16.nix
@@ -138,12 +138,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index bc92b1393fdb..6d8087d7e948 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -149,12 +149,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix
index 5be60eb94875..fd620aaaf9a5 100644
--- a/pkgs/development/compilers/openjdk/18.nix
+++ b/pkgs/development/compilers/openjdk/18.nix
@@ -140,12 +140,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix
index 11b2fa60c733..9537b0d3ce52 100644
--- a/pkgs/development/compilers/openjdk/19.nix
+++ b/pkgs/development/compilers/openjdk/19.nix
@@ -140,12 +140,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index c232b1f01f16..5558a77ad90b 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -187,12 +187,12 @@ let
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
       done
       # Add the local library paths to remove dependencies on the bootstrap
-      for output in $outputs; do
+      for output in $(getAllOutputNames); do
         if [ "$output" = debug ]; then continue; fi
         OUTPUTDIR=$(eval echo \$$output)
         BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index a0344d68a12b..6ab7a4bb9c3a 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
     rsync --archive "${DESTDIR}${system}"/* "$out"
     rm --recursive "${DESTDIR}${system}"/*
     rmdir --parents --ignore-fail-on-non-empty "${DESTDIR}${system}"
-    for o in $outputs; do
+    for o in $(getAllOutputNames); do
         rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
         rm --recursive "${DESTDIR}/''${!o}"
     done
diff --git a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh
index cca65661f8a9..6a254cd82123 100644
--- a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh
+++ b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh
@@ -25,7 +25,7 @@ signDarwinBinariesIn() {
 signDarwinBinariesInAllOutputs() {
   local output
 
-  for output in $outputs; do
+  for output in $(getAllOutputNames); do
      signDarwinBinariesIn "${!output}"
   done
 }
diff --git a/pkgs/stdenv/generic/default-builder.sh b/pkgs/stdenv/generic/default-builder.sh
index 273fc55c7552..8c6fec7873b6 100644
--- a/pkgs/stdenv/generic/default-builder.sh
+++ b/pkgs/stdenv/generic/default-builder.sh
@@ -1,2 +1,6 @@
+if [ -f .attrs.sh ]; then
+    . .attrs.sh
+fi
+
 source $stdenv/setup
 genericBuild
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 510537aac9f3..09a71da93b6e 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -154,6 +154,12 @@ let
   (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too
   && config.contentAddressedByDefault
 
+# Experimental.  For simple packages mostly just works,
+# but for anything complex, be prepared to debug if enabling.
+, __structuredAttrs ? false
+
+, env ? { }
+
 , ... } @ attrs:
 
 let
@@ -259,13 +265,16 @@ else let
     lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
       (lib.concatLists propagatedDependencies));
 
+  envIsExportable = lib.isAttrs env && !lib.isDerivation env;
+
   derivationArg =
     (removeAttrs attrs
-      ["meta" "passthru" "pos"
+      (["meta" "passthru" "pos"
        "checkInputs" "installCheckInputs"
        "__darwinAllowLocalNetworking"
        "__impureHostDeps" "__propagatedImpureHostDeps"
-       "sandboxProfile" "propagatedSandboxProfile"])
+       "sandboxProfile" "propagatedSandboxProfile"]
+       ++ lib.optionals envIsExportable [ "env" ]))
     // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
       name =
         let
@@ -289,7 +298,7 @@ else let
           then attrs.name + hostSuffix
           else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
         );
-    }) // {
+    }) // lib.optionalAttrs (envIsExportable && __structuredAttrs) { env = checkedEnv; } // {
       builder = attrs.realBuilder or stdenv.shell;
       args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
       inherit stdenv;
@@ -304,8 +313,7 @@ else let
 
       userHook = config.stdenv.userHook or null;
       __ignoreNulls = true;
-
-      inherit strictDeps;
+      inherit __structuredAttrs strictDeps;
 
       depsBuildBuild              = lib.elemAt (lib.elemAt dependencies 0) 0;
       nativeBuildInputs           = lib.elemAt (lib.elemAt dependencies 0) 1;
@@ -473,6 +481,17 @@ else let
                    else true);
     };
 
+  checkedEnv =
+    let
+      overlappingNames = lib.intersectLists (lib.attrNames env) (lib.attrNames derivationArg);
+    in
+    assert lib.assertMsg (overlappingNames == [ ])
+      "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${lib.concatStringsSep ", " overlappingNames}";
+    lib.mapAttrs
+      (n: v: assert lib.assertMsg (lib.isString v || lib.isBool v || lib.isInt v)
+        "The ‘env’ attribute set can only contain string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v)
+      env;
+
 in
 
 lib.extendDerivation
@@ -509,7 +528,7 @@ lib.extendDerivation
    # should be made available to Nix expressions using the
    # derivation (e.g., in assertions).
    passthru)
-  (derivation derivationArg);
+  (derivation (derivationArg // lib.optionalAttrs envIsExportable checkedEnv));
 
 in
   fnOrAttrs:
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index c6cdb6c3df75..de1dad5a1697 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -15,8 +15,29 @@ if (( "${NIX_DEBUG:-0}" >= 6 )); then
     set -x
 fi
 
-: ${outputs:=out}
+if [ -f .attrs.sh ]; then
+    __structuredAttrs=1
+    echo "structuredAttrs is enabled"
+else
+    __structuredAttrs=
+fi
 
+if [ -n "$__structuredAttrs" ]; then
+    for outputName in "${!outputs[@]}"; do
+        # ex: out=/nix/store/...
+        export "$outputName=${outputs[$outputName]}"
+    done
+else
+    : ${outputs:=out}
+fi
+
+getAllOutputNames() {
+    if [ -n "$__structuredAttrs" ]; then
+        echo "${!outputs[*]}"
+    else
+        echo "$outputs"
+    fi
+}
 
 ######################################################################
 # Hook handling.
@@ -175,6 +196,63 @@ addToSearchPath() {
     addToSearchPathWithCustomDelimiter ":" "$@"
 }
 
+# Prepend elements to variable "$1", which may come from an attr.
+#
+# This is useful in generic setup code, which must (for now) support
+# both derivations with and without __structuredAttrs true, so the
+# variable may be an array or a space-separated string.
+#
+# Expressions for individual packages should simply switch to array
+# syntax when they switch to setting __structuredAttrs = true.
+prependToVar() {
+    local -n nameref="$1"; shift
+    if [ -n "$__structuredAttrs" ]; then
+        nameref=( "$@" ${nameref+"${nameref[@]}"} )
+    else
+        nameref="$* ${nameref-}"
+    fi
+}
+
+# Same as above
+appendToVar() {
+    local -n nameref="$1"; shift
+    if [ -n "$__structuredAttrs" ]; then
+        nameref=( ${nameref+"${nameref[@]}"} "$@" )
+    else
+        nameref="${nameref-} $*"
+    fi
+}
+
+# Accumulate into `flagsArray` the flags from the named variables.
+#
+# If __structuredAttrs, the variables are all treated as arrays
+# and simply concatenated onto `flagsArray`.
+#
+# If not __structuredAttrs, then:
+#   * Each variable is treated as a string, and split on whitespace;
+#   * except variables whose names end in "Array", which are treated
+#     as arrays.
+_accumFlagsArray() {
+    local name
+    if [ -n "$__structuredAttrs" ]; then
+        for name in "$@"; do
+            local -n nameref="$name"
+            flagsArray+=( ${nameref+"${nameref[@]}"} )
+        done
+    else
+        for name in "$@"; do
+            local -n nameref="$name"
+            case "$name" in
+                *Array)
+                    flagsArray+=( ${nameref+"${nameref[@]}"} ) ;;
+                *)
+                    flagsArray+=( ${nameref-} ) ;;
+            esac
+        done
+    fi
+
+}
+
 # Add $1/lib* into rpaths.
 # The function is used in multiple-outputs.sh hook,
 # so it is defined here but tried after the hook.
@@ -255,6 +333,11 @@ printWords() {
 ######################################################################
 # Initialisation.
 
+# export all vars that should be in the ENV
+for envVar in "${!env[@]}"; do
+    declare -x "${envVar}=${env[${envVar}]}"
+done
+
 
 # Set a fallback default value for SOURCE_DATE_EPOCH, used by some build tools
 # to provide a deterministic substitute for the "current" time. Note that
@@ -469,6 +552,10 @@ findInputs() {
     done
 }
 
+# The way we handle deps* and *Inputs works with structured attrs
+# either enabled or disabled.  For this it's convenient that the items
+# in each list must be store paths, and therefore space-free.
+
 # Make sure all are at least defined as empty
 : ${depsBuildBuild=} ${depsBuildBuildPropagated=}
 : ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=}
@@ -477,29 +564,29 @@ findInputs() {
 : ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=}
 : ${depsTargetTarget=} ${depsTargetTargetPropagated=}
 
-for pkg in $depsBuildBuild $depsBuildBuildPropagated; do
+for pkg in ${depsBuildBuild[@]} ${depsBuildBuildPropagated[@]}; do
     findInputs "$pkg" -1 -1
 done
-for pkg in $nativeBuildInputs $propagatedNativeBuildInputs; do
+for pkg in ${nativeBuildInputs[@]} ${propagatedNativeBuildInputs[@]}; do
     findInputs "$pkg" -1  0
 done
-for pkg in $depsBuildTarget $depsBuildTargetPropagated; do
+for pkg in ${depsBuildTarget[@]} ${depsBuildTargetPropagated[@]}; do
     findInputs "$pkg" -1  1
 done
-for pkg in $depsHostHost $depsHostHostPropagated; do
+for pkg in ${depsHostHost[@]} ${depsHostHostPropagated[@]}; do
     findInputs "$pkg"  0  0
 done
-for pkg in $buildInputs $propagatedBuildInputs ; do
+for pkg in ${buildInputs[@]} ${propagatedBuildInputs[@]} ; do
     findInputs "$pkg"  0  1
 done
-for pkg in $depsTargetTarget $depsTargetTargetPropagated; do
+for pkg in ${depsTargetTarget[@]} ${depsTargetTargetPropagated[@]}; do
     findInputs "$pkg"  1  1
 done
 # Default inputs must be processed last
-for pkg in $defaultNativeBuildInputs; do
+for pkg in ${defaultNativeBuildInputs[@]}; do
     findInputs "$pkg" -1  0
 done
-for pkg in $defaultBuildInputs; do
+for pkg in ${defaultBuildInputs[@]}; do
     findInputs "$pkg"  0  1
 done
 
@@ -909,6 +996,13 @@ unpackPhase() {
         srcs="$src"
     fi
 
+    local -a srcsArray
+    if [ -n "$__structuredAttrs" ]; then
+        srcsArray=( "${srcs[@]}" )
+    else
+        srcsArray=( $srcs )
+    fi
+
     # To determine the source directory created by unpacking the
     # source archives, we record the contents of the current
     # directory, then look below which directory got added.  Yeah,
@@ -921,7 +1015,7 @@ unpackPhase() {
     done
 
     # Unpack all source archives.
-    for i in $srcs; do
+    for i in "${srcsArray[@]}"; do
         unpackFile "$i"
     done
 
@@ -971,7 +1065,14 @@ unpackPhase() {
 patchPhase() {
     runHook prePatch
 
-    for i in ${patches:-}; do
+    local -a patchesArray
+    if [ -n "$__structuredAttrs" ]; then
+        patchesArray=( ${patches:+"${patches[@]}"} )
+    else
+        patchesArray=( ${patches:-} )
+    fi
+
+    for i in "${patchesArray[@]}"; do
         header "applying patch $i" 3
         local uncompress=cat
         case "$i" in
@@ -988,9 +1089,17 @@ patchPhase() {
                 uncompress="lzma -d"
                 ;;
         esac
+
+        local -a flagsArray
+        if [ -n "$__structuredAttrs" ]; then
+            flagsArray=( "${patchFlags[@]:--p1}" )
+        else
+            # shellcheck disable=SC2086
+            flagsArray=( ${patchFlags:--p1} )
+        fi
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
         # shellcheck disable=SC2086
-        $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1}
+        $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}"
     done
 
     runHook postPatch
@@ -1018,7 +1127,6 @@ configurePhase() {
 
     # set to empty if unset
     : ${configureScript=}
-    : ${configureFlags=}
 
     if [[ -z "$configureScript" && -x ./configure ]]; then
         configureScript=./configure
@@ -1049,31 +1157,29 @@ configurePhase() {
     fi
 
     if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then
-        configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
+        prependToVar configureFlags "${prefixKey:---prefix=}$prefix"
     fi
 
     if [[ -f "$configureScript" ]]; then
         # Add --disable-dependency-tracking to speed up some builds.
         if [ -z "${dontAddDisableDepTrack:-}" ]; then
             if grep -q dependency-tracking "$configureScript"; then
-                configureFlags="--disable-dependency-tracking $configureFlags"
+                prependToVar configureFlags --disable-dependency-tracking
             fi
         fi
 
         # By default, disable static builds.
         if [ -z "${dontDisableStatic:-}" ]; then
             if grep -q enable-static "$configureScript"; then
-                configureFlags="--disable-static $configureFlags"
+                prependToVar configureFlags --disable-static
             fi
         fi
     fi
 
     if [ -n "$configureScript" ]; then
-        # Old bash empty array hack
-        # shellcheck disable=SC2086
-        local flagsArray=(
-            $configureFlags "${configureFlagsArray[@]}"
-        )
+        local -a flagsArray
+        _accumFlagsArray configureFlags configureFlagsArray
+
         echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
         $configureScript "${flagsArray[@]}"
@@ -1089,22 +1195,17 @@ configurePhase() {
 buildPhase() {
     runHook preBuild
 
-    # set to empty if unset
-    : ${makeFlags=}
-
-    if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+    if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
     else
         foundMakefile=1
 
-        # Old bash empty array hack
         # shellcheck disable=SC2086
         local flagsArray=(
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
             SHELL=$SHELL
-            $makeFlags "${makeFlagsArray[@]}"
-            $buildFlags "${buildFlagsArray[@]}"
         )
+        _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
 
         echoCmd 'build flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -1141,11 +1242,17 @@ checkPhase() {
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
             SHELL=$SHELL
-            $makeFlags "${makeFlagsArray[@]}"
-            ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}"
-            ${checkTarget}
         )
 
+        _accumFlagsArray makeFlags makeFlagsArray
+        if [ -n "$__structuredAttrs" ]; then
+            flagsArray+=( "${checkFlags[@]:-VERBOSE=y}" )
+        else
+            flagsArray+=( ${checkFlags:-VERBOSE=y} )
+        fi
+        _accumFlagsArray checkFlagsArray
+        flagsArray+=( ${checkTarget} )
+
         echoCmd 'check flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
 
@@ -1163,14 +1270,16 @@ installPhase() {
         mkdir -p "$prefix"
     fi
 
-    # Old bash empty array hack
     # shellcheck disable=SC2086
     local flagsArray=(
         SHELL=$SHELL
-        $makeFlags "${makeFlagsArray[@]}"
-        $installFlags "${installFlagsArray[@]}"
-        ${installTargets:-install}
     )
+    _accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray
+    if [ -n "$__structuredAttrs" ]; then
+        flagsArray+=( "${installTargets[@]:-install}" )
+    else
+        flagsArray+=( ${installTargets:-install} )
+    fi
 
     echoCmd 'install flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -1186,7 +1295,7 @@ installPhase() {
 fixupPhase() {
     # Make sure everything is writable so "strip" et al. work.
     local output
-    for output in $outputs; do
+    for output in $(getAllOutputNames); do
         if [ -e "${!output}" ]; then chmod -R u+w "${!output}"; fi
     done
 
@@ -1194,7 +1303,7 @@ fixupPhase() {
 
     # Apply fixup to each output.
     local output
-    for output in $outputs; do
+    for output in $(getAllOutputNames); do
         prefix="${!output}" runHook fixupOutput
     done
 
@@ -1239,7 +1348,10 @@ fixupPhase() {
     if [ -n "${setupHooks:-}" ]; then
         mkdir -p "${!outputDev}/nix-support"
         local hook
-        for hook in $setupHooks; do
+        # have to use ${setupHooks[@]} without quotes because it needs to support setupHooks being a array or a whitespace separated string
+        # # values of setupHooks won't have spaces so it won't cause problems
+        # shellcheck disable=2068
+        for hook in ${setupHooks[@]}; do
             local content
             consumeEntire content < "$hook"
             substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook"
@@ -1275,11 +1387,12 @@ installCheckPhase() {
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
             SHELL=$SHELL
-            $makeFlags "${makeFlagsArray[@]}"
-            $installCheckFlags "${installCheckFlagsArray[@]}"
-            ${installCheckTarget:-installcheck}
         )
 
+        _accumFlagsArray makeFlags makeFlagsArray \
+          installCheckFlags installCheckFlagsArray
+        flagsArray+=( ${installCheckTarget:-installcheck} )
+
         echoCmd 'installcheck flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
         unset flagsArray
@@ -1292,11 +1405,9 @@ installCheckPhase() {
 distPhase() {
     runHook preDist
 
-    # Old bash empty array hack
-    # shellcheck disable=SC2086
-    local flagsArray=(
-        $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
-    )
+    local flagsArray=()
+    _accumFlagsArray distFlags distFlagsArray
+    flagsArray+=( ${distTarget:-dist} )
 
     echo 'dist flags: %q' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -1307,7 +1418,7 @@ distPhase() {
         # Note: don't quote $tarballs, since we explicitly permit
         # wildcards in there.
         # shellcheck disable=SC2086
-        cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs"
+        cp -pvd ${tarballs[*]:-*.tar.gz} "$out/tarballs"
     fi
 
     runHook postDist
@@ -1357,14 +1468,18 @@ genericBuild() {
         return
     fi
 
-    if [ -z "${phases:-}" ]; then
-        phases="${prePhases:-} unpackPhase patchPhase ${preConfigurePhases:-} \
-            configurePhase ${preBuildPhases:-} buildPhase checkPhase \
-            ${preInstallPhases:-} installPhase ${preFixupPhases:-} fixupPhase installCheckPhase \
-            ${preDistPhases:-} distPhase ${postPhases:-}";
+    if [ -z "${phases[*]:-}" ]; then
+        phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \
+            configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \
+            ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \
+            ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}";
     fi
 
-    for curPhase in $phases; do
+    # The use of ${phases[*]} gives the correct behavior both with and
+    # without structured attrs.  This relies on the fact that each
+    # phase name is space-free, which it must be because it's the name
+    # of either a shell variable or a shell function.
+    for curPhase in ${phases[*]}; do
         if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi
         if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then continue; fi
         if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi
@@ -1414,6 +1529,7 @@ runHook userHook
 
 dumpVars
 
+
 # Restore the original options for nix-shell
 [[ $__nixpkgs_setup_set_original == *e* ]] || set +e
 [[ $__nixpkgs_setup_set_original == *u* ]] || set +u
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 6c7d8880a316..d874f443f4a3 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -247,7 +247,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
     "xetex"
   ];
   postInstall = ''
-    for output in $outputs; do
+    for output in $(getAllOutputNames); do
       mkdir -p "''${!output}/bin"
     done
 

From 1c4820efdd26a7ff2a06871ccc614781c31bd4a3 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 29 Jun 2022 03:41:13 +0300
Subject: [PATCH 031/953] work around a nix bug

---
 pkgs/stdenv/generic/setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index de1dad5a1697..40905c8dfd07 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -27,6 +27,10 @@ if [ -n "$__structuredAttrs" ]; then
         # ex: out=/nix/store/...
         export "$outputName=${outputs[$outputName]}"
     done
+    # $NIX_ATTRS_JSON_FILE points to the wrong location in sandbox
+    # https://github.com/NixOS/nix/issues/6736
+    export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json"
+    export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh"
 else
     : ${outputs:=out}
 fi

From 8ad0103a349b827b48bfaa908dbf5cd7a9371076 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 17 Nov 2022 18:30:58 +0200
Subject: [PATCH 032/953] config.structuredAttrsByDefault: add option

---
 pkgs/stdenv/generic/make-derivation.nix | 2 +-
 pkgs/top-level/config.nix               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 09a71da93b6e..2f02bc7d1d78 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -156,7 +156,7 @@ let
 
 # Experimental.  For simple packages mostly just works,
 # but for anything complex, be prepared to debug if enabling.
-, __structuredAttrs ? false
+, __structuredAttrs ? config.structuredAttrsByDefault or false
 
 , env ? { }
 
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index a47655f11424..1de93a9f3fde 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -47,6 +47,10 @@ let
       feature = "set `strictDeps` to true by default";
     };
 
+    structuredAttrsByDefault = mkMassRebuild {
+      feature = "set `__structuredAttrs` to true by default";
+    };
+
     enableParallelBuildingByDefault = mkMassRebuild {
       feature = "set `enableParallelBuilding` to true by default";
     };

From 734d7df2351ac1a10774e665447c5cdc286fc16e Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 7 Dec 2022 00:08:33 +0200
Subject: [PATCH 033/953] allow derivation attributes in env

derivations can be coerced to their output paths
---
 .../build-support/bintools-wrapper/default.nix | 18 +++++++++---------
 pkgs/build-support/cc-wrapper/default.nix      | 15 +++++++++------
 pkgs/stdenv/generic/make-derivation.nix        |  4 ++--
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index ea925e90fa47..d41eaabe51a1 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -103,15 +103,12 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  inherit bintools_bin libc_bin libc_dev libc_lib coreutils_bin;
-  shell = getBin shell + shell.shellPath or "";
-  gnugrep_bin = if nativeTools then "" else gnugrep;
-
-  inherit targetPrefix suffixSalt;
+  inherit bintools_bin libc_bin libc_dev libc_lib;
 
   outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info");
 
   passthru = {
+    inherit targetPrefix suffixSalt;
     inherit bintools libc nativeTools nativeLibc nativePrefix;
 
     emacsBufferSetup = pkgs: ''
@@ -366,10 +363,13 @@ stdenv.mkDerivation {
     ##
     + extraBuildCommands;
 
-  inherit dynamicLinker;
-
-  # for substitution in utils.bash
-  expandResponseParams = "${expand-response-params}/bin/expand-response-params";
+  env = {
+    # for substitution in utils.bash
+    expandResponseParams = "${expand-response-params}/bin/expand-response-params";
+    shell = getBin shell + shell.shellPath or "";
+    gnugrep_bin = if nativeTools then "" else gnugrep;
+    inherit dynamicLinker suffixSalt coreutils_bin;
+  };
 
   meta =
     let bintools_ = if bintools != null then bintools else {}; in
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index a59505d08258..851b36fc2241 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -131,16 +131,14 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin;
-  shell = getBin shell + shell.shellPath or "";
-  gnugrep_bin = if nativeTools then "" else gnugrep;
+  inherit cc libc_bin libc_dev libc_lib;
 
-  inherit targetPrefix suffixSalt;
   inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
 
   outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];
 
   passthru = {
+    inherit targetPrefix suffixSalt;
     # "cc" is the generic name for a C compiler, but there is no one for package
     # providing the linker and related tools. The two we use now are GNU
     # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
@@ -538,8 +536,13 @@ stdenv.mkDerivation {
         nixSupport);
 
 
-  # for substitution in utils.bash
-  expandResponseParams = "${expand-response-params}/bin/expand-response-params";
+  env = {
+    # for substitution in utils.bash
+    expandResponseParams = "${expand-response-params}/bin/expand-response-params";
+    shell = getBin shell + shell.shellPath or "";
+    gnugrep_bin = if nativeTools then "" else gnugrep;
+    inherit suffixSalt coreutils_bin bintools;
+  };
 
   meta =
     let cc_ = if cc != null then cc else {}; in
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 2f02bc7d1d78..12aa25ac307c 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -488,8 +488,8 @@ else let
     assert lib.assertMsg (overlappingNames == [ ])
       "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${lib.concatStringsSep ", " overlappingNames}";
     lib.mapAttrs
-      (n: v: assert lib.assertMsg (lib.isString v || lib.isBool v || lib.isInt v)
-        "The ‘env’ attribute set can only contain string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v)
+      (n: v: assert lib.assertMsg (lib.isString v || lib.isBool v || lib.isInt v || lib.isDerivation v)
+        "The ‘env’ attribute set can only contain derivation, string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v)
       env;
 
 in

From 0cc87ab901909ae949d22caf071e446bed83e47a Mon Sep 17 00:00:00 2001
From: Leorize <leorize+oss@disroot.org>
Date: Wed, 7 Dec 2022 18:31:05 -0600
Subject: [PATCH 034/953] nixos/systemd/userdbd: add method to enable service

This is recommended to enable in conjunction with systemd-homed.
---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/system/boot/systemd/userdbd.nix | 18 +++++++++++
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/systemd-userdbd.nix               | 32 +++++++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 nixos/modules/system/boot/systemd/userdbd.nix
 create mode 100644 nixos/tests/systemd-userdbd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9faa58409b19..587cb2319e97 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1275,6 +1275,7 @@
   ./system/boot/systemd/shutdown.nix
   ./system/boot/systemd/tmpfiles.nix
   ./system/boot/systemd/user.nix
+  ./system/boot/systemd/userdbd.nix
   ./system/boot/timesyncd.nix
   ./system/boot/tmp.nix
   ./system/boot/uvesafb.nix
diff --git a/nixos/modules/system/boot/systemd/userdbd.nix b/nixos/modules/system/boot/systemd/userdbd.nix
new file mode 100644
index 000000000000..994aa3ca3b8c
--- /dev/null
+++ b/nixos/modules/system/boot/systemd/userdbd.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.services.userdbd;
+in
+{
+  options.services.userdbd.enable = lib.mkEnableOption (lib.mdDoc ''
+    Enables the systemd JSON user/group record lookup service
+  '');
+  config = lib.mkIf cfg.enable {
+    systemd.additionalUpstreamSystemUnits = [
+      "systemd-userdbd.socket"
+      "systemd-userdbd.service"
+    ];
+
+    systemd.sockets.systemd-userdbd.wantedBy = [ "sockets.target" ];
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 895cbe4290dc..31243f59bb98 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -636,6 +636,7 @@ in {
   systemd-shutdown = handleTest ./systemd-shutdown.nix {};
   systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
   systemd-misc = handleTest ./systemd-misc.nix {};
+  systemd-userdbd = handleTest ./systemd-userdbd.nix {};
   tandoor-recipes = handleTest ./tandoor-recipes.nix {};
   taskserver = handleTest ./taskserver.nix {};
   tayga = handleTest ./tayga.nix {};
diff --git a/nixos/tests/systemd-userdbd.nix b/nixos/tests/systemd-userdbd.nix
new file mode 100644
index 000000000000..5d0233ffd9fb
--- /dev/null
+++ b/nixos/tests/systemd-userdbd.nix
@@ -0,0 +1,32 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+  name = "systemd-userdbd";
+  nodes.machine = { config, pkgs, ... }: {
+    services.userdbd.enable = true;
+
+    users.users.test-user-nss = {
+      isNormalUser = true;
+    };
+
+    environment.etc."userdb/test-user-dropin.user".text = builtins.toJSON {
+      userName = "test-user-dropin";
+    };
+
+    environment.systemPackages = with pkgs; [ libvarlink ];
+  };
+  testScript = ''
+    import json
+    from shlex import quote
+
+    def getUserRecord(name):
+      Interface = "unix:/run/systemd/userdb/io.systemd.Multiplexer/io.systemd.UserDatabase"
+      payload = json.dumps({
+        "service": "io.systemd.Multiplexer",
+        "userName": name
+      })
+      return json.loads(machine.succeed(f"varlink call {Interface}.GetUserRecord {quote(payload)}"))
+
+    machine.wait_for_unit("systemd-userdbd.socket")
+    getUserRecord("test-user-nss")
+    getUserRecord("test-user-dropin")
+  '';
+})

From adc8900df1758eda56abd68f7d781d1df74fa531 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 7 Dec 2022 06:16:50 +0200
Subject: [PATCH 035/953] treewide: fix some core package structuredAttrs

---
 .../bintools-wrapper/default.nix              | 14 ++++++-------
 pkgs/build-support/cc-wrapper/default.nix     | 19 ++++++++----------
 .../build-support/nuke-references/default.nix | 10 ++++++----
 .../pkg-config-wrapper/default.nix            | 13 ++++++------
 pkgs/development/compilers/gcc/builder.sh     |  1 +
 .../interpreters/python/cpython/default.nix   | 20 ++++++++++---------
 .../interpreters/python/setup-hook.nix        |  4 +++-
 .../development/libraries/gettext/default.nix |  4 +++-
 pkgs/development/libraries/glibc/common.nix   | 15 +++++++-------
 .../perl-modules/generic/builder.sh           |  3 +++
 .../perl-modules/generic/default.nix          |  9 ++++++---
 11 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index d41eaabe51a1..be2e3567da85 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -55,9 +55,9 @@ let
   bintoolsVersion = lib.getVersion bintools;
   bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools);
 
-  libc_bin = if libc == null then null else getBin libc;
-  libc_dev = if libc == null then null else getDev libc;
-  libc_lib = if libc == null then null else getLib libc;
+  libc_bin = if libc == null then "" else getBin libc;
+  libc_dev = if libc == null then "" else getDev libc;
+  libc_lib = if libc == null then "" else getLib libc;
   bintools_bin = if nativeTools then "" else getBin bintools;
   # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
   coreutils_bin = if nativeTools then "" else getBin coreutils;
@@ -103,8 +103,6 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  inherit bintools_bin libc_bin libc_dev libc_lib;
-
   outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info");
 
   passthru = {
@@ -190,8 +188,6 @@ stdenv.mkDerivation {
   strictDeps = true;
   depsTargetTargetPropagated = extraPackages;
 
-  wrapperName = "BINTOOLS_WRAPPER";
-
   setupHooks = [
     ../setup-hooks/role.bash
     ./setup-hook.sh
@@ -368,7 +364,9 @@ stdenv.mkDerivation {
     expandResponseParams = "${expand-response-params}/bin/expand-response-params";
     shell = getBin shell + shell.shellPath or "";
     gnugrep_bin = if nativeTools then "" else gnugrep;
-    inherit dynamicLinker suffixSalt coreutils_bin;
+    wrapperName = "BINTOOLS_WRAPPER";
+    inherit dynamicLinker targetPrefix suffixSalt coreutils_bin;
+    inherit bintools_bin libc_bin libc_dev libc_lib;
   };
 
   meta =
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 851b36fc2241..abc88910c36d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -42,9 +42,9 @@ let
   ccVersion = lib.getVersion cc;
   ccName = lib.removePrefix targetPrefix (lib.getName cc);
 
-  libc_bin = if libc == null then null else getBin libc;
-  libc_dev = if libc == null then null else getDev libc;
-  libc_lib = if libc == null then null else getLib libc;
+  libc_bin = if libc == null then "" else getBin libc;
+  libc_dev = if libc == null then "" else getDev libc;
+  libc_lib = if libc == null then "" else getLib libc;
   cc_solib = getLib cc
     + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";
 
@@ -131,10 +131,6 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  inherit cc libc_bin libc_dev libc_lib;
-
-  inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
-
   outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];
 
   passthru = {
@@ -144,7 +140,7 @@ stdenv.mkDerivation {
     # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
     # unused middle-ground name that evokes both.
     inherit bintools;
-    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang;
+    inherit cc libc nativeTools nativeLibc nativePrefix isGNU isClang;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
@@ -268,8 +264,6 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ];
   depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;
 
-  wrapperName = "CC_WRAPPER";
-
   setupHooks = [
     ../setup-hooks/role.bash
   ] ++ lib.optional (cc.langC or true) ./setup-hook.sh
@@ -541,7 +535,10 @@ stdenv.mkDerivation {
     expandResponseParams = "${expand-response-params}/bin/expand-response-params";
     shell = getBin shell + shell.shellPath or "";
     gnugrep_bin = if nativeTools then "" else gnugrep;
-    inherit suffixSalt coreutils_bin bintools;
+    wrapperName = "CC_WRAPPER";
+    inherit suffixSalt coreutils_bin bintools cc;
+    inherit libc_bin libc_dev libc_lib;
+    inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
   };
 
   meta =
diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix
index 8dd9704aa4b4..c2dfe27b2c60 100644
--- a/pkgs/build-support/nuke-references/default.nix
+++ b/pkgs/build-support/nuke-references/default.nix
@@ -32,8 +32,10 @@ stdenvNoCC.mkDerivation {
   '';
 
   # FIXME: get rid of perl dependency.
-  inherit perl;
-  inherit (builtins) storeDir;
-  shell = lib.getBin shell + (shell.shellPath or "");
-  signingUtils = if darwinCodeSign then signingUtils else null;
+  env = {
+    inherit perl;
+    inherit (builtins) storeDir;
+    shell = lib.getBin shell + (shell.shellPath or "");
+    signingUtils = if darwinCodeSign then signingUtils else "";
+  };
 }
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix
index 312d2fe02610..ca14a4495fed 100644
--- a/pkgs/build-support/pkg-config-wrapper/default.nix
+++ b/pkgs/build-support/pkg-config-wrapper/default.nix
@@ -36,13 +36,10 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or "";
-
-  inherit targetPrefix suffixSalt baseBinName;
-
   outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc");
 
   passthru = {
+    inherit targetPrefix suffixSalt;
     inherit pkg-config;
   };
 
@@ -83,8 +80,6 @@ stdenv.mkDerivation {
       ln -s ${pkg-config}/share $out/share
     '';
 
-  wrapperName = "PKG_CONFIG_WRAPPER";
-
   setupHooks = [
     ../setup-hooks/role.bash
     ./setup-hook.sh
@@ -120,6 +115,12 @@ stdenv.mkDerivation {
     ##
     + extraBuildCommands;
 
+  env = {
+    shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or "";
+    wrapperName = "PKG_CONFIG_WRAPPER";
+    inherit targetPrefix suffixSalt baseBinName;
+  };
+
   meta =
     let pkg-config_ = if pkg-config != null then pkg-config else {}; in
     (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) //
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index c73e9e0c1075..113bd83ea53f 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index fb6bffd2594f..b99f3f40dfe7 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -281,15 +281,17 @@ in with passthru; stdenv.mkDerivation {
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   '';
 
-  CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);
-  LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);
-  LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}";
-  NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({
-    "glibc" = "-lgcc_s";
-    "musl" = "-lgcc_eh";
-  }."${stdenv.hostPlatform.libc}" or "");
-  # Determinism: We fix the hashes of str, bytes and datetime objects.
-  PYTHONHASHSEED=0;
+  env = {
+    CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);
+    LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);
+    LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}";
+    NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({
+      "glibc" = "-lgcc_s";
+      "musl" = "-lgcc_eh";
+    }."${stdenv.hostPlatform.libc}" or "");
+    # Determinism: We fix the hashes of str, bytes and datetime objects.
+    PYTHONHASHSEED=0;
+  };
 
   configureFlags = [
     "--without-ensurepip"
diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix
index 29ce079317f0..8cfb9dd46784 100644
--- a/pkgs/development/interpreters/python/setup-hook.nix
+++ b/pkgs/development/interpreters/python/setup-hook.nix
@@ -6,7 +6,9 @@ let
   hook = ./setup-hook.sh;
 in runCommand "python-setup-hook.sh" {
   strictDeps = true;
-  inherit sitePackages;
+  env = {
+    inherit sitePackages;
+  };
 } ''
   cp ${hook} hook.sh
   substituteAllInPlace hook.sh
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index a1270af259cd..ae5b9f48293a 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -60,7 +60,9 @@ stdenv.mkDerivation rec {
     ../../../build-support/setup-hooks/role.bash
     ./gettext-setup-hook.sh
   ];
-  gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl;
+  env = {
+    gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl;
+  };
 
   enableParallelBuilding = true;
   enableParallelChecking = false; # fails sometimes
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d7155ec946c9..db2ef06c0f59 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -54,9 +54,6 @@ assert withGd -> gd != null && libpng != null;
 
 stdenv.mkDerivation ({
   version = version + patchSuffix;
-  linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
-
-  inherit (stdenv) is64bit;
 
   enableParallelBuilding = true;
 
@@ -175,10 +172,14 @@ stdenv.mkDerivation ({
   nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs;
   buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs;
 
-  # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
-  # prevent a retained dependency on the bootstrap tools in the stdenv-linux
-  # bootstrap.
-  BASH_SHELL = "/bin/sh";
+  env = {
+    linuxHeaders = if withLinuxHeaders then linuxHeaders else "";
+    inherit (stdenv) is64bit;
+    # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
+    # prevent a retained dependency on the bootstrap tools in the stdenv-linux
+    # bootstrap.
+    BASH_SHELL = "/bin/sh";
+  };
 
   # Used by libgcc, elf-header, and others to determine ABI
   passthru = { inherit version; minorRelease = version; };
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index 9b42401fc4dc..e56d7ec10b21 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -1,3 +1,6 @@
+if [ -f .attrs.sh ]; then
+    . .attrs.sh
+fi
 source $stdenv/setup
 
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 2d1c550d3168..3dca6550ad68 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -24,6 +24,8 @@
 # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
 , PERL_USE_UNSAFE_INC ? "1"
 
+, env ? {}
+
 , ...
 }@attrs:
 
@@ -43,10 +45,11 @@ lib.throwIf (attrs ? name) "buildPerlPackage: `name` (\"${attrs.name}\") is depr
     buildInputs = buildInputs ++ [ perl ];
     nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ];
 
-    fullperl = buildPerl;
-
     inherit outputs src doCheck checkTarget enableParallelBuilding;
-    inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC;
+    env = {
+      inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC;
+      fullperl = buildPerl;
+    } // env;
 
     meta = defaultMeta // (attrs.meta or { });
   });

From 18d00c5814ce49b64a228ab78b8e834900db0519 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 7 Dec 2022 05:55:45 +0200
Subject: [PATCH 036/953] tests.stdenv: add some env attrset tests

---
 pkgs/test/default.nix        |   1 +
 pkgs/test/stdenv/default.nix | 107 +++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/test/stdenv/default.nix

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 3a39d247c8fe..6c89ba5638e0 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -21,6 +21,7 @@ with pkgs;
   cc-wrapper-clang-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.stdenv; };
   cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; };
   stdenv-inputs = callPackage ./stdenv-inputs { };
+  stdenv = callPackage ./stdenv { };
 
   config = callPackage ./config.nix { };
 
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
new file mode 100644
index 000000000000..01f0e0fe8b83
--- /dev/null
+++ b/pkgs/test/stdenv/default.nix
@@ -0,0 +1,107 @@
+# To run these tests:
+# nix-build -A tests.stdenv
+
+{ stdenv
+, pkgs
+, lib
+,
+}:
+
+let
+  # use a early stdenv so when hacking on stdenv this test can be run quickly
+  bootStdenv = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
+  pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; }; inherit (stdenv.hostPlatform) system; };
+  bootStdenvStructuredAttrsByDefault = pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
+in
+
+{
+  test-env-attrset = bootStdenv.mkDerivation {
+    name = "test-env-attrset";
+    dontUnpack = true;
+    dontConfigure = true;
+    dontBuild = true;
+    dontPatch = true;
+    dontFixup = true;
+    env = {
+      string = "testing-string";
+    };
+
+    installPhase = ''
+      declare -p string
+      echo "env.string = $string"
+      [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
+      touch $out
+    '';
+  };
+
+  test-structured-env-attrset = bootStdenv.mkDerivation {
+    name = "test-structured-env-attrset";
+    dontUnpack = true;
+    dontConfigure = true;
+    dontBuild = true;
+    dontPatch = true;
+    dontFixup = true;
+    __structuredAttrs = true;
+    env = {
+      string = "testing-string";
+    };
+
+    installPhase = ''
+      declare -p string
+      echo "env.string = $string"
+      [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
+      touch $out
+    '';
+  };
+
+  test-cc-wrapper-substitutions = bootStdenv.cc.overrideAttrs (previousAttrs: {
+    name = "test-cc-wrapper-substitutions";
+
+    postFixup = previousAttrs.postFixup + ''
+      declare -p wrapperName
+      echo "env.wrapperName = $wrapperName"
+      [[ $wrapperName == "CC_WRAPPER" ]] || (echo "wrapperName was not CC_WRAPPER" && false)
+      touch $out
+    '';
+  });
+
+  structuredAttrsByDefault = lib.recurseIntoAttrs {
+
+    test-cc-wrapper-substitutions = bootStdenvStructuredAttrsByDefault.cc.overrideAttrs (previousAttrs: {
+      name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";
+
+      postFixup = previousAttrs.postFixup + ''
+        declare -p wrapperName
+        echo "env.wrapperName = $wrapperName"
+        [[ $wrapperName == "CC_WRAPPER" ]] || (echo "wrapperName was not CC_WRAPPER" && false)
+        declare -p suffixSalt
+        echo "env.suffixSalt = $suffixSalt"
+        [[ $suffixSalt == "${bootStdenvStructuredAttrsByDefault.cc.suffixSalt}" ]] || (echo "wrapperName was not ${bootStdenvStructuredAttrsByDefault.cc.suffixSalt}" && false)
+
+        grep -q "@out@" $out/bin/cc || echo "@out@ in $out/bin/cc was substituted"
+        grep -q "@suffixSalt@" $out/bin/cc && (echo "$out/bin/cc contains unsubstituted variables" && false)
+
+        touch $out
+      '';
+    });
+
+    test-structured-env-attrset = bootStdenvStructuredAttrsByDefault.mkDerivation {
+      name = "test-structured-env-attrset-structuredAttrsByDefault";
+      dontUnpack = true;
+      dontConfigure = true;
+      dontBuild = true;
+      dontPatch = true;
+      dontFixup = true;
+      env = {
+        string = "testing-string";
+      };
+
+      installPhase = ''
+        declare -p string
+        echo "env.string = $string"
+        [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
+        touch $out
+      '';
+    };
+  };
+}

From bb914d8676e8e0261bcd4d604c653618f53ffbd8 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 7 Dec 2022 23:49:00 +0200
Subject: [PATCH 037/953] stdenv: export system pname name version for
 substituteAll

so we don't have to add these to the env attrset
---
 pkgs/stdenv/generic/setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 40905c8dfd07..182f849cf525 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -878,6 +878,10 @@ substituteInPlace() {
 }
 
 _allFlags() {
+    # export some local variables for the awk below
+    # so some substitutions such as name don't have to be in the env attrset
+    # when __structuredAttrs is enabled
+    export system pname name version
     for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do
         if (( "${NIX_DEBUG:-0}" >= 1 )); then
             printf "@%s@ -> %q\n" "${varName}" "${!varName}"

From c01f509e4438fd50faae0fa0175277b7b16728dc Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 01:51:03 +0200
Subject: [PATCH 038/953] treewide: source .attrs in builders

if theres a source $stdenv then this is needed

for structuredAttrs
---
 nixos/modules/services/networking/ircd-hybrid/builder.sh      | 1 +
 nixos/modules/services/web-servers/jboss/builder.sh           | 1 +
 pkgs/applications/misc/adobe-reader/builder.sh                | 1 +
 pkgs/applications/office/libreoffice/download-list-builder.sh | 1 +
 pkgs/build-support/fetchbzr/builder.sh                        | 1 +
 pkgs/build-support/fetchcvs/builder.sh                        | 1 +
 pkgs/build-support/fetchdarcs/builder.sh                      | 1 +
 pkgs/build-support/fetchdocker/fetchdocker-builder.sh         | 3 ++-
 pkgs/build-support/fetchfossil/builder.sh                     | 1 +
 pkgs/build-support/fetchgit/builder.sh                        | 2 ++
 pkgs/build-support/fetchhg/builder.sh                         | 1 +
 pkgs/build-support/fetchipfs/builder.sh                       | 1 +
 pkgs/build-support/fetchmtn/builder.sh                        | 1 +
 pkgs/build-support/fetchsvn/builder.sh                        | 1 +
 pkgs/build-support/fetchsvnssh/builder.sh                     | 1 +
 pkgs/build-support/fetchurl/builder.sh                        | 1 +
 pkgs/desktops/gnustep/make/builder.sh                         | 1 +
 pkgs/development/compilers/aspectj/builder.sh                 | 1 +
 pkgs/development/compilers/chicken/4/fetchegg/builder.sh      | 1 +
 pkgs/development/compilers/chicken/5/fetchegg/builder.sh      | 1 +
 pkgs/development/compilers/fpc/binary-builder-darwin.sh       | 1 +
 pkgs/development/compilers/fpc/binary-builder.sh              | 1 +
 pkgs/development/compilers/ios-cross-compile/9.2_builder.sh   | 1 +
 pkgs/development/compilers/ocaml/builder.sh                   | 1 +
 pkgs/development/libraries/glibc/locales-builder.sh           | 1 +
 pkgs/development/libraries/gtk-sharp/builder.sh               | 1 +
 pkgs/development/libraries/wtk/builder.sh                     | 1 +
 pkgs/development/nim-packages/fetch-nimble/builder.sh         | 1 +
 pkgs/development/perl-modules/generic/builder.sh              | 4 +---
 pkgs/development/tools/build-managers/apache-maven/builder.sh | 1 +
 pkgs/development/tools/build-managers/boot/builder.sh         | 1 +
 pkgs/development/tools/misc/automake/builder.sh               | 1 +
 pkgs/development/tools/parsing/antlr/builder.sh               | 1 +
 pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh             | 1 +
 pkgs/os-specific/linux/nvidia-x11/builder.sh                  | 1 +
 pkgs/os-specific/linux/opengl/xorg-sys/builder.sh             | 1 +
 pkgs/servers/http/tomcat/axis2/builder.sh                     | 1 +
 pkgs/servers/x11/xorg/builder.sh                              | 1 +
 pkgs/test/simple/builder.sh                                   | 1 +
 pkgs/tools/typesetting/lout/builder.sh                        | 1 +
 40 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh
index 38312210df25..d9d2e4264dfd 100644
--- a/nixos/modules/services/networking/ircd-hybrid/builder.sh
+++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 doSub() {
diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh
index 0e5af324c13f..ac573089cd5a 100644
--- a/nixos/modules/services/web-servers/jboss/builder.sh
+++ b/nixos/modules/services/web-servers/jboss/builder.sh
@@ -1,5 +1,6 @@
 set -e
 
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 mkdir -p $out/bin
diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh
index 41281385c990..6047c0826430 100644
--- a/pkgs/applications/misc/adobe-reader/builder.sh
+++ b/pkgs/applications/misc/adobe-reader/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 echo "unpacking $src..."
diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh
index c054e2c72cbe..31cab28fd82e 100644
--- a/pkgs/applications/office/libreoffice/download-list-builder.sh
+++ b/pkgs/applications/office/libreoffice/download-list-builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 tar --extract --file=$src libreoffice-$version/download.lst -O > $out
diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh
index e424fd92d51e..163f6fc60eea 100644
--- a/pkgs/build-support/fetchbzr/builder.sh
+++ b/pkgs/build-support/fetchbzr/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source "$stdenv/setup"
 
 header "exporting \`$url' (revision $rev) into \`$out'"
diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh
index fe1019aafc2f..90363275b973 100644
--- a/pkgs/build-support/fetchcvs/builder.sh
+++ b/pkgs/build-support/fetchcvs/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 (echo "#!$SHELL"; \
diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh
index 301deb98307f..018852770504 100644
--- a/pkgs/build-support/fetchdarcs/builder.sh
+++ b/pkgs/build-support/fetchdarcs/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 tagtext=""
diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh
index 7443591e6569..e5a1a61b78d3 100644
--- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh
+++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source "${stdenv}/setup"
 header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}"
 mkdir -p "${out}"
@@ -8,7 +9,7 @@ cat <<EOF > "${out}/compositeImage.sh"
 # Create a tar archive of a docker image's layers, docker image config
 # json, manifest.json, and repositories json; this streams directly to
 # stdout and is intended to be used in concert with docker load, i.e:
-# 
+#
 # ${out}/compositeImage.sh | docker load
 
 # The first character follow the 's' command for sed becomes the
diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh
index 5f08aca424fe..009b23c406d6 100644
--- a/pkgs/build-support/fetchfossil/builder.sh
+++ b/pkgs/build-support/fetchfossil/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 header "Cloning Fossil $url [$rev] into $out"
 
diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 66b6c168e41d..acb970639ab1 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -2,6 +2,8 @@
 # - no revision specified and remote has a HEAD which is used
 # - revision specified and remote has a HEAD
 # - revision specified and remote without HEAD
+#
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 header "exporting $url (rev $rev) into $out"
diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh
index 847f18fa5975..cec0e441f229 100644
--- a/pkgs/build-support/fetchhg/builder.sh
+++ b/pkgs/build-support/fetchhg/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 header "getting $url${rev:+ ($rev)} into $out"
 
diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh
index 7a6a517566f5..ca77962b5384 100644
--- a/pkgs/build-support/fetchipfs/builder.sh
+++ b/pkgs/build-support/fetchipfs/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 # Curl flags to handle redirects, not use EPSV, handle cookies for
diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh
index 73eff9c27252..7db66730dab8 100644
--- a/pkgs/build-support/fetchmtn/builder.sh
+++ b/pkgs/build-support/fetchmtn/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 set -x
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index ed3e65f07695..b58e5a88b3cd 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 header "exporting $url (r$rev) into $out"
diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh
index d9c6dc7da31a..b0441299dd2c 100644
--- a/pkgs/build-support/fetchsvnssh/builder.sh
+++ b/pkgs/build-support/fetchsvnssh/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 header "exporting $url (r$rev) into $out"
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 5ca09b6fc77d..dd987f41b446 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 source $mirrorsFile
diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh
index 39bd77038281..e5c277e796af 100644
--- a/pkgs/desktops/gnustep/make/builder.sh
+++ b/pkgs/desktops/gnustep/make/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 preConfigure() {
diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh
index 3b4393720042..7ea0a40d3748 100755
--- a/pkgs/development/compilers/aspectj/builder.sh
+++ b/pkgs/development/compilers/aspectj/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 export JAVA_HOME=$jre
diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh
index 204661063090..5f41a36263a9 100644
--- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh
+++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 header "exporting egg ${eggName} (version $version) into $out"
diff --git a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh
index d9adf510f22d..f02e01757787 100644
--- a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh
+++ b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 header "exporting egg ${eggName} (version $version) into $out"
diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/development/compilers/fpc/binary-builder-darwin.sh
index f9bdf18e7d68..39db0518281d 100755
--- a/pkgs/development/compilers/fpc/binary-builder-darwin.sh
+++ b/pkgs/development/compilers/fpc/binary-builder-darwin.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 pkgdir=$(pwd)/pkg
diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh
index 4308c1ed211a..c471378c275f 100755
--- a/pkgs/development/compilers/fpc/binary-builder.sh
+++ b/pkgs/development/compilers/fpc/binary-builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 tar xf $src
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
index 68ba3ed3a920..47459664af0a 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
+++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
@@ -1,4 +1,5 @@
 # -*- shell-script -*-
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 function extract
diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh
index a1807682d867..88acc0654cf2 100644
--- a/pkgs/development/compilers/ocaml/builder.sh
+++ b/pkgs/development/compilers/ocaml/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 configureFlags="-prefix $out $configureFlags"
diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh
index d732e208fa22..d91f936c937b 100644
--- a/pkgs/development/libraries/glibc/locales-builder.sh
+++ b/pkgs/development/libraries/glibc/locales-builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 # Glibc cannot have itself in its RPATH.
 export NIX_NO_SELF_RPATH=1
 
diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh
index 4b8f757540b5..73914495d6d4 100644
--- a/pkgs/development/libraries/gtk-sharp/builder.sh
+++ b/pkgs/development/libraries/gtk-sharp/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 genericBuild
diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh
index 86f2719537cd..c3ad173b0933 100644
--- a/pkgs/development/libraries/wtk/builder.sh
+++ b/pkgs/development/libraries/wtk/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 mkdir unzipped
diff --git a/pkgs/development/nim-packages/fetch-nimble/builder.sh b/pkgs/development/nim-packages/fetch-nimble/builder.sh
index 693ab339408e..bc2f9bfc94f1 100644
--- a/pkgs/development/nim-packages/fetch-nimble/builder.sh
+++ b/pkgs/development/nim-packages/fetch-nimble/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 export HOME=$NIX_BUILD_TOP
 
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index e56d7ec10b21..110094ad8a49 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -1,6 +1,4 @@
-if [ -f .attrs.sh ]; then
-    . .attrs.sh
-fi
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"
diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh
index dcc38b9ec74a..96fe8ebfac29 100644
--- a/pkgs/development/tools/build-managers/apache-maven/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 unpackPhase
diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh
index c1481dc6a144..e007cbac9582 100644
--- a/pkgs/development/tools/build-managers/boot/builder.sh
+++ b/pkgs/development/tools/build-managers/boot/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 boot_bin=$out/bin/boot
diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh
index e54a2acca67e..0cb1d5d61e33 100644
--- a/pkgs/development/tools/misc/automake/builder.sh
+++ b/pkgs/development/tools/misc/automake/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 # Wrap the given `aclocal' program, appending extra `-I' flags
diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh
index b8e7791b6fc9..55259b932124 100644
--- a/pkgs/development/tools/parsing/antlr/builder.sh
+++ b/pkgs/development/tools/parsing/antlr/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 tar zxvf $src
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
index f750df6e5063..bdb522744182 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 arch=$(uname -m)
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index eadf88fd1168..1cf1400f996b 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 unpackManually() {
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
index cd21899e60e7..34f9b1579455 100644
--- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
+++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 mkdir -p $out/lib
diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh
index 2e36367e9dcf..d334ab6f927f 100644
--- a/pkgs/servers/http/tomcat/axis2/builder.sh
+++ b/pkgs/servers/http/tomcat/axis2/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 source $stdenv/setup
 
 unzip $src
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 5a832cb14d53..9ee81091584b 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 # This is the builder for all X.org components.
 source $stdenv/setup
 
diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh
index 65f7e4c11ba1..908faec3c388 100644
--- a/pkgs/test/simple/builder.sh
+++ b/pkgs/test/simple/builder.sh
@@ -1,3 +1,4 @@
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 set -x
 
 export NIX_DEBUG=1
diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh
index eab37c3c68fb..cd513337f6f3 100755
--- a/pkgs/tools/typesetting/lout/builder.sh
+++ b/pkgs/tools/typesetting/lout/builder.sh
@@ -1,6 +1,7 @@
 # Prepare a makefile specifying the appropriate output directories.
 #
 # Written by Ludovic Courtès <ludo@gnu.org>.
+if [ -e .attrs.sh ]; then source .attrs.sh; fi
 
 source "$stdenv/setup" || exit 1
 

From 02e3f51d27417f2775982281fc39e31a4978ae39 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 04:30:26 +0200
Subject: [PATCH 039/953] darwin: use // for binutils-unwrapped and cctools to
 preserve the other attributes

---
 pkgs/stdenv/darwin/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 9a7cd9aa9dee..76c44870f4ad 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -262,11 +262,12 @@ rec {
           ln -s ${bootstrapTools}/bin/rewrite-tbd $out/bin
         '';
 
-        binutils-unwrapped = { name = "bootstrap-stage0-binutils"; outPath = bootstrapTools; };
+        binutils-unwrapped = bootstrapTools // {
+          name = "bootstrap-stage0-binutils";
+        };
 
-        cctools = {
+        cctools = bootstrapTools // {
           name = "bootstrap-stage0-cctools";
-          outPath = bootstrapTools;
           targetPrefix = "";
         };
 

From c41cc9e762a97c20ec3be01db254787c046510e2 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 04:52:11 +0200
Subject: [PATCH 040/953] treewide: move some perl vars to env attrset

---
 pkgs/development/libraries/xapian/default.nix | 2 +-
 pkgs/servers/monitoring/munin/default.nix     | 2 +-
 pkgs/top-level/perl-packages.nix              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 700fa1d13dd1..3c0a555dd978 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -26,7 +26,7 @@ let
     nativeBuildInputs = [ autoreconfHook ];
 
     doCheck = true;
-    AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
+    env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
 
     patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
 
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 0bfc868167cb..2016bbe9ed3b 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ];
 
   # needs to find a local perl module during build
-  PERL_USE_UNSAFE_INC = "1";
+  env.PERL_USE_UNSAFE_INC = "1";
 
   # TODO: tests are failing https://munin-monitoring.org/ticket/1390#comment:1
   # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e0cecf43d264..63d31a6cf57f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -23029,7 +23029,7 @@ let
 
     # For some crazy reason Makefile.PL doesn't generate a Makefile if
     # AUTOMATED_TESTING is set.
-    AUTOMATED_TESTING = false;
+    env.AUTOMATED_TESTING = false;
 
     # Makefile.PL looks for ncurses in Glibc's prefix.
     preConfigure =
@@ -27058,7 +27058,7 @@ let
         hash = "sha256-gxxY8549/ebS3QORjSs8IgdBs2aD05Tu+9Bn70gu7gQ=";
       })
     ];
-    AUTOMATED_TESTING = false;
+    env.AUTOMATED_TESTING = false;
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ];
     propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ];

From c577eb6892a1128c1dd52846596217653ea87f14 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 04:59:55 +0200
Subject: [PATCH 041/953] wrapNonDeterministicGcc: fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nix-repl> legacyPackages.x86_64-linux.fastStdenv
error: The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: cc
«derivation
---
 pkgs/top-level/all-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44de96911273..23db6e1f2f7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13933,9 +13933,11 @@ with pkgs;
 
   wrapNonDeterministicGcc = stdenv: ccWrapper:
     if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: {
-      cc = old.cc.override {
-        reproducibleBuild = false;
-        profiledCompiler = with stdenv; (!isDarwin && hostPlatform.isx86);
+      env = old.env // {
+        cc = old.env.cc.override {
+          reproducibleBuild = false;
+          profiledCompiler = with stdenv; (!isDarwin && hostPlatform.isx86);
+        };
       };
     }) else ccWrapper;
 

From 89dc806f131ae9318d47d43befbe9a3ef7f7a765 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 21:11:35 +0200
Subject: [PATCH 042/953] what to do about attrs.env or {} maybe have a empty
 env attrset always so no need to use `or`

---
 pkgs/stdenv/linux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index dbaff342fb1a..6a1211f9cc48 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -249,7 +249,7 @@ in
         # Apparently iconv won't work with bootstrap glibc, but it will be used
         # with glibc built later where we keep *this* build of libunistring,
         # so we need to trick it into supporting libiconv.
-        am_cv_func_iconv_works = "yes";
+        env = attrs.env or {} // { am_cv_func_iconv_works = "yes"; };
       });
       libidn2 = super.libidn2.overrideAttrs (attrs: {
         postFixup = attrs.postFixup or "" + ''

From 11b49fa7915f35251e18fe967fc63b4900dbad81 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 9 Dec 2022 08:45:38 +0200
Subject: [PATCH 043/953] 
 tests.hooks.default-stdenv-hooks.make-symlinks-relative: init

---
 pkgs/test/default.nix       |  2 ++
 pkgs/test/hooks/default.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/test/hooks/default.nix

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 3a39d247c8fe..6913415138ad 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -26,6 +26,8 @@ with pkgs;
 
   haskell = callPackage ./haskell { };
 
+  hooks = callPackage ./hooks { };
+
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
   cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
 
diff --git a/pkgs/test/hooks/default.nix b/pkgs/test/hooks/default.nix
new file mode 100644
index 000000000000..fe3a9b2a2167
--- /dev/null
+++ b/pkgs/test/hooks/default.nix
@@ -0,0 +1,28 @@
+# To run these tests:
+# nix-build -A tests.hooks
+
+{ stdenv, pkgs, lib }:
+
+{
+  # this attrset is for hooks in `stdenv.defaultNativeBuildInputs`
+  default-stdenv-hooks = lib.recurseIntoAttrs {
+    make-symlinks-relative = stdenv.mkDerivation {
+      name = "test-make-symlinks-relative";
+      passAsFile = [ "buildCommand" ];
+      buildCommand = ''
+        mkdir -p $out/{bar,baz}
+        source1="$out/bar/foo"
+        destination1="$out/baz/foo"
+        echo foo > $source1
+        ln -s $source1 $destination1
+        echo "symlink before patching: $(readlink $destination1)"
+
+        _makeSymlinksRelative
+
+        echo "symlink after patching: $(readlink $destination1)"
+        ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
+        ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
+      '';
+    };
+  };
+}

From 7180c66687dd21546d904f916234e1f70f1c3590 Mon Sep 17 00:00:00 2001
From: Isabelle <hi@f2k1.de>
Date: Wed, 7 Dec 2022 15:23:17 +0100
Subject: [PATCH 044/953] ffmpeg: 4.4.2 -> 4.4.3

https://github.com/FFmpeg/FFmpeg/blob/n4.4.3/Changelog
---
 pkgs/development/libraries/ffmpeg/4.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index e37e90d553a3..ac88df930768 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -1,15 +1,8 @@
-{ callPackage, fetchpatch, ... }@args:
+{ callPackage, ... }@args:
 
 callPackage ./generic.nix (rec {
-  version = "4.4.2";
+  version = "4.4.3";
   branch = version;
-  sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg=";
+  sha256 = "sha256-M7jC281TD+HbVxBBU0Vgm0yiJ70NoeOpMy27DxH9Jzo=";
 
-  patches = [
-    # SDL2 recently changed their versioning
-    (fetchpatch {
-      url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba";
-      hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0=";
-    })
-  ];
 } // args)

From 6459f8f88f36c55b9b7bf4b5d90dadf792ee1202 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@doge-inc.net>
Date: Sat, 29 Oct 2022 19:01:14 -0400
Subject: [PATCH 045/953] rhash: 1.4.2 -> 1.4.3

Removed patch, as per the comment
---
 pkgs/tools/security/rhash/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index b539772213bb..4b4103ff9fb1 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -1,30 +1,21 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , which
 , enableStatic ? stdenv.hostPlatform.isStatic
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.4.3";
   pname = "rhash";
 
   src = fetchFromGitHub {
     owner = "rhash";
     repo = "RHash";
     rev = "v${version}";
-    sha256 = "sha256-HkDgWwHoRWCNtWyfP4sj3veEd+KT5J7yL4J4Z/hJcrE=";
+    sha256 = "sha256-R+dHYG0DBI1uo+yF/pxoTv/V9WSfph043bH6erZjeCE=";
   };
 
-  patches = [
-    # Fix clang configuration; remove with next release
-    (fetchpatch {
-      url = "https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc.patch";
-      sha256 = "0i5jz2s37h278c8d36pzphhp8rjy660zmhpg2cqlp960f6ny8wwj";
-    })
-  ];
-
   nativeBuildInputs = [ which ];
 
   # configure script is not autotools-based, doesn't support these options

From 9578c26172e2881eba2af08c5a34904c654ea719 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Fri, 9 Dec 2022 15:54:32 +0000
Subject: [PATCH 046/953] libdrm: mark unsupported on Darwin

Unlike many other Unixes, Darwin does not implement DRM.
---
 pkgs/development/libraries/libdrm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index c96bc4e41afc..83a426a2afa4 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       the Mesa drivers, the X drivers, libva and similar projects.
     '';
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = lib.subtractLists platforms.darwin platforms.unix;
     maintainers = with maintainers; [ primeos ];
   };
 }

From 8bf18f7862ea9c10c1669f6e82e6d0b4e7600ea8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Fri, 9 Dec 2022 15:55:06 +0000
Subject: [PATCH 047/953] mesa: use libdrm on all supported platforms

libdrm is not Linux-specific.  It is also used on (at least) every BSD
and illumos.
---
 pkgs/development/libraries/mesa/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 113f3be326a3..4cf7a8069a89 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -40,6 +40,8 @@ let
   version = "22.2.4";
   branch  = versions.major version;
 
+  withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm;
+
 self = stdenv.mkDerivation {
   pname = "mesa";
   inherit version;
@@ -150,7 +152,7 @@ self = stdenv.mkDerivation {
 
   propagatedBuildInputs = with xorg; [
     libXdamage libXxf86vm
-  ] ++ optional stdenv.isLinux libdrm
+  ] ++ optional withLibdrm libdrm
     ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
 
   doCheck = false;
@@ -242,10 +244,11 @@ self = stdenv.mkDerivation {
   ];
 
   passthru = {
-    inherit libdrm;
     inherit (libglvnd) driverLink;
     inherit llvmPackages;
 
+    libdrm = if withLibdrm then libdrm else null;
+
     tests = lib.optionalAttrs stdenv.isLinux {
       devDoesNotDependOnLLVM = stdenv.mkDerivation {
         name = "mesa-dev-does-not-depend-on-llvm";

From 93b89c7bfcb67f45a660e017f034974c911ae874 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Fri, 9 Dec 2022 15:56:36 +0000
Subject: [PATCH 048/953] wayland: disable tests if libraries are disabled

This fixes the withLibraries = false build.
---
 pkgs/development/libraries/wayland/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index c9d0a7ad3b7c..87af23a97e0e 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -48,8 +48,9 @@ stdenv.mkDerivation rec {
   separateDebugInfo = true;
 
   mesonFlags = [
-    "-Dlibraries=${lib.boolToString withLibraries}"
     "-Ddocumentation=${lib.boolToString withDocumentation}"
+    "-Dlibraries=${lib.boolToString withLibraries}"
+    "-Dtests=${lib.boolToString withLibraries}"
   ];
 
   depsBuildBuild = [

From 11dffd155d01d30e07d4dbfe6c6d6de05383be3a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Fri, 9 Dec 2022 15:58:27 +0000
Subject: [PATCH 049/953] Revert "wayland: broken for darwin"

This reverts commit c5ef87542626ce9836144b8eb50f1c24d69aa465.

Doesn't seem to be a problem any more.
---
 pkgs/development/libraries/wayland/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 87af23a97e0e..e3fc9c06c9d0 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -110,8 +110,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit; # Expat version
     platforms = if withLibraries then platforms.linux else platforms.unix;
     maintainers = with maintainers; [ primeos codyopel qyliss ];
-    # big sur doesn't support gcc stdenv and wayland doesn't build with clang
-    broken = stdenv.isDarwin;
   };
 
   passthru.version = version;

From 53b6c15df2ed9ff30b22016da87d76841aa866bc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Fri, 9 Dec 2022 15:59:16 +0000
Subject: [PATCH 050/953] wayland-protocols: only run tests with libwayland

---
 pkgs/development/libraries/wayland/default.nix   | 2 ++
 pkgs/development/libraries/wayland/protocols.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index e3fc9c06c9d0..bb764d641436 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -96,6 +96,8 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
+  passthru = { inherit withLibraries; };
+
   meta = with lib; {
     description = "Core Wayland window system code and protocol";
     longDescription = ''
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 1d4b62788935..8629c8bec0fc 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   pname = "wayland-protocols";
   version = "1.31";
 
-  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform && wayland.withLibraries;
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";

From 2017fba3a2552519dbf918a19251a452ea90d4cc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Fri, 9 Dec 2022 16:00:02 +0000
Subject: [PATCH 051/953] wayland-protocols: broaden platforms

It's just some XML files!
---
 pkgs/development/libraries/wayland/protocols.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 8629c8bec0fc..bd94cc6b47ed 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage    = "https://gitlab.freedesktop.org/wayland/wayland-protocols";
     license     = lib.licenses.mit; # Expat version
-    platforms   = lib.platforms.linux;
+    platforms   = lib.platforms.all;
     maintainers = with lib.maintainers; [ primeos ];
   };
 

From e79dbb918a261599e2e0bfc32548494681de1561 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Fri, 9 Dec 2022 16:16:31 +0000
Subject: [PATCH 052/953] mesa-demos: fix build on Darwin

---
 pkgs/tools/graphics/mesa-demos/default.nix | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix
index 11ca657ebfed..efc58c370736 100644
--- a/pkgs/tools/graphics/mesa-demos/default.nix
+++ b/pkgs/tools/graphics/mesa-demos/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa
+{ lib, stdenv, fetchurl, fetchpatch
+, freeglut, glew, libGL, libGLU, libX11, libXext, mesa
 , meson, ninja, pkg-config, wayland, wayland-protocols }:
 
 stdenv.mkDerivation rec {
@@ -13,21 +14,31 @@ stdenv.mkDerivation rec {
   patches = [
     # https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/83
     ./demos-data-dir.patch
+
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/mesa/demos/-/commit/b6d183f9943a275990aef7f08773e54c597572e5.patch";
+      sha256 = "4UdV+cxvNRqoT+Pdy0gkCPXJbhFr6CSCw/UOOB+rvuw=";
+    })
   ];
 
   buildInputs = [
-    freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland
+    freeglut glew libX11 libXext libGL libGLU mesa wayland
     wayland-protocols
-  ];
+  ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ;
   nativeBuildInputs = [ meson ninja pkg-config ];
 
-  mesonFlags = [ "-Dwith-system-data-files=true" ];
+  mesonFlags = [
+    "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}"
+    "-Dlibdrm=${if mesa.libdrm == null then "disabled" else "enabled"}"
+    "-Dosmesa=${if mesa ? osmesa then "enabled" else "disabled"}"
+    "-Dwayland=${if wayland.withLibraries then "enabled" else "disabled"}"
+    "-Dwith-system-data-files=true"
+  ];
 
   meta = with lib; {
+    inherit (mesa.meta) homepage platforms;
     description = "Collection of demos and test programs for OpenGL and Mesa";
-    homepage = "https://www.mesa3d.org/";
     license = licenses.mit;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ andersk ];
   };
 }

From 05420f34cf7b8eb6acb1e18d918b1a9a78762473 Mon Sep 17 00:00:00 2001
From: Leorize <leorize+oss@disroot.org>
Date: Thu, 8 Dec 2022 02:49:12 -0600
Subject: [PATCH 053/953] nixos: add systemd-homed support

As a start, it's not very configurable, but works pretty well.
---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/security/pam.nix              | 27 +++++-
 nixos/modules/system/boot/systemd.nix       |  2 +-
 nixos/modules/system/boot/systemd/homed.nix | 43 +++++++++
 nixos/tests/all-tests.nix                   |  1 +
 nixos/tests/systemd-homed.nix               | 99 +++++++++++++++++++++
 pkgs/os-specific/linux/systemd/default.nix  |  2 +-
 pkgs/top-level/all-packages.nix             |  1 +
 8 files changed, 171 insertions(+), 5 deletions(-)
 create mode 100644 nixos/modules/system/boot/systemd/homed.nix
 create mode 100644 nixos/tests/systemd-homed.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 587cb2319e97..3196bfad8336 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1276,6 +1276,7 @@
   ./system/boot/systemd/tmpfiles.nix
   ./system/boot/systemd/user.nix
   ./system/boot/systemd/userdbd.nix
+  ./system/boot/systemd/homed.nix
   ./system/boot/timesyncd.nix
   ./system/boot/tmp.nix
   ./system/boot/uvesafb.nix
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 21e1749d8503..ccc484198279 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -488,6 +488,9 @@ let
             account [success=ok ignore=ignore default=die] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so
             account [success=ok default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so
           '' +
+          optionalString config.services.homed.enable ''
+            account sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so
+          '' +
           # The required pam_unix.so module has to come after all the sufficient modules
           # because otherwise, the account lookup will fail if the user does not exist
           # locally, for example with MySQL- or LDAP-auth.
@@ -541,8 +544,10 @@ let
           # after it succeeds. Certain modules need to run after pam_unix
           # prompts the user for password so we run it once with 'optional' at an
           # earlier point and it will run again with 'sufficient' further down.
-          # We use try_first_pass the second time to avoid prompting password twice
-          (optionalString (cfg.unixAuth &&
+          # We use try_first_pass the second time to avoid prompting password twice.
+          #
+          # The same principle applies to systemd-homed
+          (optionalString ((cfg.unixAuth || config.services.homed.enable) &&
             (config.security.pam.enableEcryptfs
               || config.security.pam.enableFscrypt
               || cfg.pamMount
@@ -553,7 +558,10 @@ let
               || cfg.failDelay.enable
               || cfg.duoSecurity.enable))
             (
-              ''
+              optionalString config.services.homed.enable ''
+                auth optional ${config.systemd.package}/lib/security/pam_systemd_home.so
+              '' +
+              optionalString cfg.unixAuth ''
                 auth optional pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth
               '' +
               optionalString config.security.pam.enableEcryptfs ''
@@ -584,6 +592,9 @@ let
                 auth required ${pkgs.duo-unix}/lib/security/pam_duo.so
               ''
             )) +
+          optionalString config.services.homed.enable ''
+            auth sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so
+          '' +
           optionalString cfg.unixAuth ''
             auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass
           '' +
@@ -605,6 +616,10 @@ let
             auth required pam_deny.so
 
             # Password management.
+          '' +
+          optionalString config.services.homed.enable ''
+            password sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so
+          '' + ''
             password sufficient pam_unix.so nullok sha512
           '' +
           optionalString config.security.pam.enableEcryptfs ''
@@ -650,6 +665,9 @@ let
           ++ optional (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}"
           ++ optional (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}"
           )) +
+          optionalString config.services.homed.enable ''
+            session required ${config.systemd.package}/lib/security/pam_systemd_home.so
+          '' +
           optionalString cfg.makeHomeDir ''
             session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077
           '' +
@@ -1345,6 +1363,9 @@ in
       '' +
       optionalString config.virtualisation.lxc.lxcfs.enable ''
         mr ${pkgs.lxc}/lib/security/pam_cgfs.so
+      '' +
+      optionalString config.services.homed.enable ''
+        mr ${config.systemd.package}/lib/security/pam_systemd_home.so
       '';
   };
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index e37ed8531810..679a663362b6 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -450,7 +450,7 @@ in
         (mkAfter [ "systemd" ])
       ]);
       group = (mkMerge [
-        (mkAfter [ "systemd" ])
+        (mkAfter [ "[success=merge] systemd" ]) # need merge so that NSS won't stop at file-based groups
       ]);
     };
 
diff --git a/nixos/modules/system/boot/systemd/homed.nix b/nixos/modules/system/boot/systemd/homed.nix
new file mode 100644
index 000000000000..403d1690124d
--- /dev/null
+++ b/nixos/modules/system/boot/systemd/homed.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.services.homed;
+in
+{
+  options.services.homed.enable = lib.mkEnableOption (lib.mdDoc ''
+    Enable systemd home area/user account manager
+  '');
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.services.nscd.enable;
+        message = "systemd-homed requires the use of systemd nss module. services.nscd.enable must be set to true,";
+      }
+    ];
+
+    systemd.additionalUpstreamSystemUnits = [
+      "systemd-homed.service"
+      "systemd-homed-activate.service"
+    ];
+
+    # This is mentioned in homed's [Install] section.
+    #
+    # While homed appears to work without it, it's probably better
+    # to follow upstream recommendations.
+    services.userdbd.enable = lib.mkDefault true;
+
+    systemd.services = {
+      systemd-homed = {
+        # These packages are required to manage encrypted volumes
+        path = config.system.fsPackages;
+        aliases = [ "dbus-org.freedesktop.home1.service" ];
+        wantedBy = [ "multi-user.target" ];
+      };
+
+      systemd-homed-activate = {
+        wantedBy = [ "systemd-homed.service" ];
+      };
+    };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 31243f59bb98..1eab790887d5 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -637,6 +637,7 @@ in {
   systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
   systemd-misc = handleTest ./systemd-misc.nix {};
   systemd-userdbd = handleTest ./systemd-userdbd.nix {};
+  systemd-homed = handleTest ./systemd-homed.nix {};
   tandoor-recipes = handleTest ./tandoor-recipes.nix {};
   taskserver = handleTest ./taskserver.nix {};
   tayga = handleTest ./tayga.nix {};
diff --git a/nixos/tests/systemd-homed.nix b/nixos/tests/systemd-homed.nix
new file mode 100644
index 000000000000..ecc92e98eddc
--- /dev/null
+++ b/nixos/tests/systemd-homed.nix
@@ -0,0 +1,99 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }:
+let
+  password = "foobar";
+  newPass = "barfoo";
+in
+{
+  name = "systemd-homed";
+  nodes.machine = { config, pkgs, ... }: {
+    services.homed.enable = true;
+
+    users.users.test-normal-user = {
+      extraGroups = [ "wheel" ];
+      isNormalUser = true;
+      initialPassword = password;
+    };
+  };
+  testScript = ''
+    def switchTTY(number):
+      machine.send_key(f"alt-f{number}")
+      machine.wait_until_succeeds(f"[ $(fgconsole) = {number} ]")
+      machine.wait_for_unit(f"getty@tty{number}.service")
+      machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{number}'")
+
+    machine.wait_for_unit("multi-user.target")
+
+    # Smoke test to make sure the pam changes didn't break regular users.
+    machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+    with subtest("login as regular user"):
+      switchTTY(2)
+      machine.wait_until_tty_matches("2", "login: ")
+      machine.send_chars("test-normal-user\n")
+      machine.wait_until_tty_matches("2", "login: test-normal-user")
+      machine.wait_until_tty_matches("2", "Password: ")
+      machine.send_chars("${password}\n")
+      machine.wait_until_succeeds("pgrep -u test-normal-user bash")
+      machine.send_chars("whoami > /tmp/1\n")
+      machine.wait_for_file("/tmp/1")
+      assert "test-normal-user" in machine.succeed("cat /tmp/1")
+
+    with subtest("create homed encrypted user"):
+      # TODO: Figure out how to pass password manually.
+      #
+      # This environment variable is used for homed internal testing
+      # and is not documented.
+      machine.succeed("NEWPASSWORD=${password} homectl create --shell=/run/current-system/sw/bin/bash --storage=luks -G wheel test-homed-user")
+
+    with subtest("login as homed user"):
+      switchTTY(3)
+      machine.wait_until_tty_matches("3", "login: ")
+      machine.send_chars("test-homed-user\n")
+      machine.wait_until_tty_matches("3", "login: test-homed-user")
+      machine.wait_until_tty_matches("3", "Password: ")
+      machine.send_chars("${password}\n")
+      machine.wait_until_succeeds("pgrep -t tty3 -u test-homed-user bash")
+      machine.send_chars("whoami > /tmp/2\n")
+      machine.wait_for_file("/tmp/2")
+      assert "test-homed-user" in machine.succeed("cat /tmp/2")
+
+    with subtest("change homed user password"):
+      switchTTY(4)
+      machine.wait_until_tty_matches("4", "login: ")
+      machine.send_chars("test-homed-user\n")
+      machine.wait_until_tty_matches("4", "login: test-homed-user")
+      machine.wait_until_tty_matches("4", "Password: ")
+      machine.send_chars("${password}\n")
+      machine.wait_until_succeeds("pgrep -t tty4 -u test-homed-user bash")
+      machine.send_chars("passwd\n")
+      # homed does it in a weird order, it asks for new passes, then it asks
+      # for the old one.
+      machine.sleep(2)
+      machine.send_chars("${newPass}\n")
+      machine.sleep(2)
+      machine.send_chars("${newPass}\n")
+      machine.sleep(4)
+      machine.send_chars("${password}\n")
+      machine.wait_until_fails("pgrep -t tty4 passwd")
+
+      @polling_condition
+      def not_logged_in_tty5():
+        machine.fail("pgrep -t tty5 bash")
+
+      switchTTY(5)
+      with not_logged_in_tty5: # type: ignore[union-attr]
+        machine.wait_until_tty_matches("5", "login: ")
+        machine.send_chars("test-homed-user\n")
+        machine.wait_until_tty_matches("5", "login: test-homed-user")
+        machine.wait_until_tty_matches("5", "Password: ")
+        machine.send_chars("${password}\n")
+        machine.wait_until_tty_matches("5", "Password incorrect or not sufficient for authentication of user test-homed-user.")
+        machine.wait_until_tty_matches("5", "Sorry, try again: ")
+      machine.send_chars("${newPass}\n")
+      machine.send_chars("whoami > /tmp/4\n")
+      machine.wait_for_file("/tmp/4")
+      assert "test-homed-user" in machine.succeed("cat /tmp/4")
+
+    with subtest("homed user should be in wheel according to NSS"):
+      machine.succeed("userdbctl group wheel -s io.systemd.NameServiceSwitch | grep test-homed-user")
+  '';
+})
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7c57d9edf601..47d42c39c124 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -81,7 +81,7 @@
 , withDocumentation ? true
 , withEfi ? stdenv.hostPlatform.isEfi
 , withFido2 ? true
-, withHomed ? false
+, withHomed ? true
 , withHostnamed ? true
 , withHwdb ? true
 , withImportd ? !stdenv.hostPlatform.isMusl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 734cb670af49..bceb86fa66d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25973,6 +25973,7 @@ with pkgs;
     withEfi = false;
     withFido2 = false;
     withHostnamed = false;
+    withHomed = false;
     withHwdb = false;
     withImportd = false;
     withLibBPF = false;

From 3046b67ec7a41654c8ecec0087110670a4ffdaf3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Dec 2022 19:22:23 +0100
Subject: [PATCH 054/953] python310Packages.aiosignal: 1.3.1 -> 1.3.1

Diff: https://github.com/aio-libs/aiosignal/compare/v1.3.1...v1.3.1

Changelog: https://github.com/aio-libs/aiosignal/blob/v1.3.1/CHANGES.rst
---
 .../python-modules/aiosignal/default.nix           | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index 9d815dfac059..2cb61f4f9719 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -9,14 +9,16 @@
 
 buildPythonPackage rec {
   pname = "aiosignal";
-  version = "1.2.0";
-  disabled = pythonOlder "3.6";
+  version = "1.3.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1pamfc2l95s1q86jvmbp17chjy129gk01kwy8xm88d2ijy8s1caq";
+    hash = "sha256-vx3Fe28r+0it1UFwyDSD9NNyeIN4tywTyr4pVp49WuU=";
   };
 
   propagatedBuildInputs = [
@@ -29,12 +31,14 @@ buildPythonPackage rec {
   ];
 
   postPatch = ''
-    substituteInPlace pytest.ini \
+    substituteInPlace setup.cfg \
       --replace "filterwarnings = error" "" \
       --replace "--cov=aiosignal" ""
   '';
 
-  pythonImportsCheck = [ "aiosignal" ];
+  pythonImportsCheck = [
+    "aiosignal"
+  ];
 
   meta = with lib; {
     description = "Python list of registered asynchronous callbacks";

From 519da3c1633c446cfcc2d97c0382e64123e59bcb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Dec 2022 19:24:35 +0100
Subject: [PATCH 055/953] python310Packages.aiosignal: add changelog to meta

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

diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index 2cb61f4f9719..b7a3bc9d9dee 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -43,6 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python list of registered asynchronous callbacks";
     homepage = "https://github.com/aio-libs/aiosignal";
+    changelog = "https://github.com/aio-libs/aiosignal/blob/v${version}/CHANGES.rst";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 6be612f64b5c41623a6f5c4ac3aa4835fef79bfa Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 9 Dec 2022 23:32:03 +0100
Subject: [PATCH 056/953] fluidsynth: fix build on aarch64-darwin

---
 pkgs/applications/audio/fluidsynth/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 09abaa862f51..cbed4b36181e 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ]
     ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
 
-  cmakeFlags = [ "-Denable-framework=off" ];
+  cmakeFlags = [
+    "-Denable-framework=off"
+    # set CMAKE_INSTALL_NAME_DIR to correct value on darwin
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
 
   meta = with lib; {
     description = "Real-time software synthesizer based on the SoundFont 2 specifications";

From b6346180fcd1e40b1fb9e39077796bc91cc45915 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Fri, 9 Dec 2022 14:46:55 -0800
Subject: [PATCH 057/953] python310Packages.h2: fix tests on python 3.11

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

diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index 97ccb7b91206..c33a959d9e70 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
+, fetchpatch
 , hpack
 , hyperframe
 , pytestCheckHook
@@ -20,6 +21,15 @@ buildPythonPackage rec {
     sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs=";
   };
 
+  patches = [
+    # https://github.com/python-hyper/h2/pull/1274
+    (fetchpatch {
+      name = "fix-tests-in-python-3.11.patch";
+      url = "https://github.com/python-hyper/h2/commit/8952c91606cd014720ccf202a25b5ee1fbed1591.patch";
+      hash = "sha256-skAdAVHMZo1xJEqqKa6FOKPvoQQbGUgGsQjE11jIjtw=";
+    })
+  ];
+
   propagatedBuildInputs = [
     hpack
     hyperframe

From 515c893cdac14b28075e61b1135ffb61c6ca5a3b Mon Sep 17 00:00:00 2001
From: Damjan Georgievski <gdamjan@gmail.com>
Date: Sat, 10 Dec 2022 02:11:05 +0100
Subject: [PATCH 058/953] nghttp2: 1.49.0 -> 1.51.0

fixes `curl: (92) HTTP/2 stream 0 was not closed cleanly: PROTOCOL_ERROR (err 1)` when
`curl https://www.nginx.com/`

Changes:
* https://nghttp2.org/blog/2022/09/21/nghttp2-v1-50-0/
> This release adds nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation
> which disables checking leading and trailing white spaces against HTTP field value.

* https://nghttp2.org/blog/2022/11/13/nghttp2-v1-51-0/
---
 pkgs/development/libraries/nghttp2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 8e3264dcbc51..f118467b56cf 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -31,11 +31,11 @@ assert enableJemalloc -> enableApp;
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
-  version = "1.49.0";
+  version = "1.51.0";
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-LNTbfXX3FJQVMknL6UoJLaTG7NdCQPirGM9kTZ1l9u4=";
+    sha256 = "sha256-6z6m9bYMbT7b8GXgT0NOjtYpGlyxoHkZxBcwqx/MAOA=";
   };
 
   outputs = [ "bin" "out" "dev" "lib" ]

From fda61e9066f545fca1eb440d249131edac040c30 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 21:50:32 +0200
Subject: [PATCH 059/953] add docs for prependToVar and appendToVar

---
 doc/stdenv/stdenv.chapter.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index e3d874ef507e..78560a29a337 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -990,6 +990,32 @@ Convenience function for `makeWrapper` that replaces `<\executable\>` with a wra
 
 If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided.
 
+### `prependToVar` \<variableName\> \<elements...\> {#fun-prependToVar}
+
+Prepend elements to a variable.
+
+Example:
+
+```shellSession
+$ configureFlags="--disable-static"
+$ prependToVar configureFlags --disable-dependency-tracking --enable-foo
+$ echo $configureFlags
+--disable-dependency-tracking --enable-foo --disable-static
+```
+
+### `appendToVar` \<variableName\> \<elements...\> {#fun-appendToVar}
+
+Append elements to a variable.
+
+Example:
+
+```shellSession
+$ configureFlags="--disable-static"
+$ appendToVar configureFlags --disable-dependency-tracking --enable-foo
+$ echo $configureFlags
+--disable-static --disable-dependency-tracking --enable-foo
+```
+
 ## Package setup hooks {#ssec-setup-hooks}
 
 Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used.

From 68fb254bf22178bee1c3009348bc7206bac59fa6 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 9 Dec 2022 20:07:12 +0200
Subject: [PATCH 060/953] tests.stdenv: deduplicate

---
 pkgs/test/stdenv/default.nix | 107 +++++++++++------------------------
 1 file changed, 34 insertions(+), 73 deletions(-)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 01f0e0fe8b83..2af4bcdfb731 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -12,63 +12,12 @@ let
   bootStdenv = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
   pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; }; inherit (stdenv.hostPlatform) system; };
   bootStdenvStructuredAttrsByDefault = pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
-in
 
-{
-  test-env-attrset = bootStdenv.mkDerivation {
-    name = "test-env-attrset";
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-    dontPatch = true;
-    dontFixup = true;
-    env = {
-      string = "testing-string";
-    };
 
-    installPhase = ''
-      declare -p string
-      echo "env.string = $string"
-      [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
-      touch $out
-    '';
-  };
+  ccWrapperSubstitutionsTest = { name, stdenv', extraAttrs ? { } }:
 
-  test-structured-env-attrset = bootStdenv.mkDerivation {
-    name = "test-structured-env-attrset";
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-    dontPatch = true;
-    dontFixup = true;
-    __structuredAttrs = true;
-    env = {
-      string = "testing-string";
-    };
-
-    installPhase = ''
-      declare -p string
-      echo "env.string = $string"
-      [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
-      touch $out
-    '';
-  };
-
-  test-cc-wrapper-substitutions = bootStdenv.cc.overrideAttrs (previousAttrs: {
-    name = "test-cc-wrapper-substitutions";
-
-    postFixup = previousAttrs.postFixup + ''
-      declare -p wrapperName
-      echo "env.wrapperName = $wrapperName"
-      [[ $wrapperName == "CC_WRAPPER" ]] || (echo "wrapperName was not CC_WRAPPER" && false)
-      touch $out
-    '';
-  });
-
-  structuredAttrsByDefault = lib.recurseIntoAttrs {
-
-    test-cc-wrapper-substitutions = bootStdenvStructuredAttrsByDefault.cc.overrideAttrs (previousAttrs: {
-      name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";
+    stdenv'.cc.overrideAttrs (previousAttrs: ({
+      inherit name;
 
       postFixup = previousAttrs.postFixup + ''
         declare -p wrapperName
@@ -76,32 +25,44 @@ in
         [[ $wrapperName == "CC_WRAPPER" ]] || (echo "wrapperName was not CC_WRAPPER" && false)
         declare -p suffixSalt
         echo "env.suffixSalt = $suffixSalt"
-        [[ $suffixSalt == "${bootStdenvStructuredAttrsByDefault.cc.suffixSalt}" ]] || (echo "wrapperName was not ${bootStdenvStructuredAttrsByDefault.cc.suffixSalt}" && false)
+        [[ $suffixSalt == "${stdenv'.cc.suffixSalt}" ]] || (echo "wrapperName was not ${stdenv'.cc.suffixSalt}" && false)
 
         grep -q "@out@" $out/bin/cc || echo "@out@ in $out/bin/cc was substituted"
         grep -q "@suffixSalt@" $out/bin/cc && (echo "$out/bin/cc contains unsubstituted variables" && false)
 
         touch $out
       '';
-    });
+    } // extraAttrs));
 
-    test-structured-env-attrset = bootStdenvStructuredAttrsByDefault.mkDerivation {
-      name = "test-structured-env-attrset-structuredAttrsByDefault";
-      dontUnpack = true;
-      dontConfigure = true;
-      dontBuild = true;
-      dontPatch = true;
-      dontFixup = true;
-      env = {
-        string = "testing-string";
-      };
+  testEnvAttrset = { name, stdenv', extraAttrs ? { } }:
+    stdenv'.mkDerivation
+      ({
+        inherit name;
+        env = {
+          string = "testing-string";
+        };
 
-      installPhase = ''
-        declare -p string
-        echo "env.string = $string"
-        [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
-        touch $out
-      '';
-    };
+        passAsFile = [ "buildCommand" ];
+        buildCommand = ''
+          declare -p string
+          echo "env.string = $string"
+          [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
+          touch $out
+        '';
+      } // extraAttrs);
+
+in
+
+{
+  test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; };
+
+  test-structured-env-attrset = testEnvAttrset { name = "test-structured-env-attrset"; stdenv' = bootStdenv; extraAttrs = { __structuredAttrs = true; }; };
+
+  test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { name = "test-cc-wrapper-substitutions"; stdenv' = bootStdenv; };
+
+  structuredAttrsByDefault = lib.recurseIntoAttrs {
+    test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { name = "test-cc-wrapper-substitutions-structuredAttrsByDefault"; stdenv' = bootStdenvStructuredAttrsByDefault; };
+
+    test-structured-env-attrset = testEnvAttrset { name = "test-structured-env-attrset-structuredAttrsByDefault"; stdenv' = bootStdenvStructuredAttrsByDefault; };
   };
 }

From bf972f18736478dad213ce2c409239af36417787 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 9 Dec 2022 22:22:31 +0200
Subject: [PATCH 061/953] tests.stdenv: add tests for prependToVar and
 appendToVar

---
 pkgs/test/stdenv/default.nix | 94 +++++++++++++++++++++++++++++++++---
 1 file changed, 87 insertions(+), 7 deletions(-)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 2af4bcdfb731..c5af468655ff 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -22,10 +22,10 @@ let
       postFixup = previousAttrs.postFixup + ''
         declare -p wrapperName
         echo "env.wrapperName = $wrapperName"
-        [[ $wrapperName == "CC_WRAPPER" ]] || (echo "wrapperName was not CC_WRAPPER" && false)
+        [[ $wrapperName == "CC_WRAPPER" ]] || (echo "'\$wrapperName' was not 'CC_WRAPPER'" && false)
         declare -p suffixSalt
         echo "env.suffixSalt = $suffixSalt"
-        [[ $suffixSalt == "${stdenv'.cc.suffixSalt}" ]] || (echo "wrapperName was not ${stdenv'.cc.suffixSalt}" && false)
+        [[ $suffixSalt == "${stdenv'.cc.suffixSalt}" ]] || (echo "'\$suffxSalt' was not '${stdenv'.cc.suffixSalt}'" && false)
 
         grep -q "@out@" $out/bin/cc || echo "@out@ in $out/bin/cc was substituted"
         grep -q "@suffixSalt@" $out/bin/cc && (echo "$out/bin/cc contains unsubstituted variables" && false)
@@ -46,7 +46,35 @@ let
         buildCommand = ''
           declare -p string
           echo "env.string = $string"
-          [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
+          [[ $string == "testing-string" ]] || (echo "'\$string' was not 'testing-string'" && false)
+          touch $out
+        '';
+      } // extraAttrs);
+
+  testPrependAndAppendToVar = { name, stdenv', extraAttrs ? { } }:
+    stdenv'.mkDerivation
+      ({
+        inherit name;
+        env = {
+          string = "testing-string";
+        };
+
+        passAsFile = [ "buildCommand" ] ++ lib.optionals (extraAttrs ? extraTest) [ "extraTest" ];
+        # FIXME: with structuredAttrs string is converted to a indexed array
+        # should a/pToVar check if the passed variable is a array or a string?
+        # declare -x string="testing-string"
+        # declare -ax string=([0]="world" [1]="testing-string" [2]="hello")
+        buildCommand = ''
+          declare -p string
+          appendToVar string hello
+          # test that quoted strings work
+          prependToVar string "world"
+          declare -p string
+
+          [[ $string == "world testing-string hello" ]] || (echo "'\$string' was not 'world testing-string hello'" && false)
+
+          eval "$extraTest"
+
           touch $out
         '';
       } // extraAttrs);
@@ -56,13 +84,65 @@ in
 {
   test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; };
 
-  test-structured-env-attrset = testEnvAttrset { name = "test-structured-env-attrset"; stdenv' = bootStdenv; extraAttrs = { __structuredAttrs = true; }; };
+  test-prepend-append-to-var = testPrependAndAppendToVar {
+    name = "test-prepend-append-to-var";
+    stdenv' = bootStdenv;
+  };
 
-  test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { name = "test-cc-wrapper-substitutions"; stdenv' = bootStdenv; };
+  test-structured-env-attrset = testEnvAttrset {
+    name = "test-structured-env-attrset";
+    stdenv' = bootStdenv;
+    extraAttrs = { __structuredAttrs = true; };
+  };
+
+  test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest {
+    name = "test-cc-wrapper-substitutions";
+    stdenv' = bootStdenv;
+  };
 
   structuredAttrsByDefault = lib.recurseIntoAttrs {
-    test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { name = "test-cc-wrapper-substitutions-structuredAttrsByDefault"; stdenv' = bootStdenvStructuredAttrsByDefault; };
+    test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest {
+      name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";
+      stdenv' = bootStdenvStructuredAttrsByDefault;
+    };
 
-    test-structured-env-attrset = testEnvAttrset { name = "test-structured-env-attrset-structuredAttrsByDefault"; stdenv' = bootStdenvStructuredAttrsByDefault; };
+    test-structured-env-attrset = testEnvAttrset {
+      name = "test-structured-env-attrset-structuredAttrsByDefault";
+      stdenv' = bootStdenvStructuredAttrsByDefault;
+    };
+
+    test-prepend-append-to-var = testPrependAndAppendToVar {
+      name = "test-prepend-append-to-var-structuredAttrsByDefault";
+      stdenv' = bootStdenvStructuredAttrsByDefault;
+      extraAttrs = {
+        # will be a bash indexed array in attrs.sh
+        # declare -a list=('a' 'b' )
+        # and a json array in attrs.json
+        # "list":["a","b"]
+        list = [ "a" "b" ];
+        # will be a bash associative array(dictionary) in attrs.sh
+        # declare -A array=(['a']='1' ['b']='2' )
+        # and a json object in attrs.json
+        # {"array":{"a":"1","b":"2"}
+        array = { a = "1"; b = "2"; };
+        extraTest = ''
+          declare -p array
+          array+=(["c"]="3")
+          declare -p array
+
+          [[ "''${array[c]}" == "3" ]] || (echo "c element of '\$array' was not '3'" && false)
+
+          declare -p list
+          prependToVar list hello
+          # test that quoted strings work
+          appendToVar list "world"
+          declare -p list
+
+          [[ "''${list[0]}" == "hello" ]] || (echo "first element of '\$list' was not 'hello'" && false)
+          [[ "''${list[1]}" == "a" ]] || (echo "first element of '\$list' was not 'a'" && false)
+          [[ "''${list[-1]}" == "world" ]] || (echo "last element of '\$list' was not 'world'" && false)
+        '';
+      };
+    };
   };
 }

From 11c3127e38dafdf95ca71a85b1591a29b67e0c09 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 10 Dec 2022 01:09:40 +0200
Subject: [PATCH 062/953] stdenv: detect the type of variable in
 {prepend,append}ToVar

stdenv: error if using {prepend,append}ToVar on associative array

i don't know how to prepend to associative array
---
 pkgs/stdenv/generic/setup.sh | 50 ++++++++++++++++++++++++++++++++++--
 pkgs/test/stdenv/default.nix | 19 +++++++++++---
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 182f849cf525..5a64625e10d1 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -209,8 +209,31 @@ addToSearchPath() {
 # Expressions for individual packages should simply switch to array
 # syntax when they switch to setting __structuredAttrs = true.
 prependToVar() {
-    local -n nameref="$1"; shift
+    local -n nameref="$1"
+
+    useArray=
     if [ -n "$__structuredAttrs" ]; then
+        useArray=true
+    else
+        useArray=false
+    fi
+
+    # check if variable already exist and if it does then do extra checks
+    if declare -p "$1" 2> /dev/null | grep -q '^'; then
+        type="$(declare -p "$1")"
+        if [[ "$type" =~ "declare -A" ]]; then
+            echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." >&2
+            return 1
+        elif [[ "$type" =~ "declare -a" ]]; then
+            useArray=true
+        else
+            useArray=false
+        fi
+    fi
+
+    shift
+
+    if $useArray; then
         nameref=( "$@" ${nameref+"${nameref[@]}"} )
     else
         nameref="$* ${nameref-}"
@@ -219,8 +242,31 @@ prependToVar() {
 
 # Same as above
 appendToVar() {
-    local -n nameref="$1"; shift
+    local -n nameref="$1"
+
+    useArray=
     if [ -n "$__structuredAttrs" ]; then
+        useArray=true
+    else
+        useArray=false
+    fi
+
+    # check if variable already exist and if it does then do extra checks
+    if declare -p "$1" 2> /dev/null | grep -q '^'; then
+        type="$(declare -p "$1")"
+        if [[ "$type" =~ "declare -A" ]]; then
+            echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." >&2
+            return 1
+        elif [[ "$type" =~ "declare -a" ]]; then
+            useArray=true
+        else
+            useArray=false
+        fi
+    fi
+
+    shift
+
+    if $useArray; then
         nameref=( ${nameref+"${nameref[@]}"} "$@" )
     else
         nameref="${nameref-} $*"
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index c5af468655ff..08e8eed118f9 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -60,10 +60,6 @@ let
         };
 
         passAsFile = [ "buildCommand" ] ++ lib.optionals (extraAttrs ? extraTest) [ "extraTest" ];
-        # FIXME: with structuredAttrs string is converted to a indexed array
-        # should a/pToVar check if the passed variable is a array or a string?
-        # declare -x string="testing-string"
-        # declare -ax string=([0]="world" [1]="testing-string" [2]="hello")
         buildCommand = ''
           declare -p string
           appendToVar string hello
@@ -71,8 +67,23 @@ let
           prependToVar string "world"
           declare -p string
 
+          declare -A associativeArray=(["X"]="Y")
+          [[ $(appendToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "prependToVar did not catch prepending associativeArray" && false)
+          [[ $(prependToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "prependToVar did not catch prepending associativeArray" && false)
+
           [[ $string == "world testing-string hello" ]] || (echo "'\$string' was not 'world testing-string hello'" && false)
 
+          # test appending to a unset variable
+          appendToVar nonExistant created hello
+          typeset -p nonExistant
+          if [[ -n $__structuredAttrs ]]; then
+            [[ "''${nonExistant[@]}" == "created hello" ]]
+          else
+            # there's a extra " " in front here and a extra " " in the end of prependToVar
+            # shouldn't matter because these functions will mostly be used for $*Flags and the Flag variable will in most cases already exit
+            [[ "$nonExistant" == " created hello" ]]
+          fi
+
           eval "$extraTest"
 
           touch $out

From ba25f45c729cf7fed14b683f2cd6cea44e281646 Mon Sep 17 00:00:00 2001
From: Luiz Irber <contact+github@luizirber.org>
Date: Wed, 7 Dec 2022 21:31:08 -0800
Subject: [PATCH 063/953] maturin: 0.13.0 -> 0.14.5

---
 pkgs/development/tools/rust/maturin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index b276a618110f..384030c903d9 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "0.13.0";
+  version = "0.14.5";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-uKpYI+Oc49xgoIZCh72baBMZLcpMXk7g2Jb1DQxW9lk=";
+    hash = "sha256-3TEEmraQ9KGx29ok7IUdVzTW0ilaAci1dOZUlKvQYJE=";
   };
 
-  cargoHash = "sha256-levBWghFIXOXe+NGXvwBqQpPmWeUK53ruSyLik1urSU=";
+  cargoHash = "sha256-/biWBTNIysg6HDozyF8UdKoxlgkHl9tnyean8+333hI=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 662c9e2187c312cf3a3c94525bbd48f4d60f2463 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 20 Nov 2022 01:35:17 +0100
Subject: [PATCH 064/953] python310Packages.platformdirs: add changelog to meta

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

diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index e206c33d34ca..c140d1babc38 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
-    sha256 = "sha256-OAvhbgmwGhElszUPksXkOgB5Dp/Wcf4s8807CcT7eyM=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-OAvhbgmwGhElszUPksXkOgB5Dp/Wcf4s8807CcT7eyM=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -41,8 +41,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "Python module for determining appropriate platform-specific directories";
+    description = "Module for determining appropriate platform-specific directories";
     homepage = "https://platformdirs.readthedocs.io/";
+    changelog = "https://github.com/platformdirs/platformdirs/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From a3166adae7e45b9f5f96e30d6766ae2157637682 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Dec 2022 11:20:00 +0100
Subject: [PATCH 065/953] python310Packages.platformdirs: 2.5.3 -> 2.5.4

Diff: https://github.com/platformdirs/platformdirs/compare/refs/tags/2.5.3...2.5.4

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

diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index c140d1babc38..53939421de2f 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -2,16 +2,16 @@
 , appdirs
 , buildPythonPackage
 , fetchFromGitHub
+, hatch-vcs
+, hatchling
 , pytest-mock
 , pytestCheckHook
 , pythonOlder
-, hatchling
-, hatch-vcs
 }:
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "2.5.3";
+  version = "2.5.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-OAvhbgmwGhElszUPksXkOgB5Dp/Wcf4s8807CcT7eyM=";
+    hash = "sha256-H+pcIv9ABwQioe6U24JNo6OyqoQ367lmAm+SQMUM4Kk=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From e502357e1255403f403689dfa7627a3bb592dc55 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Dec 2022 11:20:26 +0100
Subject: [PATCH 066/953] python310Packages.platformdirs: 2.5.4 -> 2.6.0

Diff: https://github.com/platformdirs/platformdirs/compare/refs/tags/2.5.4...2.6.0

Changelog: https://github.com/platformdirs/platformdirs/releases/tag/2.6.0
---
 pkgs/development/python-modules/platformdirs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 53939421de2f..8c0bdb3cb43a 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "2.5.4";
+  version = "2.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-H+pcIv9ABwQioe6U24JNo6OyqoQ367lmAm+SQMUM4Kk=";
+    hash = "sha256-qh5pv+rAFRMMJHr4nhKQ9Ndyvjd2QuSlkIeVcrXPrQI=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From bef9c1c3b2e0357e28156a43702313cd3fc18b95 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Dec 2022 14:11:35 +0100
Subject: [PATCH 067/953] python310Packages.urllib3: add changelog to meta

---
 .../python-modules/urllib3/default.nix         | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index ec63f5f21ed9..772799eefa3a 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -64,15 +64,27 @@ buildPythonPackage rec {
   ];
 
   passthru.optional-dependencies = {
-    brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
+    brotli = if isPyPy then [
+      brotlicffi
+    ] else [
+      brotli
+    ];
     # Use carefully since pyopenssl is not supported aarch64-darwin
-    secure = [ certifi cryptography idna pyopenssl ];
-    socks = [ pysocks ];
+    secure = [
+      certifi
+      cryptography
+      idna
+      pyopenssl
+    ];
+    socks = [
+      pysocks
+    ];
   };
 
   meta = with lib; {
     description = "Powerful, sanity-friendly HTTP client for Python";
     homepage = "https://github.com/shazow/urllib3";
+    changelog = "https://github.com/urllib3/urllib3/blob/${version}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From c033f340de6b9ea78cc5fbc3c296b99b27354dd5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Dec 2022 14:12:01 +0100
Subject: [PATCH 068/953] python310Packages.urllib3: 1.26.12 -> 1.26.13

Changelog: https://github.com/urllib3/urllib3/blob/1.26.13/CHANGES.rst
---
 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 772799eefa3a..86083a4cc573 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.12";
+  version = "1.26.13";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-P6ls9CPmmHmX/DJq6N85bbKot8ZndH1H3djsupH0p04=";
+    hash = "sha256-wIPdDc5o2/vhEp1SccuQ+UR96n1SCXxuASYSDFId3qg=";
   };
 
   # FIXME: remove backwards compatbility hack

From 54705413479d6deb288bc3c95308163ddfbf5261 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 20:29:44 +0200
Subject: [PATCH 069/953] oniguruma,jq: add artturin as maintainer

---
 pkgs/development/libraries/oniguruma/default.nix | 2 +-
 pkgs/development/tools/jq/default.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index bc084829e7bb..cffa14fdc46b 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/kkos/oniguruma";
     description = "Regular expressions library";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ artturin ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 5671f5dbe641..dab6831cefd3 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     description = "A lightweight and flexible command-line JSON processor";
     homepage = "https://stedolan.github.io/jq/";
     license = licenses.mit;
-    maintainers = with maintainers; [ raskin globin ];
+    maintainers = with maintainers; [ raskin globin artturin ];
     platforms = platforms.unix;
     downloadPage = "https://stedolan.github.io/jq/download/";
   };

From aae20cf5c05f9478c1933471f2ac1e841376eb91 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 8 Dec 2022 20:46:54 +0200
Subject: [PATCH 070/953] jq,oniguruma: make suitable for inclusion in
 common-path.nix

---
 .../libraries/oniguruma/default.nix           | 16 ++++----
 pkgs/development/tools/jq/default.nix         | 18 +++------
 ...when-building-without-regex-supports.patch | 38 +++++++++++++++++++
 3 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch

diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index cffa14fdc46b..3062c3cb4e11 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,16 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  pname = "onig";
+  pname = "oniguruma";
   version = "6.9.8";
 
-  src = fetchFromGitHub {
-    owner = "kkos";
-    repo = "oniguruma";
-    rev = "v${version}";
-    sha256 = "sha256-8aFZdhh6ovLCR0A17rvWq/Oif66rSMnHcCYHjClNElw=";
+  # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages
+  src = fetchurl {
+    url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz";
+    sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4=";
   };
 
+  outputs = [ "dev" "lib" "out" ];
+  outputBin = "dev"; # onig-config
+
   nativeBuildInputs = [ autoreconfHook ];
   configureFlags = [ "--enable-posix-api=yes" ];
 
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index dab6831cefd3..6b41cc9862b9 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
-, fetchpatch
-, fetchFromGitHub
+, fetchurl
 , autoreconfHook
 , onigurumaSupport ? true
 , oniguruma
@@ -11,19 +10,14 @@ stdenv.mkDerivation rec {
   pname = "jq";
   version = "1.6";
 
-  src = fetchFromGitHub {
-    owner = "stedolan";
-    repo = "jq";
-    rev = "${pname}-${version}";
-    hash = "sha256-CIE8vumQPGK+TFAncmpBijANpFALLTadOvkob0gVzro";
+  # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages
+  src = fetchurl {
+    url = "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz";
+    sha256 = "sha256-XejI4pqqP7nMa0e7JymfJxNU67clFOOsytx9OLW7qnI=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "fix-tests-when-building-without-regex-supports.patch";
-      url = "https://github.com/stedolan/jq/pull/2292/commits/f6a69a6e52b68a92b816a28eb20719a3d0cb51ae.patch";
-      sha256 = "pTM5FZ6hFs5Rdx+W2dICSS2lcoLY1Q//Lan3Hu8Gr58=";
-    })
+    ./fix-tests-when-building-without-regex-supports.patch
   ];
 
   outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
diff --git a/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch b/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch
new file mode 100644
index 000000000000..ac7614ed80b2
--- /dev/null
+++ b/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch
@@ -0,0 +1,38 @@
+From f6a69a6e52b68a92b816a28eb20719a3d0cb51ae Mon Sep 17 00:00:00 2001
+From: Dmitry Bogatov <git#v1@kaction.cc>
+Date: Sat, 27 Mar 2021 00:00:00 +0000
+Subject: [PATCH] Disable some tests when building without regex support
+
+---
+ Makefile.am  | 5 ++++-
+ configure.ac | 1 +
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f5c1db594..f3f44bb9e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -130,7 +130,10 @@ endif
+ 
+ ### Tests (make check)
+ 
+-TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test
++TESTS = tests/optionaltest tests/jqtest tests/shtest tests/utf8test tests/base64test
++if WITH_ONIGURUMA
++TESTS += tests/mantest tests/onigtest
++endif
+ TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND)
+ 
+ # This is a magic make variable that causes it to treat tests/man.test as a
+diff --git a/configure.ac b/configure.ac
+index 0441d4a2c..987d94e0a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,6 +278,7 @@ AC_SUBST(onig_CFLAGS)
+ AC_SUBST(onig_LDFLAGS)
+ 
+ AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
++AM_CONDITIONAL([WITH_ONIGURUMA], [test "x$with_oniguruma" = xyes])
+ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ 
+ AC_CONFIG_MACRO_DIR([config/m4])

From 84a7cadfd2d419b00148b5b826568c5ba59b93d5 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 11 Dec 2022 12:57:16 +0200
Subject: [PATCH 071/953] tests.stdenv: add test-golden-example-structuredAttrs

examples copied from https://nixos.mayflower.consulting/blog/2020/01/20/structured-attrs/

nix has tests for structuredAttrs but i figured it'd be good to have a
golden test here too

https://github.com/NixOS/nix/blob/master/tests/structured-attrs.nix
https://github.com/NixOS/nix/blob/master/tests/structured-attrs-shell.nix
---
 pkgs/test/stdenv/default.nix | 71 ++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 08e8eed118f9..0a29f91ce049 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -8,6 +8,8 @@
 }:
 
 let
+  # early enough not to rebuild gcc but late enough to have patchelf
+  earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages;
   # use a early stdenv so when hacking on stdenv this test can be run quickly
   bootStdenv = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
   pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; }; inherit (stdenv.hostPlatform) system; };
@@ -155,5 +157,74 @@ in
         '';
       };
     };
+
+    test-golden-example-structuredAttrs =
+      let
+        goldenSh = earlyPkgs.writeText "goldenSh" ''
+          declare -A EXAMPLE_ATTRS=(['foo']='bar' )
+          declare EXAMPLE_BOOL_FALSE=
+          declare EXAMPLE_BOOL_TRUE=1
+          declare EXAMPLE_INT=123
+          declare EXAMPLE_INT_NEG=-123
+          declare -a EXAMPLE_LIST=('foo' 'bar' )
+          declare EXAMPLE_STR='foo bar'
+        '';
+        goldenJson = earlyPkgs.writeText "goldenSh" ''
+          {
+            "EXAMPLE_ATTRS": {
+              "foo": "bar"
+            },
+            "EXAMPLE_BOOL_FALSE": false,
+            "EXAMPLE_BOOL_TRUE": true,
+            "EXAMPLE_INT": 123,
+            "EXAMPLE_INT_NEG": -123,
+            "EXAMPLE_LIST": [
+              "foo",
+              "bar"
+            ],
+            "EXAMPLE_NESTED_ATTRS": {
+              "foo": {
+                "bar": "baz"
+              }
+            },
+            "EXAMPLE_NESTED_LIST": [
+              [
+                "foo",
+                "bar"
+              ],
+              [
+                "baz"
+              ]
+            ],
+            "EXAMPLE_STR": "foo bar"
+          }
+        '';
+      in
+      bootStdenvStructuredAttrsByDefault.mkDerivation {
+        name = "test-golden-example-structuredAttrsByDefault";
+        nativeBuildInputs = [ earlyPkgs.jq ];
+
+        EXAMPLE_BOOL_TRUE = true;
+        EXAMPLE_BOOL_FALSE = false;
+        EXAMPLE_INT = 123;
+        EXAMPLE_INT_NEG = -123;
+        EXAMPLE_STR = "foo bar";
+        EXAMPLE_LIST = [ "foo" "bar" ];
+        EXAMPLE_NESTED_LIST = [ [ "foo" "bar" ] [ "baz" ] ];
+        EXAMPLE_ATTRS = { foo = "bar"; };
+        EXAMPLE_NESTED_ATTRS = { foo.bar = "baz"; };
+
+        inherit goldenSh;
+        inherit goldenJson;
+
+        buildCommand = ''
+          mkdir -p $out
+          cat $NIX_ATTRS_SH_FILE | grep "EXAMPLE" | grep -v -E 'installPhase|jq' > $out/sh
+          jq 'with_entries(select(.key|match("EXAMPLE")))' $NIX_ATTRS_JSON_FILE > $out/json
+          diff $out/sh $goldenSh
+          diff $out/json $goldenJson
+        '';
+      };
+
   };
 }

From 9cb5662187377146daf2b2abd54f4bce9ab59343 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 11 Dec 2022 13:31:50 +0200
Subject: [PATCH 072/953] tests: move stdenv hook tests to stdenv.hooks

---
 pkgs/test/hooks/default.nix  | 24 ++----------------------
 pkgs/test/stdenv/default.nix |  6 ++++++
 pkgs/test/stdenv/hooks.nix   | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/test/stdenv/hooks.nix

diff --git a/pkgs/test/hooks/default.nix b/pkgs/test/hooks/default.nix
index fe3a9b2a2167..aabf939b6865 100644
--- a/pkgs/test/hooks/default.nix
+++ b/pkgs/test/hooks/default.nix
@@ -1,28 +1,8 @@
 # To run these tests:
 # nix-build -A tests.hooks
 
-{ stdenv, pkgs, lib }:
+{ stdenv, tests, lib }:
 
 {
-  # this attrset is for hooks in `stdenv.defaultNativeBuildInputs`
-  default-stdenv-hooks = lib.recurseIntoAttrs {
-    make-symlinks-relative = stdenv.mkDerivation {
-      name = "test-make-symlinks-relative";
-      passAsFile = [ "buildCommand" ];
-      buildCommand = ''
-        mkdir -p $out/{bar,baz}
-        source1="$out/bar/foo"
-        destination1="$out/baz/foo"
-        echo foo > $source1
-        ln -s $source1 $destination1
-        echo "symlink before patching: $(readlink $destination1)"
-
-        _makeSymlinksRelative
-
-        echo "symlink after patching: $(readlink $destination1)"
-        ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
-        ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
-      '';
-    };
-  };
+  default-stdenv-hooks = lib.recurseIntoAttrs tests.stdenv.hooks;
 }
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 0a29f91ce049..c9653b324eb9 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -95,6 +95,9 @@ let
 in
 
 {
+  # tests for hooks in `stdenv.defaultNativeBuildInputs`
+  hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; });
+
   test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; };
 
   test-prepend-append-to-var = testPrependAndAppendToVar {
@@ -114,6 +117,9 @@ in
   };
 
   structuredAttrsByDefault = lib.recurseIntoAttrs {
+
+    hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; });
+
     test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest {
       name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";
       stdenv' = bootStdenvStructuredAttrsByDefault;
diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix
new file mode 100644
index 000000000000..f63ca054e083
--- /dev/null
+++ b/pkgs/test/stdenv/hooks.nix
@@ -0,0 +1,35 @@
+{ stdenv }:
+
+# ordering should match defaultNativeBuildInputs
+
+{
+  move-docs = stdenv.mkDerivation {
+    name = "test-move-docs";
+    buildCommand = ''
+      mkdir -p $out/{man,doc,info}
+      touch $out/{man,doc,info}/foo
+      cat $out/{man,doc,info}/foo
+
+      _moveToShare
+
+      (cat $out/share/{man,doc,info}/foo 2>/dev/null && echo "man,doc,info were moved") || (echo "man,doc,info were not moved" && exit 1)
+    '';
+  };
+  make-symlinks-relative = stdenv.mkDerivation {
+    name = "test-make-symlinks-relative";
+    buildCommand = ''
+      mkdir -p $out/{bar,baz}
+      source1="$out/bar/foo"
+      destination1="$out/baz/foo"
+      echo foo > $source1
+      ln -s $source1 $destination1
+      echo "symlink before patching: $(readlink $destination1)"
+
+      _makeSymlinksRelative
+
+      echo "symlink after patching: $(readlink $destination1)"
+      ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
+      ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
+    '';
+  };
+}

From daab80e08d43830c17b693f1b09eef1e2b59994c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 11 Dec 2022 14:13:38 +0200
Subject: [PATCH 073/953] move-docs.sh: update comment

_multioutDocs is in multiple-outputs.sh
---
 pkgs/build-support/setup-hooks/move-docs.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index 833113aa0fc8..3f961155d201 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -1,6 +1,4 @@
-# This setup hook moves $out/{man,doc,info} to $out/share; moves
-# $out/share/man to $man/share/man; and moves $out/share/doc to
-# $man/share/doc.
+# This setup hook moves $out/{man,doc,info} to $out/share.
 
 preFixupHooks+=(_moveToShare)
 

From 60b1f09aa4e5e0a5c7fe95e72c323ba1a2471e08 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 11 Dec 2022 14:44:10 +0200
Subject: [PATCH 074/953] tests.stdenv.hooks: add more tests

---
 pkgs/test/stdenv/default.nix |  4 +-
 pkgs/test/stdenv/hooks.nix   | 97 +++++++++++++++++++++++++++++++++++-
 2 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index c9653b324eb9..b27fc25356a5 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -96,7 +96,7 @@ in
 
 {
   # tests for hooks in `stdenv.defaultNativeBuildInputs`
-  hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; });
+  hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; });
 
   test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; };
 
@@ -118,7 +118,7 @@ in
 
   structuredAttrsByDefault = lib.recurseIntoAttrs {
 
-    hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; });
+    hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; });
 
     test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest {
       name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";
diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix
index f63ca054e083..de6b294fc847 100644
--- a/pkgs/test/stdenv/hooks.nix
+++ b/pkgs/test/stdenv/hooks.nix
@@ -1,4 +1,4 @@
-{ stdenv }:
+{ stdenv, pkgs }:
 
 # ordering should match defaultNativeBuildInputs
 
@@ -32,4 +32,99 @@
       ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
     '';
   };
+  compress-man-pages =
+    let
+      manFile = pkgs.writeText "small-man" ''
+        .TH HELLO "1" "May 2022" "hello 2.12.1" "User Commands"
+        .SH NAME
+        hello - friendly greeting program
+      '';
+    in
+    stdenv.mkDerivation {
+      name = "test-compress-man-pages";
+      buildCommand = ''
+        mkdir -p $out/share/man
+        cp ${manFile} $out/share/man/small-man.1
+        compressManPages $out
+        [[ -e $out/share/man/small-man.1.gz ]]
+      '';
+    };
+
+  # TODO: add strip
+  # TODO: move patch-shebangs test from pkgs/test/patch-shebangs/default.nix to here
+  prune-libtool-files =
+    let
+      libFoo = pkgs.writeText "libFoo" ''
+        # Generated by libtool (GNU libtool) 2.4.6
+        old_library='''
+        dependency_libs=' -Lbar.la -Lbaz.la'
+      '';
+    in
+    stdenv.mkDerivation {
+      name = "test-prune-libtool-files";
+      buildCommand = ''
+        mkdir -p $out/lib
+        cp ${libFoo} $out/lib/libFoo.la
+        _pruneLibtoolFiles
+        grep "^dependency_libs=''' #pruned" $out/lib/libFoo.la
+        # confirm file doesn't only contain the above
+        grep "^old_library='''" $out/lib/libFoo.la
+      '';
+    };
+  # TODO: add audit-tmpdir
+  # TODO: add multiple-outputs
+  move-sbin = stdenv.mkDerivation {
+    name = "test-move-sbin";
+    buildCommand = ''
+      mkdir -p $out/sbin
+      touch $out/sbin/foo
+      cat $out/sbin/foo
+
+      _moveSbin
+
+      # check symlink
+      [[ -h $out/sbin ]]
+      ([[ -e $out/sbin ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
+      [[ -e $out/bin/foo ]]
+    '';
+  };
+
+  move-lib64 = stdenv.mkDerivation {
+    name = "test-move-lib64";
+    buildCommand = ''
+      mkdir -p $out/lib64
+      touch $out/lib64/foo
+      cat $out/lib64/foo
+
+      _moveLib64
+
+      # check symlink
+      [[ -h $out/lib64 ]]
+      ([[ -e $out/lib64 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
+      [[ -e $out/lib/foo ]]
+    '';
+  };
+
+  set-source-date-epoch-to-latest = stdenv.mkDerivation {
+    name = "test-set-source-date-epoch-to-latest";
+    buildCommand = ''
+      sourceRoot=$NIX_BUILD_TOP/source
+      mkdir -p $sourceRoot
+      touch --date=1/1/2015 $sourceRoot/foo
+
+      _updateSourceDateEpochFromSourceRoot
+
+      [[ $SOURCE_DATE_EPOCH == "1420070400" ]]
+      touch $out
+    '';
+  };
+
+  reproducible-builds = stdenv.mkDerivation {
+    name = "test-reproducible-builds";
+    buildCommand = ''
+      # can't be tested more precisely because the value of random-seed changes depending on the output
+      [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
+      touch $out
+    '';
+  };
 }

From 04701ab5f5c0e7320361c97061f1014027cd6582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 12 Dec 2022 22:10:43 +0100
Subject: [PATCH 075/953] python310Packages.h2: disable timing sensitive test

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

diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index 97ccb7b91206..cb03a837194e 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -30,6 +30,11 @@ buildPythonPackage rec {
     hypothesis
   ];
 
+  disabledTests = [
+    # timing sensitive
+    "test_changing_max_frame_size"
+  ];
+
   pythonImportsCheck = [
     "h2.connection"
     "h2.config"

From af70ba03d30779f965bd2c776e2dced6a82c9430 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 13 Dec 2022 00:24:33 +0200
Subject: [PATCH 076/953] build-support/setup-hooks: change shebang to
 shellcheck directive

---
 pkgs/build-support/setup-hooks/auto-patchelf.sh            | 2 +-
 pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 +-
 pkgs/build-support/setup-hooks/move-systemd-user-units.sh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 8a74a69bdceb..55467b9ec7b8 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 declare -a autoPatchelfLibs
 declare -a extraAutoPatchelfLibs
diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
index 74c8f6d0b333..83ea7de3ee21 100644
--- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
+++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 fixupOutputHooks+=('convertDesktopFiles $prefix')
 
 # Get a param out of a desktop file. First parameter is the file and the second
diff --git a/pkgs/build-support/setup-hooks/move-systemd-user-units.sh b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh
index 5963d87c7515..33e89898262f 100755
--- a/pkgs/build-support/setup-hooks/move-systemd-user-units.sh
+++ b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 # This setup hook, for each output, moves everything in
 # $output/lib/systemd/user to $output/share/systemd/user, and replaces

From 7866db71cc4e6c31b3ba1b6dae3bb9394128ad74 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 13 Dec 2022 00:34:48 +0200
Subject: [PATCH 077/953] stdenv/generic: fix todo

---
 pkgs/stdenv/generic/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 81255726284b..a2f052113ae6 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -76,9 +76,7 @@ let
       ../../build-support/setup-hooks/move-lib64.sh
       ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh
       ../../build-support/setup-hooks/reproducible-builds.sh
-      # TODO use lib.optional instead
-      (if hasCC then cc else null)
-    ];
+    ] ++ lib.optionals hasCC [ cc ];
 
   defaultBuildInputs = extraBuildInputs;
 

From 3b3ef7b7666e8881478582443847322b6c2354c1 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 13 Dec 2022 00:57:35 +0200
Subject: [PATCH 078/953] audit-tmpdir.sh: fix on darwin

compress-man-pages.sh uses `find ... | while ...; do...` so this works
on darwin

vcunat says the following in https://github.com/NixOS/nixpkgs/commit/94d164dd7#r22030369

> Unfortunately, process substitution doesn't work during early darwin bootstrap. http://hydra.nixos.org/build/52433342 We've run into that before.
> I think it should work to have `find ... | while ...; do...`
---
 pkgs/build-support/setup-hooks/audit-tmpdir.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
index c9dd32d1dd22..9c03bc2ee935 100644
--- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh
+++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
@@ -16,7 +16,7 @@ auditTmpdir() {
     header "checking for references to $TMPDIR/ in $dir..."
 
     local i
-    while IFS= read -r -d $'\0' i; do
+    find "$dir" -type f -print0 | while IFS= read -r -d $'\0' i; do
         if [[ "$i" =~ .build-id ]]; then continue; fi
 
         if isELF "$i"; then
@@ -35,7 +35,7 @@ auditTmpdir() {
             fi
         fi
 
-    done < <(find "$dir" -type f -print0)
+    done
 
     stopNest
 }

From b3717f6c143be42b3abb8f18302901df5372fbe9 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 13 Dec 2022 01:04:29 +0200
Subject: [PATCH 079/953] stdenv: remove now unneeded linux conditional

---
 pkgs/stdenv/generic/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index a2f052113ae6..efbfc95ff1c5 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -63,14 +63,8 @@ let
       ../../build-support/setup-hooks/strip.sh
       ../../build-support/setup-hooks/patch-shebangs.sh
       ../../build-support/setup-hooks/prune-libtool-files.sh
-    ]
-      # FIXME this on Darwin; see
-      # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369
-    ++ lib.optionals hostPlatform.isLinux [
       ../../build-support/setup-hooks/audit-tmpdir.sh
       ../../build-support/setup-hooks/move-systemd-user-units.sh
-    ]
-    ++ [
       ../../build-support/setup-hooks/multiple-outputs.sh
       ../../build-support/setup-hooks/move-sbin.sh
       ../../build-support/setup-hooks/move-lib64.sh

From 29c4626da89036f157ea7784fdcc38b5f79929d8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 12 Dec 2022 22:09:40 +0000
Subject: [PATCH 080/953] linuxHeaders: 6.0 -> 6.1

---
 pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index d8bfb59bf12a..34fbde9d676a 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -114,12 +114,12 @@ let
 in {
   inherit makeLinuxHeaders;
 
-  linuxHeaders = let version = "6.0"; in
+  linuxHeaders = let version = "6.1"; in
     makeLinuxHeaders {
       inherit version;
       src = fetchurl {
         url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
-        sha256 = "sha256-XCRDpVON5SaI77VcJ6sFOcH161jAz9FqK5+7CP2BeI4=";
+        sha256 = "sha256-LKHxcFGkMPb+0RluSVJxdQcXGs/ZfZZXchJQJwOyXes=";
       };
       patches = [
          ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms

From 630bb71ac5216135f4f576f03be465ccdc16d46a Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 13 Dec 2022 01:10:52 +0200
Subject: [PATCH 081/953] stdenv: sort defaultNativeBuildInputs alphabetically

---
 pkgs/stdenv/generic/default.nix |  19 ++---
 pkgs/test/stdenv/hooks.nix      | 136 ++++++++++++++++----------------
 2 files changed, 76 insertions(+), 79 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index efbfc95ff1c5..cf194be92bd7 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -57,19 +57,20 @@ argsStdenv@{ name ? "stdenv", preHook ? "", initialPath
 
 let
   defaultNativeBuildInputs = extraNativeBuildInputs ++
-    [ ../../build-support/setup-hooks/move-docs.sh
-      ../../build-support/setup-hooks/make-symlinks-relative.sh
-      ../../build-support/setup-hooks/compress-man-pages.sh
-      ../../build-support/setup-hooks/strip.sh
-      ../../build-support/setup-hooks/patch-shebangs.sh
-      ../../build-support/setup-hooks/prune-libtool-files.sh
+    [
       ../../build-support/setup-hooks/audit-tmpdir.sh
+      ../../build-support/setup-hooks/compress-man-pages.sh
+      ../../build-support/setup-hooks/make-symlinks-relative.sh
+      ../../build-support/setup-hooks/move-docs.sh
+      ../../build-support/setup-hooks/move-lib64.sh
+      ../../build-support/setup-hooks/move-sbin.sh
       ../../build-support/setup-hooks/move-systemd-user-units.sh
       ../../build-support/setup-hooks/multiple-outputs.sh
-      ../../build-support/setup-hooks/move-sbin.sh
-      ../../build-support/setup-hooks/move-lib64.sh
-      ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+      ../../build-support/setup-hooks/patch-shebangs.sh
+      ../../build-support/setup-hooks/prune-libtool-files.sh
       ../../build-support/setup-hooks/reproducible-builds.sh
+      ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+      ../../build-support/setup-hooks/strip.sh
     ] ++ lib.optionals hasCC [ cc ];
 
   defaultBuildInputs = extraBuildInputs;
diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix
index de6b294fc847..7f25d7dbd2db 100644
--- a/pkgs/test/stdenv/hooks.nix
+++ b/pkgs/test/stdenv/hooks.nix
@@ -3,35 +3,7 @@
 # ordering should match defaultNativeBuildInputs
 
 {
-  move-docs = stdenv.mkDerivation {
-    name = "test-move-docs";
-    buildCommand = ''
-      mkdir -p $out/{man,doc,info}
-      touch $out/{man,doc,info}/foo
-      cat $out/{man,doc,info}/foo
-
-      _moveToShare
-
-      (cat $out/share/{man,doc,info}/foo 2>/dev/null && echo "man,doc,info were moved") || (echo "man,doc,info were not moved" && exit 1)
-    '';
-  };
-  make-symlinks-relative = stdenv.mkDerivation {
-    name = "test-make-symlinks-relative";
-    buildCommand = ''
-      mkdir -p $out/{bar,baz}
-      source1="$out/bar/foo"
-      destination1="$out/baz/foo"
-      echo foo > $source1
-      ln -s $source1 $destination1
-      echo "symlink before patching: $(readlink $destination1)"
-
-      _makeSymlinksRelative
-
-      echo "symlink after patching: $(readlink $destination1)"
-      ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
-      ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
-    '';
-  };
+  # TODO: add audit-tmpdir
   compress-man-pages =
     let
       manFile = pkgs.writeText "small-man" ''
@@ -49,8 +21,66 @@
         [[ -e $out/share/man/small-man.1.gz ]]
       '';
     };
+  make-symlinks-relative = stdenv.mkDerivation {
+    name = "test-make-symlinks-relative";
+    buildCommand = ''
+      mkdir -p $out/{bar,baz}
+      source1="$out/bar/foo"
+      destination1="$out/baz/foo"
+      echo foo > $source1
+      ln -s $source1 $destination1
+      echo "symlink before patching: $(readlink $destination1)"
 
-  # TODO: add strip
+      _makeSymlinksRelative
+
+      echo "symlink after patching: $(readlink $destination1)"
+      ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
+      ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
+    '';
+  };
+  move-docs = stdenv.mkDerivation {
+    name = "test-move-docs";
+    buildCommand = ''
+      mkdir -p $out/{man,doc,info}
+      touch $out/{man,doc,info}/foo
+      cat $out/{man,doc,info}/foo
+
+      _moveToShare
+
+      (cat $out/share/{man,doc,info}/foo 2>/dev/null && echo "man,doc,info were moved") || (echo "man,doc,info were not moved" && exit 1)
+    '';
+  };
+  move-lib64 = stdenv.mkDerivation {
+    name = "test-move-lib64";
+    buildCommand = ''
+      mkdir -p $out/lib64
+      touch $out/lib64/foo
+      cat $out/lib64/foo
+
+      _moveLib64
+
+      # check symlink
+      [[ -h $out/lib64 ]]
+      ([[ -e $out/lib64 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
+      [[ -e $out/lib/foo ]]
+    '';
+  };
+  move-sbin = stdenv.mkDerivation {
+    name = "test-move-sbin";
+    buildCommand = ''
+      mkdir -p $out/sbin
+      touch $out/sbin/foo
+      cat $out/sbin/foo
+
+      _moveSbin
+
+      # check symlink
+      [[ -h $out/sbin ]]
+      ([[ -e $out/sbin ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
+      [[ -e $out/bin/foo ]]
+    '';
+  };
+  # TODO: add multiple-outputs
   # TODO: move patch-shebangs test from pkgs/test/patch-shebangs/default.nix to here
   prune-libtool-files =
     let
@@ -71,40 +101,14 @@
         grep "^old_library='''" $out/lib/libFoo.la
       '';
     };
-  # TODO: add audit-tmpdir
-  # TODO: add multiple-outputs
-  move-sbin = stdenv.mkDerivation {
-    name = "test-move-sbin";
+  reproducible-builds = stdenv.mkDerivation {
+    name = "test-reproducible-builds";
     buildCommand = ''
-      mkdir -p $out/sbin
-      touch $out/sbin/foo
-      cat $out/sbin/foo
-
-      _moveSbin
-
-      # check symlink
-      [[ -h $out/sbin ]]
-      ([[ -e $out/sbin ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
-      [[ -e $out/bin/foo ]]
+      # can't be tested more precisely because the value of random-seed changes depending on the output
+      [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
+      touch $out
     '';
   };
-
-  move-lib64 = stdenv.mkDerivation {
-    name = "test-move-lib64";
-    buildCommand = ''
-      mkdir -p $out/lib64
-      touch $out/lib64/foo
-      cat $out/lib64/foo
-
-      _moveLib64
-
-      # check symlink
-      [[ -h $out/lib64 ]]
-      ([[ -e $out/lib64 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
-      [[ -e $out/lib/foo ]]
-    '';
-  };
-
   set-source-date-epoch-to-latest = stdenv.mkDerivation {
     name = "test-set-source-date-epoch-to-latest";
     buildCommand = ''
@@ -118,13 +122,5 @@
       touch $out
     '';
   };
-
-  reproducible-builds = stdenv.mkDerivation {
-    name = "test-reproducible-builds";
-    buildCommand = ''
-      # can't be tested more precisely because the value of random-seed changes depending on the output
-      [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
-      touch $out
-    '';
-  };
+  # TODO: add strip
 }

From 64b335ce75a0115920adb033d7d2d90288fc2294 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 8 Dec 2022 18:53:39 +0000
Subject: [PATCH 082/953] openjdk8: 322-ga -> 352-ga

---
 pkgs/development/compilers/openjdk/8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 5558a77ad90b..c65a9fcc66b6 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -20,7 +20,7 @@ let
     powerpc64le-linux = "ppc64le";
   }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}");
 
-  update = "322";
+  update = "352";
   build = "ga";
 
   openjdk8 = stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ let
       owner = "openjdk";
       repo = "jdk8u";
       rev = "jdk${version}";
-      sha256 = "sha256-e39Yv+NDQG7z6fGmpKEnkKd5MoHZ50SXlq/Q7lzWcDA=";
+      sha256 = "sha256-xDiiALDjStD9IPhbBr997rm/v2Q/WdS10cILBCmdJIQ=";
     };
     outputs = [ "out" "jre" ];
 

From 951304c4598f293b1028c76f2d30d66d1a595246 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 8 Dec 2022 18:53:53 +0000
Subject: [PATCH 083/953] openjdk11: 11.0.15+10 -> 11.0.17+8

---
 pkgs/development/compilers/openjdk/11.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 850902cfd804..72b25bff777b 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -11,8 +11,8 @@
 let
   major = "11";
   minor = "0";
-  update = "15";
-  build = "10";
+  update = "17";
+  build = "8";
 
   openjdk = stdenv.mkDerivation rec {
     pname = "openjdk" + lib.optionalString headless "-headless";
@@ -22,7 +22,7 @@ let
       owner = "openjdk";
       repo = "jdk${major}u";
       rev = "jdk-${version}";
-      sha256 = "le2JDxPJPSuga4JxLJNRZwCaodptSb2kh4TsJXumTXs=";
+      sha256 = "sha256-kvgLYqQZPqyuigVyzbDHc3TMff0clvzM8IdzYLYcxPU=";
     };
 
     nativeBuildInputs = [ pkg-config autoconf unzip ];

From 9e5e9c57bb8958004134806eef8e31aed9375ea6 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 8 Dec 2022 19:35:02 +0000
Subject: [PATCH 084/953] openjfx11: 11.0.11+1 -> 11.0.17+1

---
 .../compilers/openjdk/openjfx/11.nix          | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 1bbb4e42dbc5..164677c3b8dc 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -1,13 +1,13 @@
-{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake
-, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby
+{ stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake
+, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68
 , openjdk11-bootstrap }:
 
 let
   major = "11";
-  update = ".0.11";
+  update = ".0.17";
   build = "1";
   repover = "${major}${update}+${build}";
-  gradle_ = (gradle_4.override {
+  gradle_ = (gradle_7.override {
     java = openjdk11-bootstrap;
   });
 
@@ -24,12 +24,14 @@ let
   makePackage = args: stdenv.mkDerivation ({
     version = "${major}${update}-${build}";
 
-    src = fetchurl {
-      url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz";
-      sha256 = "sha256-mbEALUxuwbtlGeZ2Xsm3m3aNDdthLYWd6QHmdkAILxc=";
+    src = fetchFromGitHub {
+      owner = "openjdk";
+      repo = "jfx${major}u";
+      rev = repover;
+      sha256 = "sha256-uKb6k+tIFdwy1BYiHWeGmKNz82X4CZjFlGYqLDpSFY0=";
     };
 
-    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];
+    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ];
     nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
 
     dontUseCmakeConfigure = true;
@@ -44,8 +46,6 @@ let
       JDK_HOME = ${openjdk11-bootstrap.home}
     '' + args.gradleProperties or "");
 
-    inherit NIX_CFLAGS_COMPILE;
-
     buildPhase = ''
       runHook preBuild
 
@@ -74,10 +74,7 @@ let
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    # Downloaded AWT jars differ by platform.
-    outputHash = {
-      x86_64-linux = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa8=";
-    }.${stdenv.system} or (throw "Unsupported platform");
+    outputHash = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa9=";
   };
 
 in makePackage {
@@ -85,7 +82,7 @@ in makePackage {
 
   gradleProperties = ''
     COMPILE_MEDIA = true
-    COMPILE_WEBKIT = true
+    COMPILE_WEBKIT = false
   '';
 
   preBuild = ''
@@ -99,8 +96,6 @@ in makePackage {
     cp -r build/modular-sdk $out
   '';
 
-  inherit NIX_CFLAGS_COMPILE;
-
   stripDebugList = [ "." ];
 
   postFixup = ''

From e1451322584ed86b40165a96ed2c14f6b0342491 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 8 Dec 2022 19:39:53 +0000
Subject: [PATCH 085/953] openjfx15: mark it as EOL

---
 pkgs/development/compilers/openjdk/openjfx/15.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
index d2903c685a90..8c041988296f 100644
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -120,6 +120,9 @@ in makePackage {
     license = licenses.gpl2;
     description = "The next-generation Java client toolkit";
     maintainers = with maintainers; [ abbradar ];
+    knownVulnerabilities = [
+      "This OpenJFX version has reached its end of life."
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }

From f2cd590cfbeea458910dfc238aa9b28dca538b84 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 8 Dec 2022 19:47:22 +0000
Subject: [PATCH 086/953] openjfx17: 17.0.0.1+1 -> 17.0.5+1

---
 pkgs/development/compilers/openjdk/openjfx/17.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix
index 1c1fb89ce8e1..8d4d47df32e7 100644
--- a/pkgs/development/compilers/openjdk/openjfx/17.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/17.nix
@@ -4,7 +4,7 @@
 
 let
   major = "17";
-  update = ".0.0.1";
+  update = ".0.5";
   build = "+1";
   repover = "${major}${update}${build}";
   gradle_ = (gradle_7.override {
@@ -16,9 +16,9 @@ let
 
     src = fetchFromGitHub {
       owner = "openjdk";
-      repo = "jfx";
+      repo = "jfx${major}u";
       rev = repover;
-      sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw=";
+      sha256 = "sha256-jzLOlWuhkUS0/4+nXtjd1/IYbAHHnJrusFRTh7aPt8U=";
     };
 
     buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ];

From 2ee1577a1a91b6ba1577ef70ed31670a1e1836ca Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 10 Dec 2022 13:45:22 +0000
Subject: [PATCH 087/953] openjfx15: gradle_5 -> gradle_6

---
 pkgs/development/compilers/openjdk/openjfx/15.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
index 8c041988296f..788baabde848 100644
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5
+{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6
 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
 , ffmpeg_4-headless, python3, ruby }:
 
@@ -7,7 +7,7 @@ let
   update = ".0.1";
   build = "+1";
   repover = "${major}${update}${build}";
-  gradle_ = (gradle_5.override {
+  gradle_ = (gradle_6.override {
     java = openjdk11_headless;
   });
 
@@ -69,10 +69,7 @@ let
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    # Downloaded AWT jars differ by platform.
-    outputHash = {
-      x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw";
-    }.${stdenv.system} or (throw "Unsupported platform");
+    outputHash = "sha256-fGLTMM9s/Vn7eMzn6OQR3tL0cGbAYc7c4J4/aW3JvkI=";
   };
 
 in makePackage {
@@ -80,7 +77,7 @@ in makePackage {
 
   gradleProperties = ''
     COMPILE_MEDIA = true
-    COMPILE_WEBKIT = true
+    COMPILE_WEBKIT = false
   '';
 
   preBuild = ''

From fa8c56b8c747493f18b70ba6436e162e32b311c7 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 13 Dec 2022 17:33:47 +0100
Subject: [PATCH 088/953] openssl_3: patch CVE-2022-3996

https://www.openssl.org/news/secadv/20221213.txt
---
 .../libraries/openssl/3.0/CVE-2022-3996.patch | 36 +++++++++++++++++++
 .../development/libraries/openssl/default.nix |  3 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch

diff --git a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch
new file mode 100644
index 000000000000..2acedda0e3a4
--- /dev/null
+++ b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch
@@ -0,0 +1,36 @@
+From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001
+From: Pauli <pauli@openssl.org>
+Date: Fri, 11 Nov 2022 09:40:19 +1100
+Subject: [PATCH] x509: fix double locking problem
+
+This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the
+redundant flag setting.
+
+Fixes #19643
+
+Fixes LOW CVE-2022-3996
+
+Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/19652)
+
+(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5)
+---
+ crypto/x509/pcy_map.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
+index 05406c6493fc..60dfd1e3203b 100644
+--- a/crypto/x509/pcy_map.c
++++ b/crypto/x509/pcy_map.c
+@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
+ 
+     ret = 1;
+  bad_mapping:
+-    if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) {
+-        x->ex_flags |= EXFLAG_INVALID_POLICY;
+-        CRYPTO_THREAD_unlock(x->lock);
+-    }
+     sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
+     return ret;
+ 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 45a34971c8f0..4c322997963a 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -241,6 +241,9 @@ in {
       (if stdenv.hostPlatform.isDarwin
        then ./use-etc-ssl-certs-darwin.patch
        else ./use-etc-ssl-certs.patch)
+
+       # Remove with 3.0.8 release
+       ./3.0/CVE-2022-3996.patch
     ];
 
     withDocs = true;

From ed9e8cd687b08a4e8f3d673f25c12e345afd65cb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 13 Dec 2022 17:21:24 +0000
Subject: [PATCH 089/953] systemd: 252.1 -> 252.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes sd-boot on (some?) Intel Macbooks, as reported in
https://github.com/NixOS/nixpkgs/pull/201558#issuecomment-1348823127.

Full log:

```
13de548fca network: manage addresses in the way the kernel does
fcc174cbdd import: wire up SYSTEMD_IMPORT_BTRFS_{SUBVOL,QUOTA} to importd
6cb0724a06 machine-pool: simplify return values from setup_machine_directory()
1c9e7fc8f2 boot: Only do full driver initialization in VMs
79b97ec652 boot: improve support for qemu (helpers only)
87add68b39 boot: Make sure all partitions drivers are connected
989f0c52e1 boot: Use EFI_BOOT_MANAGER_POLICY_PROTOCOL to connect console devices
b89be71bf4 network: unset Link.ndisc_configured only when a new address or route is requested
fc4f804b07 network: fix indentation
fc60072926 dissect: rework DISSECT_IMAGE_ADD_PARTITION_DEVICES + DISSECT_IMAGE_OPEN_PARTITION_DEVICES
1267b35273 fuzz: shorten filename of testcase
7fc478f751 resolve: optimize conversion of TXT fields to json
772e89452e hexdecoct: fix NULL pointer dereferences in hexmem()
002fc46688 hexdecoct: add missing NULL check
be1088b7a0 test: add tests for base64_append()
acb0414a1f hexdecoct: several cleanups for base64_append()
9410eb20eb cryptsetup: retry TPM2 unseal operation if it fails with TPM2_RC_PCR_CHANGED
1c8abb343a man: mention that DefaultRouteOnDevice= create the IPv4 default route
6c869ad3bd selinux: accept the fact that getxyzcon() can return success and NULL
0fdeb7c640 oomd: print dry run output at INFO level
4119d25e62 journald: prevent segfault on empty attr/current
6fdf196f99 core: use correct scope of looking up units
6d7b0dacc6 test-network: add test for bond mac address config
6405eba4b6 network: Fix set bond device MAC address failed
dbc59253ec test-fs-util: Add relative path chase_symlinks() tests
6e99f9c8fb chase-symlink: when converting directory O_PATH fd to real fd, don't bother with /proc/
bc6fc812fd test: add basic tests for octescape()
2ea5de7881 escape: fix wrong octescape of bad character
8999727a82 network: drop REMOVING flag when a netlink message is sent to kernel
a064abff76 dissect: show color in log output
278a97708b log: Switch logging to runtime when FS becomes read-only
44984e15bb resolve: format zero-length RDATA according to rfc3597
d59009dc1d manager: do not append '\n' when writing sysctl settings
2a66b4c894 test: check if we can use SHA1 MD for signing before using it
d0b80bf81e dissect-image: log expected UUID for /var
b0b97848e8 bootspec: fix null-dereference-read
0ba8e9ecff virt: Support detection of LMHS SRE guests
787b2c32f3 terminal-util: Set OPOST when setting ONLCR
c7bf13b2d9 units: change Requires=systemd-networkd.service → BindsTo= one more time
e3d9376692 core/device: verify device syspath on switching root
9523f85b2e core/device: also serialize/deserialize device syspath
10b3ce781b core/device: update comment
2505010178 sd-netlink: fix segfault
4b885f3591 test: Add tests for systemd-cgtop args parsing
b97c1c427c cgtop: Do not rewrite -P or -k options
6cbf72a8d9 logind: Properly unescape names of lingering users
01a39e96b5 units: Use BindsTo=systemd-networkd in systemd-networkd-wait-online.service
b0c39ffc54 resolved: remove inappropriate assert()
e0521346ec stub: Detect empty LoadOptions when run from EFI shell
7ca40a8b08  stub: Fix cmdline handling
b39f2ab98f boot: Use xstr8_to_16 for path conversion
6387a74d2c boot: Use xstr8_to_16
ff7469af96 boot: Add xstrn8_to_16
475c130003 core: update audit messages
c74bc2cd49 dissect: fix fsck
ce55eb4ebd process-util: add new FORK_CLOEXEC_OFF flag for disabling O_CLOEXEC on remaining fds
36c3c4172d fd-util: add new fd_cloexec_many() helper
57b4329b38 fd-util: make fd_in_set() (and thus close_all_fds()) handle invalidated fds in the array
12c41564cd tmpfiles: log at info level when some allowed failures occur
77f524dda0 find-esp: include device sysname in the log message
8d23210a2e find-esp: downgrade and ignore error on retrieving PART_ENTRY_SCHEME when searching
eea92b179d sd-bus: Use goto finish instead of return in bus_add_match_full
0916514b8c strv: Make sure strv_make_nulstr() always returns a valid nulstr
2ddd7b5def bootctl: rework how we handle referenced but absent EFI boot entries
2daecc7179 bootctl: downgrade log message when firmware reports non-existent or invalid boot entry
9a7186e92a bootctl: make boot entry id logged in hex
62f58d94f8 dissect-image: do not try to close invalid fd
c1dd021d16 boot: Silence driver reconnect errors
a09a41c2f7 meson: install test-kernel-install only when -Dkernel-install=true
9b6f12262f udev: make sure auto-root logic also works in UKIs booted from XBOOTLDR
d5e3625a61 repart: respect --discard=no also for block devices
79f161ac65 portable: add a few more useful debug log messages
bcd42b3c88 oomd: fix unreachable test case in test-oomd-util
2bdf5b0382 oomd: always allow root-owned cgroups to set ManagedOOMPreference
da01d83ab4 network: wifi: try to reconfigure when connected
595dd9b2b9 resolved: Fix OpenSSL error messages
2ecb8fc841 basic/strv: check printf arguments to strv_extendf()
81e2c87a47 manager: fix format strings for trigger metadata
d337ac02d6 resolved: when configuring 127.0.0.1 as per-interface DNS server, contact it via "lo" always
813d52dbf8 resolved: use right conditionalization when setting unicast ifindex on UDP sockets
2b52748d45 nspawn: allow sched_rr_get_interval_time64 through seccomp filter
5c34bc9bc3 boot/measure: fix oom check
f68be4fd79 fuzz: fuzz-compress: fix copy-and-paste error: buf -> buf2 (#25431)
132f0ec7de Handle MACHINE_ID=uninitialized
25fcbdae7e shared/tpm2-util: Fix "Error: Esys invalid ESAPI handle (40000001)" warning
6189505d79 boot: Correctly handle @saved default patterns
148b2d8ad3 Revert "journal: Make sd_journal_previous/next() return 0 at HEAD/TAIL"
d34ea410f4 Fix reading /etc/machine-id in kernel-install (#25388)
7b99f68f1c systemctl: do not show unit properties with --all
f791ecd0c5 ac-power: check battery existence and status
c2620a6bdb pid1: skip cleanup if root is not tmpfs/ramfs
83a772aae2 Revert "initrd: extend SYSTEMD_IN_INITRD to accept non-ramfs rootfs"
4d11c9b3cd networkd-ipv4acd.c: Use net/if.h for getting IFF_LOOPBACK definition
aff1caf3fd boot: Replace firmware security hooks directly
f9d9a68ecc boot: Rework security arch override
c6d7b4014c boot: Manually convert filepaths if needed
c8c5b79fb6 boot: Do not require a loaded image path
5894d4bd79 boot: Fix memory leak
5c0b918c02 boot: Fix error message
542dbc623e tpm2: add some extra validation of device string before using it
b3228085ba tpm2-util: force default TCTI to be "device" with parameter "/dev/tpmrm0"
31c2abd305 Create CNAME
2ec3187d6c test: compile test-utmp.c only if UTMP is enabled
````
`
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 0178cd7d6d45..d2cf9fc8db3a 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -123,7 +123,7 @@ assert withHomed -> withCryptsetup;
 let
   wantCurl = withRemote || withImportd;
   wantGcrypt = withResolved || withImportd;
-  version = "252.1";
+  version = "252.3";
 
   # Bump this variable on every (major) version change. See below (in the meson options list) for why.
   # command:
@@ -140,7 +140,7 @@ stdenv.mkDerivation {
     owner = "systemd";
     repo = "systemd-stable";
     rev = "v${version}";
-    hash = "sha256-G43qbNF7znTITSM78sOL0qi8nqaA7qIhmiqP/rZKjXY=";
+    hash = "sha256-F2wtg12amigd5KNCWmG3b9Yu6PUOby9mQgZ2VFtxl5A==";
   };
 
   # On major changes, or when otherwise required, you *must* reformat the patches,

From 29b38799e9ddd054411cf9fe79c981964a772e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Dec 2022 13:16:46 -0800
Subject: [PATCH 090/953] python310Packages.poetry-core: 1.3.2 -> 1.4.0

https://github.com/python-poetry/poetry-core/releases/tag/1.4.0
---
 pkgs/development/python-modules/poetry-core/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index e90529dac6d0..c669de8b03f6 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "1.3.2";
+  version = "1.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "python-poetry";
     repo = pname;
     rev = version;
-    hash = "sha256-3Ryfq0MwrL/mKP8DmkhLOyFlulf3c73z9fFIzMuqOrg=";
+    hash = "sha256-SCzs2v0LIgx3vBYTavPqc7uwAQdWsdmkbDyHgIjOxrk=";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
@@ -58,6 +58,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/python-poetry/poetry-core/blob/${src.rev}/CHANGELOG.md";
     description = "Core utilities for Poetry";
     homepage = "https://github.com/python-poetry/poetry-core/";
     license = licenses.mit;

From 95c657b15f252d26020e91fd1a2cc60b600103aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Dec 2022 13:04:49 -0800
Subject: [PATCH 091/953] python310Packages.poetry-plugin-export: 1.1.2 ->
 1.2.0

https://github.com/python-poetry/poetry-plugin-export/blob/1.2.0/CHANGELOG.md
---
 .../python-modules/poetry-plugin-export/default.nix          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/development/python-modules/poetry-plugin-export/default.nix
index bbf6013e4fd3..8711a4a527d0 100644
--- a/pkgs/development/python-modules/poetry-plugin-export/default.nix
+++ b/pkgs/development/python-modules/poetry-plugin-export/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-plugin-export";
-  version = "1.1.2";
+  version = "1.2.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-+BDBQwYaiddq3OQDHKmLap3ehWJe+Gh5D3TwuNXycjg=";
+    hash = "sha256-xrAGjHFYRT6n+r/16b0xyoI7+1Q1Hsw3lEK92UabIqo=";
   };
 
   postPatch = ''
@@ -29,6 +29,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [];
 
   meta = with lib; {
+    changelog = "https://github.com/python-poetry/poetry-plugin-export/blob/${src.rev}/CHANGELOG.md";
     description = "Poetry plugin to export the dependencies to various formats";
     license = licenses.mit;
     homepage = "https://github.com/python-poetry/poetry-plugin-export";

From 6de86a0981d48bbb4d426797eac5e4036022223b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Dec 2022 13:10:37 -0800
Subject: [PATCH 092/953] python310Packages.trove-classifiers: init at
 2022.12.1

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

diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
new file mode 100644
index 000000000000..4e87963e9e8d
--- /dev/null
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, calver
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "trove-classifiers";
+  version = "2022.12.1";
+
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8eccd9c075038ef2ec73276e2422d0dbf4d632f9133f029632d0df35374caf77";
+  };
+
+  nativeBuildInputs = [
+    calver
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "trove_classifiers" ];
+
+  meta = {
+    description = "Canonical source for classifiers on PyPI";
+    homepage = "https://github.com/pypa/trove-classifiers";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55d515af160d..af567721e3d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11360,6 +11360,8 @@ self: super: with self; {
 
   troposphere = callPackage ../development/python-modules/troposphere { };
 
+  trove-classifiers = callPackage ../development/python-modules/trove-classifiers { };
+
   trueskill = callPackage ../development/python-modules/trueskill { };
 
   trustme = callPackage ../development/python-modules/trustme { };

From 3186183ec05cb44818647678db9810952e953479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Dec 2022 13:03:23 -0800
Subject: [PATCH 093/953] python310Packages.poetry: 1.2.2 -> 1.3.0

https://github.com/python-poetry/poetry/blob/1.3.0/CHANGELOG.md
---
 .../python-modules/poetry/default.nix         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 2e81f7e55312..ff5d4c91a5d6 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -8,6 +8,7 @@
 , deepdiff
 , dulwich
 , fetchFromGitHub
+, filelock
 , flatdict
 , html5lib
 , httpretty
@@ -32,7 +33,9 @@
 , requests-toolbelt
 , shellingham
 , stdenv
+, tomli
 , tomlkit
+, trove-classifiers
 , urllib3
 , virtualenv
 , xattr
@@ -40,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.2.2";
+  version = "1.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -49,25 +52,19 @@ buildPythonPackage rec {
     owner = "python-poetry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-huIjLv1T42HEmePCQNJpKnNxJKdyD9MlEtc2WRPOjRE=";
+    hash = "sha256-e60lGOu/g3SahArQXUuW8nIFgReILF5/lPOfOn0qz5o=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'crashtest = "^0.3.0"' 'crashtest = "*"' \
-      --replace 'xattr = { version = "^0.9.7"' 'xattr = { version = "^0.10.0"'
-  '';
-
   nativeBuildInputs = [
     installShellFiles
   ];
 
   propagatedBuildInputs = [
     cachecontrol
-    cachy
     cleo
     crashtest
     dulwich
+    filelock
     html5lib
     jsonschema
     keyring
@@ -81,9 +78,12 @@ buildPythonPackage rec {
     requests-toolbelt
     shellingham
     tomlkit
+    trove-classifiers
     virtualenv
   ] ++ lib.optionals (stdenv.isDarwin) [
     xattr
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
   ] ++ lib.optionals (pythonOlder "3.10") [
     importlib-metadata
   ] ++ lib.optionals (pythonOlder "3.8") [
@@ -98,6 +98,7 @@ buildPythonPackage rec {
   '';
 
   checkInputs = [
+    cachy
     deepdiff
     flatdict
     pytestCheckHook
@@ -142,6 +143,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md";
     homepage = "https://python-poetry.org/";
     description = "Python dependency management and packaging made easy";
     license = licenses.mit;

From 047b5821350ec8ae4fc6fb725b13d4d725c7f62c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 Dec 2022 20:17:53 +0000
Subject: [PATCH 094/953] libarchive: 3.6.1 -> 3.6.2

---
 pkgs/development/libraries/libarchive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 066ea8b60ddc..c7e9f117f94c 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -28,13 +28,13 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   pname = "libarchive";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
     rev = "v${version}";
-    hash = "sha256-G4wL5DDbX0FqaA4cnOlVLZ25ObN8dNsRtxyas29tpDA=";
+    hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg=";
   };
 
   postPatch = ''

From 6a5211f123c14f95cbbb6d17c21d9e78cb178952 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 8 Dec 2022 17:29:33 -0500
Subject: [PATCH 095/953] nodejs-{16,18,19}_x: backport `npm pack` fixes from
 npm v9

---
 pkgs/development/web/nodejs/npm-patches.nix | 23 +++++++++++++++++++++
 pkgs/development/web/nodejs/v16.nix         |  4 +++-
 pkgs/development/web/nodejs/v18.nix         |  4 +++-
 pkgs/development/web/nodejs/v19.nix         |  4 +++-
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/npm-patches.nix

diff --git a/pkgs/development/web/nodejs/npm-patches.nix b/pkgs/development/web/nodejs/npm-patches.nix
new file mode 100644
index 000000000000..28432f806dc6
--- /dev/null
+++ b/pkgs/development/web/nodejs/npm-patches.nix
@@ -0,0 +1,23 @@
+{ fetchpatch }:
+
+[
+  # Makes `npm pack` obey `--foreground-scripts`
+  (fetchpatch {
+    name = "libnpmpack-obey-foreground-scripts.patch";
+    url = "https://github.com/npm/cli/commit/e4e8ae20aef9e27e57282e87e8757d5b364abb39.patch";
+    hash = "sha256-NQ8CZBfRqAOMe0Ysg3cq1FiferWKTzXC1QXgzX+f8OU=";
+    stripLen = 2;
+    extraPrefix = "deps/npm/node_modules/";
+    includes = [ "deps/npm/node_modules/libnpmpack/lib/index.js" ];
+  })
+
+  # Makes `npm pack` obey `--ignore-scripts`
+  (fetchpatch {
+    name = "libnpmpack-obey-ignore-scripts.patch";
+    url = "https://github.com/npm/cli/commit/a990c3c9a0e67f0a8b6454213675e159fe49432d.patch";
+    hash = "sha256-eA5YST9RxMMjk5FCwEbl1HQUpXZuwWZkx5WC4yJium8=";
+    stripLen = 2;
+    extraPrefix = "deps/npm/node_modules/";
+    includes = [ "deps/npm/node_modules/libnpmpack/lib/index.js" ];
+  })
+]
diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index a35c347c3d14..8483e7251b4e 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -5,6 +5,8 @@ let
     inherit openssl;
     python = python3;
   };
+
+  npmPatches = callPackage ./npm-patches.nix { };
 in
   buildNodejs {
     inherit enableNpm;
@@ -13,5 +15,5 @@ in
     patches = [
       ./disable-darwin-v8-system-instrumentation.patch
       ./bypass-darwin-xcrun-node16.patch
-    ];
+    ] ++ npmPatches;
   }
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 29f133a81105..b91f2c9f2c2b 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -5,6 +5,8 @@ let
     inherit openssl;
     python = python3;
   };
+
+  npmPatches = callPackage ./npm-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -21,5 +23,5 @@ buildNodejs {
 
     ./disable-darwin-v8-system-instrumentation.patch
     ./bypass-darwin-xcrun-node16.patch
-  ];
+  ] ++ npmPatches;
 }
diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix
index cbed3bbef9aa..335477aa7ddc 100644
--- a/pkgs/development/web/nodejs/v19.nix
+++ b/pkgs/development/web/nodejs/v19.nix
@@ -5,6 +5,8 @@ let
     inherit openssl;
     python = python3;
   };
+
+  npmPatches = callPackage ./npm-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -14,5 +16,5 @@ buildNodejs {
     ./revert-arm64-pointer-auth.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
-  ];
+  ] ++ npmPatches;
 }

From f1292b31d60bb804b1a9cc486a7cfd06b47c9a11 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 8 Dec 2022 17:36:27 -0500
Subject: [PATCH 096/953] doc/languages-frameworks/javascript: use
 --ignore-scripts flag in example

Presenting an example with a patch (without even providing that patch!) is not ideal. Since `npm pack` now obeys `--ignore-scripts`, we can use that instead.
---
 doc/languages-frameworks/javascript.section.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index e4e6643dd66a..76cf6e03c257 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -175,10 +175,11 @@ buildNpmPackage rec {
     hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM=";
   };
 
-  patches = [ ./remove-prepack-script.patch ];
-
   npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw=";
 
+  # The prepack script runs the build script, which we'd rather do in the build phase.
+  npmPackFlags = [ "--ignore-scripts" ];
+
   NODE_OPTIONS = "--openssl-legacy-provider";
 
   meta = with lib; {

From a37c3a6b942ef752d937afd407de87a3e3e47f99 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sat, 10 Dec 2022 13:03:00 -0500
Subject: [PATCH 097/953] ansible-language-server: use `npm pack
 --ignore-scripts`

---
 pkgs/development/tools/ansible-language-server/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ansible-language-server/default.nix b/pkgs/development/tools/ansible-language-server/default.nix
index 8d9b1f0ca50f..4daa90a80a54 100644
--- a/pkgs/development/tools/ansible-language-server/default.nix
+++ b/pkgs/development/tools/ansible-language-server/default.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   npmDepsHash = "sha256-8FP6hF85w1Zbhiwi2V350ZWFAykAfvsXRGL8bvGk1XE=";
   npmBuildScript = "compile";
 
-  # We remove the prepare and prepack scripts because they run the
+  # We remove/ignore the prepare and prepack scripts because they run the
   # build script, and therefore are redundant.
   #
   # Additionally, the prepack script runs npm ci in addition to the
@@ -27,9 +27,10 @@ buildNpmPackage rec {
   # wiping out node_modules, which causes a mysterious error stating that tsc isn't installed.
   postPatch = ''
     sed -i '/"prepare"/d' package.json
-    sed -i '/"prepack"/d' package.json
   '';
 
+  npmPackFlags = [ "--ignore-scripts" ];
+
   passthru.updateScript = nix-update-script {
     attrPath = pname;
   };

From 44ab6c7eebcaa704093918c9eeb3179e9f478b62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Dec 2022 06:09:03 +0000
Subject: [PATCH 098/953] pcre2: 10.40 -> 10.42

---
 pkgs/development/libraries/pcre2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 226b92ccfdd3..82fc33670bc5 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pcre2";
-  version = "10.40";
+  version = "10.42";
 
   src = fetchurl {
     url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2";
-    hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg=";
+    hash = "sha256-jTbNjLbqKkwrs1j/ZBGwx4hjOipF2rvxrrS3AdG16EA=";
   };
 
   configureFlags = [

From cf63ef8b34724aed31e3b4702865bcd4260c23d5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Dec 2022 14:20:06 +0100
Subject: [PATCH 099/953] glib: Pick security patches

https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835
https://discourse.gnome.org/t/fixes-for-gdbusmenumodel-crashes-in-glib/12846
---
 pkgs/development/libraries/glib/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 12f46af022fc..4bd223158f63 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -118,6 +118,20 @@ stdenv.mkDerivation (finalAttrs: {
     # Disable flaky test.
     # https://gitlab.gnome.org/GNOME/glib/-/issues/820
     ./skip-timer-test.patch
+
+    # GVariant security fixes
+    # https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3126.patch";
+      sha256 = "CNCxouYy8xNHt4eJtPZ2eOi9b0SxzI2DkklNfQMk3d8=";
+    })
+
+    # Menu model security fix
+    # https://discourse.gnome.org/t/fixes-for-gdbusmenumodel-crashes-in-glib/12846
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/glib/-/commit/4f4d770a1e40f719d5a310cffdac29cbb4e20c11.patch";
+      sha256 = "+S44AnC86HfbMwkRe1ll54IK9pLxaFD3LqiVhPelnXI=";
+    })
   ];
 
   outputs = [ "bin" "out" "dev" "devdoc" ];

From 6ba4739114dee7d0374f6acc38d26d666f50fc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 15 Dec 2022 00:20:17 +0100
Subject: [PATCH 100/953] python310Packages.limits: 2.7.0 -> 2.7.2

Diff: https://github.com/alisaifee/limits/compare/2.7.0...2.7.2
---
 pkgs/development/python-modules/limits/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index 2b4499e29e8e..f298bef4892f 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "limits";
-  version = "2.7.0";
+  version = "2.7.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/limits/_version.py"
     '';
-    hash = "sha256-TBZElCogPtoR2qX1YjBgpYh99LhrvLHFtr2ogemo9/c=";
+    hash = "sha256-sL4/BE1qNfR33rZwBcwHo3UeVMfkNz7rwBNF4LBtSIw=";
   };
 
   propagatedBuildInputs = [

From 9551ca33185d70acefd9cdc84f9ccc6b12df0b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Dec 2022 11:00:20 -0800
Subject: [PATCH 101/953] python310Packages.six: run tests

---
 .../python-modules/six/default.nix            | 21 ++++++++++---------
 pkgs/top-level/python2-packages.nix           |  4 ++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix
index 24fe639211d1..61e6a178660d 100644
--- a/pkgs/development/python-modules/six/default.nix
+++ b/pkgs/development/python-modules/six/default.nix
@@ -1,30 +1,31 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pytest
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "six";
   version = "1.16.0";
 
+  format = "setuptools";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";
   };
 
-  checkInputs = [ pytest ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  checkPhase = ''
-    py.test test_six.py
-  '';
-
-  # To prevent infinite recursion with pytest
-  doCheck = false;
+  pythonImportsCheck = [ "six" ];
 
   meta = {
-    description = "A Python 2 and 3 compatibility library";
-    homepage = "https://pypi.python.org/pypi/six/";
+    changelog = "https://github.com/benjaminp/six/blob/${version}/CHANGES";
+    description = "Python 2 and 3 compatibility library";
+    homepage = "https://github.com/benjaminp/six";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index bfa5a304807f..45610c7aa7fd 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -75,6 +75,10 @@ with self; with super; {
 
   setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { };
 
+  six = super.six.overridePythonAttrs (_: {
+    doCheck = false;  # circular dependency with pytest
+  });
+
   zeek = disabled super.zeek;
 
   zipp = callPackage ../development/python2-modules/zipp { };

From 3954989b5b2843db6905309a1e955513df4ad136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Dec 2022 23:19:41 -0800
Subject: [PATCH 102/953] python310Packages.yarl: 1.8.1 -> 1.8.2

https://github.com/aio-libs/yarl/blob/v1.8.2/CHANGES.rst
---
 pkgs/development/python-modules/yarl/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 249bf974322e..171f6569cfd8 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -10,11 +10,15 @@
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "1.8.1";
+  version = "1.8.2";
+
+  disabled = pythonOlder "3.7";
+
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-r4h4RbjC4GDrVgX/crby3SqrenYTeTc/2J0xT0dSq78=";
+    hash = "sha256-SdQ0AsbjATrQl4YCv2v1MoU1xI0ZIwS5G5ejxnkLFWI=";
   };
 
   postPatch = ''
@@ -44,6 +48,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "yarl" ];
 
   meta = with lib; {
+    changelog = "https://github.com/aio-libs/yarl/blob/v${version}/CHANGES.rst";
     description = "Yet another URL library";
     homepage = "https://github.com/aio-libs/yarl";
     license = licenses.asl20;

From 31c93ff0b873add319265cb2dd9ce41a57a2a5ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 10 Dec 2022 11:38:40 -0800
Subject: [PATCH 103/953] python310Packages.multidict: 6.0.2 -> 6.0.3

https://github.com/aio-libs/multidict/releases/tag/v6.0.3
---
 pkgs/development/python-modules/multidict/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 6ee071732691..ebc4daae0bc1 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,13 +7,15 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "6.0.2";
+  version = "6.0.3";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
+
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-X/O9dfOOTEPx9HDy33pNQwuCHEziK+OE4UWctX1rsBM=";
+    hash = "sha256-JSOikAbANGh+zNPucAk6aXEpo//ocyU107Lfak7MJ50=";
   };
 
   postPatch = ''
@@ -25,6 +27,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "multidict" ];
 
   meta = with lib; {
+    changelog = "https://github.com/aio-libs/multidict/blob/v${version}/CHANGES.rst";
     description = "Multidict implementation";
     homepage = "https://github.com/aio-libs/multidict/";
     license = licenses.asl20;

From 804a0f037d4ebad40d6f21713eec01a8f951a35a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 Dec 2022 18:15:31 +0300
Subject: [PATCH 104/953] libclc: 12.0.1 -> 14.0.6

---
 pkgs/development/libraries/libclc/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index a53450e11773..14a20a957967 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -7,13 +7,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libclc";
-  version = "12.0.1";
+  version = "14.0.6";
 
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
     rev = "llvmorg-${version}";
-    sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv";
+    sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE=";
   };
   sourceRoot = "source/libclc";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a084bc1815dd..cbbb50b4bab7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20275,7 +20275,9 @@ with pkgs;
 
   libcint = callPackage ../development/libraries/libcint { };
 
-  libclc = callPackage ../development/libraries/libclc { };
+  libclc = callPackage ../development/libraries/libclc {
+    llvmPackages = llvmPackages_latest;
+  };
 
   libcli = callPackage ../development/libraries/libcli { };
 

From cd53c071f2ce8ed43365c519aad49bf58ec5dd97 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 Dec 2022 18:15:42 +0300
Subject: [PATCH 105/953] mesa: 22.2.5 -> 22.3.1, enable rusticl

---
 pkgs/development/libraries/mesa/default.nix  | 24 +++++++----
 pkgs/development/libraries/mesa/opencl.patch | 42 ++++++++++++++++----
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 78230898d7fc..8d8562468757 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -19,6 +19,10 @@
 , enablePatentEncumberedCodecs ? true
 , libclc
 , jdupes
+, cmake
+, rustc
+, rust-bindgen
+, spirv-llvm-translator_14
 }:
 
 /** Packaging design:
@@ -37,9 +41,15 @@ with lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "22.2.5";
+  version = "22.3.1";
   branch  = versions.major version;
 
+  rust-bindgen' = rust-bindgen.override {
+    rust-bindgen-unwrapped = rust-bindgen.unwrapped.override {
+      clang = llvmPackages.clang;
+    };
+  };
+
 self = stdenv.mkDerivation {
   pname = "mesa";
   inherit version;
@@ -52,7 +62,7 @@ self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "sha256-hQ8GMUb467JirsBPZmwsHlYj8qGYfdok5DYbF7kSxzs=";
+    sha256 = "sha256-PJzWEcCFnTB6ugZZgzOGq9ykyGFi08J1ulvmLRbPMes=";
   };
 
   # TODO:
@@ -105,7 +115,6 @@ self = stdenv.mkDerivation {
 
     "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri"
     "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau"
-    "-Dxvmc-libs-path=${placeholder "drivers"}/lib"
     "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"
     "-Dva-libs-path=${placeholder "drivers"}/lib/dri"
     "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"
@@ -119,6 +128,7 @@ self = stdenv.mkDerivation {
     "-Dglvnd=true"
   ] ++ optionals enableOpenCL [
     "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend
+    "-Dgallium-rusticl=true" "-Drust_std=2021"
     "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib"
   ] ++ optional enablePatentEncumberedCodecs
     "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
@@ -132,7 +142,7 @@ self = stdenv.mkDerivation {
   ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
     ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
     ++ lib.optionals stdenv.isDarwin [ libunwind ]
-    ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ]
+    ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator_14 ]
     ++ lib.optional withValgrind valgrind-light
     # Mesa will not build zink when gallium-drivers=auto
     ++ lib.optional (elem "zink" galliumDrivers) vulkan-loader;
@@ -188,12 +198,12 @@ self = stdenv.mkDerivation {
     mkdir -p $opencl/lib
     mv -t "$opencl/lib/"     \
       $out/lib/gallium-pipe   \
-      $out/lib/libMesaOpenCL*
+      $out/lib/lib*OpenCL*
 
-    # We construct our own .icd file that contains an absolute path.
-    rm -r $out/etc/OpenCL
+    # We construct our own .icd files that contain absolute paths.
     mkdir -p $opencl/etc/OpenCL/vendors/
     echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd
+    echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd
   '' + lib.optionalString enableOSMesa ''
     # move libOSMesa to $osmesa, as it's relatively big
     mkdir -p $osmesa/lib
diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch
index d220239770d5..02558aaa825d 100644
--- a/pkgs/development/libraries/mesa/opencl.patch
+++ b/pkgs/development/libraries/mesa/opencl.patch
@@ -1,5 +1,18 @@
+diff --git a/meson.build b/meson.build
+index e32338b3f9a..fae804fd41e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1894,7 +1894,7 @@ endif
+ 
+ dep_clang = null_dep
+ if with_clc
+-  llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
++  llvm_libdir = get_option('clang-libdir')
+ 
+   dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
+ 
 diff --git a/meson_options.txt b/meson_options.txt
-index b8f753e2e1a..2163e3ab7ee 100644
+index 6f307018815..ab84eb1006c 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -18,6 +18,12 @@
@@ -16,7 +29,7 @@ index b8f753e2e1a..2163e3ab7ee 100644
    'platforms',
    type : 'array',
 diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
-index 14df6b86f7f..adcd5110342 100644
+index 7af210b5693..ff6ac8c61ca 100644
 --- a/src/gallium/targets/opencl/meson.build
 +++ b/src/gallium/targets/opencl/meson.build
 @@ -30,6 +30,7 @@ if with_ld_version_script
@@ -29,7 +42,7 @@ index 14df6b86f7f..adcd5110342 100644
  polly_dep = null_dep
 @@ -60,19 +61,19 @@ else
  endif
- if not (dep_clang.found() and dep_clang_usable)
+ if not _shared_llvm or not (dep_clang.found() and dep_clang_usable)
    dep_clang = [
 -    cpp.find_library('clangCodeGen', dirs : llvm_libdir),
 -    cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
@@ -60,12 +73,25 @@ index 14df6b86f7f..adcd5110342 100644
      polly_dep, polly_isl_dep,
    ]
    # check clang once more
-@@ -112,7 +113,7 @@ if with_opencl_icd
+@@ -119,7 +120,7 @@ if with_opencl_icd
+     configuration : _config,
      input : 'mesa.icd.in',
      output : 'mesa.icd',
-     install : true,
--    install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
-+    install_dir : join_paths(get_option('prefix'), 'etc', 'OpenCL', 'vendors'),
+-    install : true,
++    install : false,
+     install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
    )
  
-   if meson.version().version_compare('>= 0.58')
+diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
+index a968dee52db..69475cf3133 100644
+--- a/src/gallium/targets/rusticl/meson.build
++++ b/src/gallium/targets/rusticl/meson.build
+@@ -58,7 +58,7 @@ configure_file(
+   configuration : _config,
+   input : 'rusticl.icd.in',
+   output : 'rusticl.icd',
+-  install : true,
++  install : false,
+   install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
+ )
+ 

From fde44ef915f67047277fbc601fac320a7c3955f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 15 Dec 2022 12:48:29 +0100
Subject: [PATCH 106/953] x265: only disable assembly on riscv-cross builds

---
 pkgs/development/libraries/x265/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 7e81d8ff6115..b63b0101d54b 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -35,8 +35,7 @@ let
     (mkFlag vtuneSupport "ENABLE_VTUNE")
     (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
     # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag
-    (mkFlag (!(isCross && stdenv.hostPlatform.isRiscV)) "ENABLE_ASSEMBLY")
-  ];
+  ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF";
 
   cmakeStaticLibFlags = [
     "-DHIGH_BIT_DEPTH=ON"

From e14de22618dc6c547f7c89f57eefe98e9e0bb8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Tue, 13 Dec 2022 18:12:04 +0100
Subject: [PATCH 107/953] stdenv: handle `env` gracefully

Derivations not using `__structuredAttrs` should not attempt to set
environment variables from `env`.

Derivations using `__structuredAttrs` should fail if `env` is not
exportable.
---
 pkgs/stdenv/generic/make-derivation.nix |  6 ++++--
 pkgs/stdenv/generic/setup.sh            | 11 +++++++----
 pkgs/test/stdenv/default.nix            | 19 +++++++++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 12aa25ac307c..db6d7e83f595 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -274,7 +274,7 @@ else let
        "__darwinAllowLocalNetworking"
        "__impureHostDeps" "__propagatedImpureHostDeps"
        "sandboxProfile" "propagatedSandboxProfile"]
-       ++ lib.optionals envIsExportable [ "env" ]))
+       ++ lib.optional (__structuredAttrs || envIsExportable) "env"))
     // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
       name =
         let
@@ -298,7 +298,7 @@ else let
           then attrs.name + hostSuffix
           else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
         );
-    }) // lib.optionalAttrs (envIsExportable && __structuredAttrs) { env = checkedEnv; } // {
+    }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // {
       builder = attrs.realBuilder or stdenv.shell;
       args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
       inherit stdenv;
@@ -485,6 +485,8 @@ else let
     let
       overlappingNames = lib.intersectLists (lib.attrNames env) (lib.attrNames derivationArg);
     in
+    assert lib.assertMsg envIsExportable
+      "When using structured attributes, `env` must be an attribute set of environment variables.";
     assert lib.assertMsg (overlappingNames == [ ])
       "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${lib.concatStringsSep ", " overlappingNames}";
     lib.mapAttrs
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5a64625e10d1..b07420bb4185 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -383,10 +383,13 @@ printWords() {
 ######################################################################
 # Initialisation.
 
-# export all vars that should be in the ENV
-for envVar in "${!env[@]}"; do
-    declare -x "${envVar}=${env[${envVar}]}"
-done
+# If using structured attributes, export variables from `env` to the environment.
+# When not using structured attributes, those variables are already exported.
+if [[ -n $__structuredAttrs ]]; then
+    for envVar in "${!env[@]}"; do
+        declare -x "${envVar}=${env[${envVar}]}"
+    done
+fi
 
 
 # Set a fallback default value for SOURCE_DATE_EPOCH, used by some build tools
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 08e8eed118f9..ab5f98890bd3 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -95,6 +95,25 @@ in
 {
   test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; };
 
+  # Test compatibility with derivations using `env` as a regular variable.
+  test-env-derivation = bootStdenv.mkDerivation rec {
+    name = "test-env-derivation";
+    env = bootStdenv.mkDerivation {
+      name = "foo";
+      buildCommand = ''
+        mkdir "$out"
+        touch "$out/bar"
+      '';
+    };
+
+    passAsFile = [ "buildCommand" ];
+    buildCommand = ''
+      declare -p env
+      [[ $env == "${env}" ]]
+      touch "$out"
+    '';
+  };
+
   test-prepend-append-to-var = testPrependAndAppendToVar {
     name = "test-prepend-append-to-var";
     stdenv' = bootStdenv;

From 9b1e8d7267ad7999677ea1900a5613ee1f23d0fc Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 15 Dec 2022 07:16:18 +0200
Subject: [PATCH 108/953] tests.stdenv: check that attrs in env are exported

---
 pkgs/test/stdenv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index ab5f98890bd3..3289b7e11e2e 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -47,6 +47,7 @@ let
           declare -p string
           echo "env.string = $string"
           [[ $string == "testing-string" ]] || (echo "'\$string' was not 'testing-string'" && false)
+          [[ "$(declare -p string)" == 'declare -x string="testing-string"' ]] || (echo "'\$string' was not exported" && false)
           touch $out
         '';
       } // extraAttrs);

From 1ffbdda604b5c0daf6cbd521aa09b21cdc72f55c Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 15 Dec 2022 11:24:06 -0500
Subject: [PATCH 109/953] rustc: 1.65.0 -> 1.66.0

---
 .../compilers/rust/{1_65.nix => 1_66.nix}     | 32 +++++++++----------
 pkgs/top-level/all-packages.nix               |  8 ++---
 2 files changed, 20 insertions(+), 20 deletions(-)
 rename pkgs/development/compilers/rust/{1_65.nix => 1_66.nix} (56%)

diff --git a/pkgs/development/compilers/rust/1_65.nix b/pkgs/development/compilers/rust/1_66.nix
similarity index 56%
rename from pkgs/development/compilers/rust/1_65.nix
rename to pkgs/development/compilers/rust/1_66.nix
index 5b2397b5de48..ada9054973fa 100644
--- a/pkgs/development/compilers/rust/1_65.nix
+++ b/pkgs/development/compilers/rust/1_66.nix
@@ -20,8 +20,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.65.0";
-  rustcSha256 = "sha256-WCi7Z/Z36r+MOEAgWCsM56+IThyEOJSE9/jQDdgsADg=";
+  rustcVersion = "1.66.0";
+  rustcSha256 = "sha256-OzzT6lqCombnXQs18LVMFgIVdtnreNOEBSF1p3KTWkg=";
 
   llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; };
@@ -37,25 +37,25 @@ import ./default.nix {
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.64.0";
+  bootstrapVersion = "1.65.0";
 
   # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "177b4f95c8cdaa34bb29e69950cbfe236e123757078af4792779c43ee3818199";
-    x86_64-unknown-linux-gnu = "a893977f238291370ab96726a74b6b9ae854dc75fbf5730954d901a93843bf9b";
-    x86_64-unknown-linux-musl = "d5c4293a8fe1b34d857bec4124229c39711f8759aa2f6108c8b6c22a308f96bb";
-    arm-unknown-linux-gnueabihf = "0d7c9c746f7b98f1f99e4cf720f9a32b2f5cdf22cb1d9f677b41c1dca62f14f8";
-    armv7-unknown-linux-gnueabihf = "0be29740f565ca8835ba260691274585733a7f4130ec872bfa37654a08013828";
-    aarch64-unknown-linux-gnu = "7d8860572431bd4ee1b9cd0cd77cf7ff29fdd5b91ed7c92a820f872de6ced558";
-    aarch64-unknown-linux-musl = "9e7cfd960fb8ad3e1f51ef667c56032d3d4d9d9f573a06bbcf65a7c7a96ab430";
-    x86_64-apple-darwin = "b6003d49fb857ff8dc105a3ccba98b851cd3e7d874005acb92284fd1113adc0d";
-    aarch64-apple-darwin = "e1a37dc5991304716e260144311fd291d8fb514042e45c244c582b3454477038";
-    powerpc64le-unknown-linux-gnu = "9d4591033eac22093d107991a68fffccea087b26bb54115d46cc544fbf5ef66c";
-    riscv64gc-unknown-linux-gnu = "f63981d9c1057cb20cf30871757d42475a1cd0c187b3dcce5fabb0cce0f80c5b";
-    mips64el-unknown-linux-gnuabi64 = "47488e4c53cca5c99b5837474a880f6c2368a7fe8368560dd8077bddb94959b5";
+    i686-unknown-linux-gnu = "b29869f8e2c7029150a929b2c4e26843f363846ad99253a25be6abcfa8e84f46";
+    x86_64-unknown-linux-gnu = "8f754fdd5af783fe9020978c64e414cb45f3ad0a6f44d045219bbf2210ca3cb9";
+    x86_64-unknown-linux-musl = "716984def5509a844c2dde1c7be42bfadeb179f751d5c1a30c9c7198c8c089cd";
+    arm-unknown-linux-gnueabihf = "e27f835c16bfcb66ad022a17d5c4602899e021e483a432ca4cc2cb4ecd39e938";
+    armv7-unknown-linux-gnueabihf = "5376d467a29b32cacb771e0c76dc280bd623852709e7ffd92caabab076d5475f";
+    aarch64-unknown-linux-gnu = "f406136010e6a1cdce3fb6573506f00d23858af49dd20a46723c3fa5257b7796";
+    aarch64-unknown-linux-musl = "4b701dc3cbac04ebf0e336cff2f4ce5fc1a1984c183226863c9ed911eb00b07e";
+    x86_64-apple-darwin = "139087a3937799415fd829e5a88162a69a32c23725a44457f9c96b98e4d64a7c";
+    aarch64-apple-darwin = "7ddc335bd10fc32d3039ef36248a5d0c4865db2437c8aad20a2428a6cf41df09";
+    powerpc64le-unknown-linux-gnu = "3f1d0d5bb13213348dc65e373f8c412fc0a12ee55abc1c864f7e0300932fc687";
+    riscv64gc-unknown-linux-gnu = "aac7067348d218faa452b4bdc735778a51570a310ad645313ec767b5d7c88492";
+    mips64el-unknown-linux-gnuabi64 = "d91ed3857c5256720da890f6533684b684e880bf9006dc4e4f4181213a5c4a09";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_65;
+  selectRustPackage = pkgs: pkgs.rust_1_66;
 
   rustcPatches = [
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a084bc1815dd..3ba342af198a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15214,11 +15214,11 @@ with pkgs;
     inherit (darwin) apple_sdk;
   };
 
-  rust_1_65 = callPackage ../development/compilers/rust/1_65.nix {
+  rust_1_66 = callPackage ../development/compilers/rust/1_66.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_14 = llvmPackages_14.libllvm;
   };
-  rust = rust_1_65;
+  rust = rust_1_66;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
@@ -15227,8 +15227,8 @@ with pkgs;
     openssl = openssl_1_1;
   };
 
-  rustPackages_1_65 = rust_1_65.packages.stable;
-  rustPackages = rustPackages_1_65;
+  rustPackages_1_66 = rust_1_66.packages.stable;
+  rustPackages = rustPackages_1_66;
 
   inherit (rustPackages) cargo clippy rustc rustPlatform;
 

From 931fc456ded386d80b81cd62730cda5c0631df99 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 5 Dec 2022 13:15:08 +0300
Subject: [PATCH 110/953] shadow: 4.11.1 -> 4.13

---
 pkgs/os-specific/linux/shadow/default.nix | 33 +++++++++++------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index c6fd417d0d6f..9ba8984bb032 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -10,22 +10,17 @@ let
     then glibcCross
     else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc;
 
-  dots_in_usernames = fetchpatch {
-    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch";
-    sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692";
-  };
-
 in
 
 stdenv.mkDerivation rec {
   pname = "shadow";
-  version = "4.11.1";
+  version = "4.13";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
-    repo = "shadow";
-    rev = "v${version}";
-    sha256 = "sha256-PxLX5V0t18JftT5wT41krNv18Ew7Kz3MfZkOi/80ODA=";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-L54DhdBYthfB9436t/XWXiqKhW7rfd0GLS7pYGB32rA=";
   };
 
   buildInputs = [ libxcrypt ]
@@ -34,13 +29,17 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_45 docbook_xsl flex bison itstool
     ];
 
-  patches =
-    [ ./keep-path.patch
-      # Obtain XML resources from XML catalog (patch adapted from gtk-doc)
-      ./respect-xml-catalog-files-var.patch
-      dots_in_usernames
-      ./runtime-shell.patch
-    ];
+  patches = [
+    ./keep-path.patch
+    # Obtain XML resources from XML catalog (patch adapted from gtk-doc)
+    ./respect-xml-catalog-files-var.patch
+    ./runtime-shell.patch
+    # Fix HAVE_SHADOWGRP configure check
+    (fetchpatch {
+      url = "https://github.com/shadow-maint/shadow/commit/a281f241b592aec636d1b93a99e764499d68c7ef.patch";
+      sha256 = "sha256-GJWg/8ggTnrbIgjI+HYa26DdVbjTHTk/IHhy7GU9G5w=";
+    })
+  ];
 
   RUNTIME_SHELL = runtimeShell;
 
@@ -49,7 +48,7 @@ stdenv.mkDerivation rec {
     ''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
     '';
 
-  outputs = [ "out" "su" "man" ];
+  outputs = [ "out" "su" "dev" "man" ];
 
   enableParallelBuilding = true;
 

From c72dd6887516c762d73dfb6ee35aad5ffb88a29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:07:44 -0300
Subject: [PATCH 111/953] vulkan-headers: 1.3.231.0 -> 1.3.236.0

---
 pkgs/development/libraries/vulkan-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 47cdccf41fc1..b640941428d4 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   nativeBuildInputs = [ cmake ];
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "sdk-${version}";
-    hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g=";
+    hash = "sha256-b1q9QugFH4lieS8CTOyZ3uoQ7bd44G8NPEwRtUPD+24=";
   };
 
   meta = with lib; {

From 7a28a0b6593403633b93c8396818fb78f610f768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:08:37 -0300
Subject: [PATCH 112/953] spirv-headers: 1.3.231.0 -> 1.3.236.0

---
 pkgs/development/libraries/spirv-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix
index 8abdea5249b7..78dc373d4ab6 100644
--- a/pkgs/development/libraries/spirv-headers/default.nix
+++ b/pkgs/development/libraries/spirv-headers/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spirv-headers";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
     rev = "sdk-${version}";
-    hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30=";
+    hash = "sha256-eWI1MyIWxcg1JepRsnHBmitehDigDa+dR8kXvIkYejY=";
   };
 
   nativeBuildInputs = [ cmake ];

From 705ca8e2b23a5c8595bc49798203d0192ed5112b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:09:15 -0300
Subject: [PATCH 113/953] spirv-tools: 1.3.231.0 -> 1.3.236.0

---
 pkgs/development/tools/spirv-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 7edba948586e..6f95ded63e15 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "spirv-tools";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   src = (assert version == spirv-headers.version;
     fetchFromGitHub {
       owner = "KhronosGroup";
       repo = "SPIRV-Tools";
       rev = "sdk-${version}";
-      hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0=";
+      hash = "sha256-BV7V/jS782zdvtuw/wNY5fyAdx8Z2niWSocNaW0Atho=";
     }
   );
 

From ca81eb8452393ef7380b0f33708e3a664bc4d188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:09:40 -0300
Subject: [PATCH 114/953] glslang: 1.3.231.0 -> 1.3.236.0

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

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index d93f647f8462..f5f46ff9f4f7 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = "sdk-${version}";
-    hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk=";
+    hash = "sha256-iVcx1j7OMJEU4cPydNwQSFufTUiqq7GKp69Y6pEt7Wc=";
   };
 
   # These get set at all-packages, keep onto them for child drvs
@@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python3 bison jq ];
 
   patches = [
-    # https://github.com/NixOS/nixpkgs/pull/201747
-    (fetchpatch {
-      name = "Fix-locations-of-cmake-files-in-side-compat-shims.patch";
-      url = "https://github.com/KhronosGroup/glslang/commit/88fd417b0bb7d91755961c70e846d274c182f2b0.patch";
-      hash = "sha256-rjeaPX5Ieem6zkICNvPd2SjvvLzG5wBERZfDLZEJsAk=";
-    })
     (fetchpatch {
       name = "Use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch";
       url = "https://github.com/KhronosGroup/glslang/commit/7627bd89583c5aafb8b38c81c15494019271fabf.patch";

From c08c7dda802473d436e199518e2b240e0d500b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:10:04 -0300
Subject: [PATCH 115/953] vulkan-loader: 1.3.231.0 -> 1.3.236.0

---
 pkgs/development/libraries/vulkan-loader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 27c1423d94e5..8d38f725a64d 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-loader";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   src = (assert version == vulkan-headers.version;
     fetchFromGitHub {
       owner = "KhronosGroup";
       repo = "Vulkan-Loader";
       rev = "sdk-${version}";
-      hash = "sha256-HWaa3JT0znhvqbvZdcsAwy8Dr6HDQp4rgpVmMOuCo0s=";
+      hash = "sha256-Y6OakowZlb40ZatITQCFBK/qSZqSdgTNew1XUFD/jMo=";
     });
 
   patches = [ ./fix-pkgconfig.patch ];

From 57e6c338f17f8565334da75da88b302403a241c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:10:33 -0300
Subject: [PATCH 116/953] vulkan-validation-layers: 1.3.231.0 -> 1.3.236.0

---
 pkgs/development/tools/vulkan-validation-layers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 4f6a766e5e96..17e898301956 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -22,7 +22,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   # If we were to use "dev" here instead of headers, the setupHook would be
   # placed in that output instead of "out".
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       owner = "KhronosGroup";
       repo = "Vulkan-ValidationLayers";
       rev = "sdk-${version}";
-      hash = "sha256-5bzUauu8081zyRaWmRUtOxHjUU4gc1GWoJtU783Msh0=";
+      hash = "sha256-+VbiXtxzYaF5o+wIrJ+09LmgBdaLv/0VJGFDnBkrXms=";
     });
 
   # Include absolute paths to layer libraries in their associated

From 4beaa32eaec4d8401f753ee846c0bc774867f4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:11:16 -0300
Subject: [PATCH 117/953] vulkan-tools: 1.3.231.0 -> 1.3.236.0

---
 pkgs/tools/graphics/vulkan-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index cb3fb8456a8d..8e94997db6c8 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   # It's not strictly necessary to have matching versions here, however
   # since we're using the SDK version we may as well be consistent with
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       owner = "KhronosGroup";
       repo = "Vulkan-Tools";
       rev = "sdk-${version}";
-      hash = "sha256-6oimP4ISa0dX4bLU3Nch8Ur6MzEMQscnL8EfRrqT/Es=";
+      hash = "sha256-PmNTpdAkXJkARLohRtUOuKTZPoKgeVF4DAo1wsAq5xE=";
     });
 
   nativeBuildInputs = [

From eaaafb78663b8c988f8f77a02d13cc654a277bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:13:24 -0300
Subject: [PATCH 118/953] vulkan-extension-layer: 1.3.231.0 -> 1.3.236.0

---
 pkgs/tools/graphics/vulkan-extension-layer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix
index 6a8056dfe41d..bf60e8ed85f3 100644
--- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix
+++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-extension-layer";
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   src = (assert version == vulkan-headers.version;
     fetchFromGitHub {
       owner = "KhronosGroup";
       repo = "Vulkan-ExtensionLayer";
       rev = "sdk-${version}";
-      hash = "sha256-8Z9w+3WFPYp8QKEUVkEQCGy9LXMWYlZDgGt8i34T5DU=";
+      hash = "sha256-NlBS7UuV2AZPY5VyoqTnTf63M7fHIPQDZRtMZ4XwMzA=";
     });
 
   nativeBuildInputs = [ cmake jq ];

From d9f6f43d2b4be0a324e05cd10902fde374570e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Fri, 16 Dec 2022 08:15:49 -0300
Subject: [PATCH 119/953] vulkan-tools-lunarg: 1.3.231.0 -> 1.3.236.0

---
 pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
index e8d3907251ba..11cef8eeb886 100644
--- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
@@ -11,6 +11,7 @@
 , libffi
 , libxcb
 , wayland
+, which
 , xcbutilkeysyms
 , xcbutilwm
 , vulkan-headers
@@ -23,18 +24,18 @@
 stdenv.mkDerivation rec {
   pname = "vulkan-tools-lunarg";
   # The version must match that in vulkan-headers
-  version = "1.3.231.0";
+  version = "1.3.236.0";
 
   src = (assert version == vulkan-headers.version;
     fetchFromGitHub {
       owner = "LunarG";
       repo = "VulkanTools";
       rev = "sdk-${version}";
-      hash = "sha256-qomhouuKVv4Dat9Sv7X68Dw6bRnaUjj6iEXC9pCqX4E=";
+      hash = "sha256-0dGD3InmEd9hO8+uVGMqBHXXfyX8tswyuOaZCftudz0=";
       fetchSubmodules = true;
     });
 
-  nativeBuildInputs = [ cmake python3 jq ];
+  nativeBuildInputs = [ cmake python3 jq which ];
 
   buildInputs = [
     expat

From 620c7eaeeeaed47156d51b04e50ea220614cfa62 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 16 Dec 2022 23:17:24 +0100
Subject: [PATCH 120/953] python310Packages.tomlkit: 0.11.4 -> 0.11.6

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

diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 6bd461db75a2..03ccef3a7832 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.4";
+  version = "0.11.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM=";
+    hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM=";
   };
 
   propagatedBuildInputs =
@@ -30,6 +30,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://github.com/sdispater/tomlkit";
+    changelog = "https://github.com/sdispater/tomlkit/blob/${version}/CHANGELOG.md";
     description = "Style-preserving TOML library for Python";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];

From 0e32191623d9827d58b627a9cb0f2a37756c77ff Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 6 Dec 2022 21:23:56 +0300
Subject: [PATCH 121/953] shadow: add tcb support

---
 pkgs/os-specific/linux/shadow/default.nix     |  8 ++++--
 .../linux/shadow/fix-install-with-tcb.patch   | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 9ba8984bb032..96dfd3b4bd8f 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt
 , libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell
 , libxcrypt, pam ? null, glibcCross ? null
+, withTcb ? stdenv.isLinux, tcb
 }:
 
 let
@@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libxcrypt ]
-    ++ lib.optional (pam != null && stdenv.isLinux) pam;
+    ++ lib.optional (pam != null && stdenv.isLinux) pam
+    ++ lib.optional withTcb tcb;
   nativeBuildInputs = [autoreconfHook libxslt libxml2
     docbook_xml_dtd_45 docbook_xsl flex bison itstool
     ];
@@ -34,6 +36,7 @@ stdenv.mkDerivation rec {
     # Obtain XML resources from XML catalog (patch adapted from gtk-doc)
     ./respect-xml-catalog-files-var.patch
     ./runtime-shell.patch
+    ./fix-install-with-tcb.patch
     # Fix HAVE_SHADOWGRP configure check
     (fetchpatch {
       url = "https://github.com/shadow-maint/shadow/commit/a281f241b592aec636d1b93a99e764499d68c7ef.patch";
@@ -64,7 +67,8 @@ stdenv.mkDerivation rec {
     "--with-group-name-max-length=32"
     "--with-bcrypt"
     "--with-yescrypt"
-  ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd";
+  ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"
+    ++ lib.optional withTcb "--with-tcb";
 
   preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc")
     ''
diff --git a/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch b/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch
new file mode 100644
index 000000000000..ff6166b92f1d
--- /dev/null
+++ b/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch
@@ -0,0 +1,28 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a1a2e4e..fa17f9d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap
+ endif
+ endif
+ 
+-if WITH_TCB
+-shadowsgidubins = passwd
+-endif
+-
+ LDADD          = $(INTLLIBS) \
+ 		 $(top_builddir)/libmisc/libmisc.la \
+ 		 $(top_builddir)/lib/libshadow.la \
+@@ -146,12 +142,6 @@ install-am: all-am
+ 	set -e; for i in $(suidusbins); do \
+ 		chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \
+ 	done
+-if WITH_TCB
+-	set -e; for i in $(shadowsgidubins); do \
+-		chown root:shadow $(DESTDIR)$(ubindir)/$$i; \
+-		chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \
+-	done
+-endif
+ if ENABLE_SUBIDS
+ if FCAPS
+ 	setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap

From 05046655d84faf0fc6031bf78a384160050a3fc0 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 17 Dec 2022 08:09:41 +0300
Subject: [PATCH 122/953] shadow: cleanup

---
 pkgs/os-specific/linux/shadow/default.nix | 67 ++++++++++++-----------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 96dfd3b4bd8f..2d0e60716290 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt
-, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell
-, libxcrypt, pam ? null, glibcCross ? null
+{ lib, stdenv, fetchFromGitHub
+, runtimeShell, nixosTests, fetchpatch
+, autoreconfHook, bison, flex
+, docbook_xml_dtd_45, docbook_xsl
+, itstool , libxml2, libxslt
+, libxcrypt
+, glibcCross ? null
+, pam ? null
 , withTcb ? stdenv.isLinux, tcb
 }:
-
 let
-
   glibc =
-    if stdenv.hostPlatform != stdenv.buildPlatform
-    then glibcCross
+    if stdenv.hostPlatform != stdenv.buildPlatform then glibcCross
     else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc;
 
 in
@@ -24,12 +26,19 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-L54DhdBYthfB9436t/XWXiqKhW7rfd0GLS7pYGB32rA=";
   };
 
+  outputs = [ "out" "su" "dev" "man" ];
+
+  RUNTIME_SHELL = runtimeShell;
+
+  nativeBuildInputs = [
+    autoreconfHook bison flex
+    docbook_xml_dtd_45 docbook_xsl
+    itstool libxml2 libxslt
+  ];
+
   buildInputs = [ libxcrypt ]
     ++ lib.optional (pam != null && stdenv.isLinux) pam
     ++ lib.optional withTcb tcb;
-  nativeBuildInputs = [autoreconfHook libxslt libxml2
-    docbook_xml_dtd_45 docbook_xsl flex bison itstool
-    ];
 
   patches = [
     ./keep-path.patch
@@ -44,16 +53,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  RUNTIME_SHELL = runtimeShell;
-
   # The nix daemon often forbids even creating set[ug]id files.
-  postPatch =
-    ''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
-    '';
-
-  outputs = [ "out" "su" "dev" "man" ];
-
-  enableParallelBuilding = true;
+  postPatch = ''
+    sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
+  '';
 
   # Assume System V `setpgrp (void)', which is the default on GNU variants
   # (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
@@ -70,21 +73,21 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"
     ++ lib.optional withTcb "--with-tcb";
 
-  preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc")
-    ''
-      substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
-    '';
+  preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
+    substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
+  '';
 
-  postInstall =
-    ''
-      # Don't install ‘groups’, since coreutils already provides it.
-      rm $out/bin/groups
-      rm $man/share/man/man1/groups.*
+  postInstall = ''
+    # Don't install ‘groups’, since coreutils already provides it.
+    rm $out/bin/groups
+    rm $man/share/man/man1/groups.*
 
-      # Move the su binary into the su package
-      mkdir -p $su/bin
-      mv $out/bin/su $su/bin
-    '';
+    # Move the su binary into the su package
+    mkdir -p $su/bin
+    mv $out/bin/su $su/bin
+  '';
+
+  enableParallelBuilding = true;
 
   disallowedReferences = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.shellPackage;
 

From 0b067316d40845426bc6f6dd44aa74c0b7f66028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Sat, 17 Dec 2022 12:55:44 +0100
Subject: [PATCH 123/953] stdenv: use `intersectAttrs` instead of
 `intersectLists`

Better complexity.
---
 pkgs/stdenv/generic/make-derivation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index db6d7e83f595..34bd70ad2624 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -483,7 +483,7 @@ else let
 
   checkedEnv =
     let
-      overlappingNames = lib.intersectLists (lib.attrNames env) (lib.attrNames derivationArg);
+      overlappingNames = lib.attrNames (builtins.intersectAttrs env derivationArg);
     in
     assert lib.assertMsg envIsExportable
       "When using structured attributes, `env` must be an attribute set of environment variables.";

From 428107f8376695a51c2eb1376ca968f781cf965f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 17 Dec 2022 22:21:07 +0000
Subject: [PATCH 124/953] stdenv: set `enableParallelBuilding` explicitly if
 `enableParallelBuildingByDefault` is set

Without the change we don't propagate `enableParallelBuilding = true`
and leave most builds sequential.

Noticed on `mythtv` package which did not specify parallelism and
`config.enableParallelBuildingByDefault = true` had no effect.
---
 pkgs/stdenv/generic/make-derivation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 34bd70ad2624..81fc31d67289 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -418,6 +418,7 @@ else let
       outputHashAlgo = attrs.outputHashAlgo or "sha256";
       outputHashMode = attrs.outputHashMode or "recursive";
     } // lib.optionalAttrs (enableParallelBuilding) {
+      inherit enableParallelBuilding;
       enableParallelChecking = attrs.enableParallelChecking or true;
     } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) {
       NIX_HARDENING_ENABLE = enabledHardeningOptions;

From d8b734f6a4658b004711c98370d673d6e6317be6 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 18 Dec 2022 13:02:10 +0000
Subject: [PATCH 125/953] pciutils: add trivial updater

---
 pkgs/tools/system/pciutils/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 66bcde737146..af49aaba8fb4 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -2,6 +2,7 @@
 , hwdata
 , static ? stdenv.hostPlatform.isStatic
 , IOKit
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
@@ -43,6 +44,12 @@ stdenv.mkDerivation rec {
     cp --reflink=auto ${hwdata}/share/hwdata/pci.ids $out/share/pci.ids
   '';
 
+  passthru.updateScript = gitUpdater {
+    # No nicer place to find latest release.
+    url = "https://github.com/pciutils/pciutils.git";
+    rev-prefix = "v";
+  };
+
   meta = with lib; {
     homepage = "https://mj.ucw.cz/sw/pciutils/";
     description = "A collection of programs for inspecting and manipulating configuration of PCI devices";

From 21337279c1478c3660b9be1fd05c2a27a60ff962 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 18 Dec 2022 13:04:38 +0000
Subject: [PATCH 126/953] pciutils: 3.8.0 -> 3.9.0

Changes: https://github.com/pciutils/pciutils/compare/v3.8.0...v3.9.0
---
 pkgs/tools/system/pciutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index af49aaba8fb4..9b0b09066438 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pciutils";
-  version = "3.8.0"; # with release-date database
+  version = "3.9.0"; # with release-date database
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/pciutils-${version}.tar.xz";
-    sha256 = "sha256-ke29BCmoRwXJrRVtT/OMzHJNQepUxMW4jjjplvijTwU=";
+    sha256 = "sha256-zep66XI53uIySaCcaKGaKHo/EJ++ssIy67YWyzhZkBI=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 73e6d3ed00b6452eb55cc7f9c40c00c6deba0320 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 18 Dec 2022 13:28:51 +0000
Subject: [PATCH 127/953] xz: 5.2.9 -> 5.4.0

Changes: https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;hb=HEAD

While at it fixed the updater to pick single first (most recent)
version.
---
 pkgs/tools/compression/xz/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index abc19356c950..59f1901bd9fd 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xz";
-  version = "5.2.9";
+  version = "5.4.0";
 
   src = fetchurl {
     url = "https://tukaani.org/xz/xz-${version}.tar.bz2";
-    sha256 = "sZRQf7o6Rip1PFUxSczaoWgze8t97v3dBnuph8g9/OY=";
+    sha256 = "eV6gSUxm1QmwUt3DbcY71jTln/Kg85wWo7VkTdAdh+Y=";
   };
 
   strictDeps = true;
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
       # Expect the text in format of '>xz-5.2.6.tar.bz2</a>'
       # We pick first match where a stable release goes first.
       new_version="$(curl -s https://tukaani.org/xz/ |
-          pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]bz2</a>')"
+          pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]bz2</a>' |
+          head -n1)"
       update-source-version ${pname} "$new_version"
     '';
   };

From d1e7498dbbc7d8fe5419110aa1f1fe57ffb8d1d8 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 16 Dec 2022 23:17:11 +0100
Subject: [PATCH 128/953] commitizen: 2.37.0 -> 2.38.0

---
 pkgs/applications/version-management/commitizen/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix
index 3c0cf0ecec04..115912f71a3b 100644
--- a/pkgs/applications/version-management/commitizen/default.nix
+++ b/pkgs/applications/version-management/commitizen/default.nix
@@ -18,17 +18,18 @@
 , typing-extensions
 , argcomplete
 , nix-update-script
+, pre-commit
 }:
 
 buildPythonApplication rec {
   pname = "commitizen";
-  version = "2.37.0";
+  version = "2.38.0";
 
   src = fetchFromGitHub {
     owner = "commitizen-tools";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-wo1I6QDWLxByHISmkPdass+BcKh0oxR5hD31UN/5+WQ=";
+    hash = "sha256-Fri5WdLfDCn3NOtCGneKnAN+eOkLAJgPYBR+WBmc/bo=";
     deepClone = true;
   };
 
@@ -52,6 +53,7 @@ buildPythonApplication rec {
   doCheck = true;
 
   checkInputs = [
+    pre-commit
     pytestCheckHook
     pytest-freezegun
     pytest-mock

From 61ac4200206f23026e198aa98779f28ae05ba389 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 18 Dec 2022 02:02:35 -0600
Subject: [PATCH 129/953] sphinx-automodapi: fix tests

---
 pkgs/development/python-modules/sphinx-automodapi/default.nix | 3 +++
 pkgs/top-level/python-packages.nix                            | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix
index c8b586d0fc6e..9145cc416e79 100644
--- a/pkgs/development/python-modules/sphinx-automodapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix
@@ -36,6 +36,9 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace "sphinx_automodapi/tests/helpers.py" \
       --replace '[0]), None)' "[0]), (None, '${testInventory}'))"
+
+    substituteInPlace "sphinx_automodapi/tests/test_cases.py" \
+      --replace '[0]), None)' "[0]), (None, '${testInventory}'))"
   '';
 
   checkInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 077c04a8c2f1..b01fe6539998 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10571,7 +10571,9 @@ self: super: with self; {
 
   spinners = callPackage ../development/python-modules/spinners { };
 
-  sphinx-automodapi = callPackage ../development/python-modules/sphinx-automodapi { };
+  sphinx-automodapi = callPackage ../development/python-modules/sphinx-automodapi {
+    graphviz = pkgs.graphviz;
+  };
 
   sphinx-better-theme = callPackage ../development/python-modules/sphinx-better-theme { };
 

From 7f864b4a32f0c556e85400d6b0a7659576c48045 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 11 Dec 2022 20:28:53 -0600
Subject: [PATCH 130/953] lit: 14.0.0 -> 15.0.6

---
 pkgs/development/tools/misc/lit/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
index aa991e8ea978..5a255df46806 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -2,11 +2,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "lit";
-  version = "14.0.0";
+  version = "15.0.6";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "45e08ce87b0ea56ab632aa02fa857418a5dd241a711c7c756878b73a130c3efe";
+    hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k=";
   };
 
   passthru = {
@@ -14,6 +14,9 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   # Non-standard test suite. Needs custom checkPhase.
+  # Needs LLVM's `FileCheck` and `not`: `$out/bin/lit tests`
+  # There should be `llvmPackages.lit` since older LLVM versions may
+  # have the possibility of not correctly interfacing with newer lit versions
   doCheck = false;
 
   meta = {

From 8be466f7444daaef4d308a46dae2671c006a9cdb Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Mon, 12 Dec 2022 04:42:41 -0600
Subject: [PATCH 131/953] spirv-llvm-translator: allow rocm versioning

---
 .../compilers/spirv-llvm-translator/default.nix    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix
index 971b3e8399df..052df63aecb0 100644
--- a/pkgs/development/compilers/spirv-llvm-translator/default.nix
+++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix
@@ -10,12 +10,14 @@
 
 let
   llvmMajor = lib.versions.major llvm.version;
+  isROCm = lib.hasPrefix "rocm" llvm.pname;
 
+  # ROCm will always be at the latest version
   branch =
-    if llvmMajor == "15" then rec {
+    if llvmMajor == "15" || isROCm then rec {
       version = "15.0.0";
       rev = "v${version}";
-      hash = "sha256-111yL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
+      hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";
     } else if llvmMajor == "14" then rec{
       version = "14.0.0";
       rev = "v${version}";
@@ -36,15 +38,17 @@ stdenv.mkDerivation {
     inherit (branch) rev hash;
   };
 
-  nativeBuildInputs = [ pkg-config cmake llvm.dev spirv-tools ];
+  nativeBuildInputs = [ pkg-config cmake spirv-tools ]
+    ++ (if isROCm then [ llvm ] else [ llvm.dev ]);
 
-  buildInputs = [ spirv-headers llvm ];
+  buildInputs = [ spirv-headers ]
+    ++ lib.optionals (!isROCm) [ llvm ];
 
   checkInputs = [ lit ];
 
   cmakeFlags = [
     "-DLLVM_INCLUDE_TESTS=ON"
-    "-DLLVM_DIR=${llvm.dev}"
+    "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}"
     "-DBUILD_SHARED_LIBS=YES"
     "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
     # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/

From 3b271b7ebc25648daa08997e7758dad11e321d21 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Mon, 12 Dec 2022 16:50:22 -0600
Subject: [PATCH 132/953] python3Packages: sphinx-markdown-tables: init at
 0.0.17

---
 .../sphinx-markdown-tables/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinx-markdown-tables/default.nix

diff --git a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix
new file mode 100644
index 000000000000..55fb0b41f43e
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, sphinx
+, markdown
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-markdown-tables";
+  version = "0.0.17";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-a8bT1ADqzP7r0ohEa8CN2DCDNnxYuF1A/mwS1371kvE=";
+  };
+
+  propagatedBuildInputs = [
+    sphinx
+    markdown
+  ];
+
+  pythonImportsCheck = [ "sphinx_markdown_tables" ];
+
+  meta = with lib; {
+    description = "Sphinx extension for rendering tables written in markdown";
+    homepage = "https://github.com/ryanfox/sphinx-markdown-tables";
+    maintainers = with maintainers; [ Madouura ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b01fe6539998..b14d5cd23b8b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10679,6 +10679,8 @@ self: super: with self; {
 
   sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { };
 
+  sphinx-markdown-tables = callPackage ../development/python-modules/sphinx-markdown-tables { };
+
   sphinx-material = callPackage ../development/python-modules/sphinx-material { };
 
   sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { };

From 0ee533a8e00d7131b7a7d5d6d5f605f18af07426 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sat, 10 Dec 2022 13:31:55 -0600
Subject: [PATCH 133/953] rocm-llvm: rewrite and separate

---
 .../compilers/llvm/rocm/0000-fix-openmp.patch |  18 +
 .../compilers/llvm/rocm/default.nix           | 620 ++++++++++++++++--
 pkgs/development/compilers/llvm/rocm/llvm.nix | 202 ++++--
 pkgs/top-level/all-packages.nix               |   1 +
 4 files changed, 737 insertions(+), 104 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch

diff --git a/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch b/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch
new file mode 100644
index 000000000000..2811df7d29f7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch
@@ -0,0 +1,18 @@
+diff --git a/libomptarget/plugins/amdgpu/impl/impl.cpp b/libomptarget/plugins/amdgpu/impl/impl.cpp
+index 80e024789..3a14e0889 100644
+--- a/libomptarget/plugins/amdgpu/impl/impl.cpp
++++ b/libomptarget/plugins/amdgpu/impl/impl.cpp
+@@ -21,10 +21,11 @@ bool is_locked(void *ptr, hsa_status_t *err_p, void **agentBaseAddress) {
+   info.size = sizeof(hsa_amd_pointer_info_t);
+   err = hsa_amd_pointer_info(ptr, &info, nullptr, nullptr, nullptr);
+ 
+-  if (err != HSA_STATUS_SUCCESS)
++  if (err != HSA_STATUS_SUCCESS) {
+     DP("Error when getting pointer info\n");
+-  else
++  } else {
+     is_locked = (info.type == HSA_EXT_POINTER_TYPE_LOCKED);
++  }
+ 
+   if (is_locked && agentBaseAddress != nullptr) {
+     // When user passes in a basePtr+offset we need to fix the
diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix
index 7ff3c4bfa110..4f96c567a631 100644
--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,54 +1,600 @@
-{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }:
+{ lib
+, stdenv
+, callPackage
+, overrideCC
+, wrapCCWith
+, wrapBintoolsWith
+, runCommand
+, lit
+, glibc
+, spirv-llvm-translator
+, xz
+, swig
+, lua5_3
+, gtest
+, hipcc
+, rocm-comgr
+, vulkan-loader
+, vulkan-headers
+, glslang
+, shaderc
+, perl
+, rocm-device-libs
+, rocm-runtime
+, elfutils
+, python3Packages
+}:
 
 let
-  version = "5.4.0";
-  src = fetchFromGitHub {
-    owner = "RadeonOpenCompute";
-    repo = "llvm-project";
-    rev = "rocm-${version}";
-    hash = "sha256-rlVo77h344PLGj/mIzsw+/ndWywsBsiKDXsEDpWSUno=";
+  # Stage 1
+  # Base
+  llvm = callPackage ./llvm.nix { };
+
+  # Projects
+  clang-unwrapped = callPackage ./llvm.nix rec {
+    targetName = "clang";
+    targetDir = targetName;
+    extraBuildInputs = [ llvm ];
+
+    extraCMakeFlags = [
+      "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW"
+      "-DCLANG_INCLUDE_DOCS=ON"
+      "-DCLANG_INCLUDE_TESTS=ON"
+    ];
+
+    extraPostPatch = ''
+      # Looks like they forgot to add finding libedit to the standalone build
+      ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules
+
+      substituteInPlace CMakeLists.txt \
+        --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)"
+
+      # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'`
+      rm test/Analysis/scan-build/*.test
+      rm test/Analysis/scan-build/rebuild_index/rebuild_index.test
+
+      # `does not depend on a module exporting 'baz.h'`
+      rm test/Modules/header-attribs.cpp
+
+      # `fatal error: 'stdio.h' file not found`
+      rm test/OpenMP/amdgcn_emit_llvm.c
+    '';
+
+    extraPostInstall = ''
+      mv bin/clang-tblgen $out/bin
+    '';
   };
+
+  lld = callPackage ./llvm.nix rec {
+    buildMan = false; # No man pages to build
+    targetName = "lld";
+    targetDir = targetName;
+    extraBuildInputs = [ llvm ];
+    extraCMakeFlags = [ "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" ];
+    checkTargets = [ "check-lld" ];
+  };
+
+  # Runtimes
+  runtimes = callPackage ./llvm.nix {
+    buildDocs = false;
+    buildMan = false;
+    buildTests = false;
+    targetDir = "runtimes";
+
+    targetRuntimes = [
+      # "libc" https://github.com/llvm/llvm-project/issues/57719
+      "libunwind"
+      "libcxxabi"
+      "libcxx"
+      "compiler-rt"
+    ];
+
+    extraBuildInputs = [ llvm ];
+
+    extraCMakeFlags = [
+      "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW"
+      "-DLIBCXX_INCLUDE_BENCHMARKS=OFF"
+      "-DLIBCXX_CXX_ABI=libcxxabi"
+    ];
+
+    extraLicenses = [ lib.licenses.mit ];
+  };
+
+  # Stage 2
+  # Helpers
+  rStdenv = overrideCC stdenv (wrapCCWith rec {
+    inherit bintools;
+    libcxx = runtimes;
+    cc = clang-unwrapped;
+
+    extraPackages = [
+      llvm
+      lld
+    ];
+
+    nixSupport.cc-cflags = [
+      "-resource-dir=$out/resource-root"
+      "-fuse-ld=lld"
+      "-rtlib=compiler-rt"
+      "-unwindlib=libunwind"
+      "-Wno-unused-command-line-argument"
+    ];
+
+    extraBuildCommands = ''
+      clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"`
+      mkdir -p $out/resource-root
+      ln -s ${cc}/lib/clang/$clang_version/include $out/resource-root
+      ln -s ${runtimes}/lib $out/resource-root
+    '';
+  });
+
+  bintools = wrapBintoolsWith { bintools = bintools-unwrapped; };
+
+  bintools-unwrapped = runCommand "rocm-llvm-binutils-${llvm.version}" { preferLocalBuild = true; } ''
+    mkdir -p $out/bin
+
+    for prog in ${lld}/bin/*; do
+      ln -s $prog $out/bin/$(basename $prog)
+    done
+
+    for prog in ${llvm}/bin/*; do
+      ln -sf $prog $out/bin/$(basename $prog)
+    done
+
+    ln -s ${llvm}/bin/llvm-ar $out/bin/ar
+    ln -s ${llvm}/bin/llvm-as $out/bin/as
+    ln -s ${llvm}/bin/llvm-dwp $out/bin/dwp
+    ln -s ${llvm}/bin/llvm-nm $out/bin/nm
+    ln -s ${llvm}/bin/llvm-objcopy $out/bin/objcopy
+    ln -s ${llvm}/bin/llvm-objdump $out/bin/objdump
+    ln -s ${llvm}/bin/llvm-ranlib $out/bin/ranlib
+    ln -s ${llvm}/bin/llvm-readelf $out/bin/readelf
+    ln -s ${llvm}/bin/llvm-size $out/bin/size
+    ln -s ${llvm}/bin/llvm-strip $out/bin/strip
+    ln -s ${lld}/bin/lld $out/bin/ld
+  '';
 in rec {
+  inherit
+  llvm
+  clang-unwrapped
+  lld
+  bintools
+  bintools-unwrapped;
+
+  # Runtimes
+  libc = callPackage ./llvm.nix rec {
+    stdenv = rStdenv;
+    targetName = "libc";
+    targetDir = "runtimes";
+    targetRuntimes = [ targetName ];
+    isBroken = true; # https://github.com/llvm/llvm-project/issues/57719
+  };
+
+  libunwind = callPackage ./llvm.nix rec {
+    stdenv = rStdenv;
+    buildMan = false; # No man pages to build
+    targetName = "libunwind";
+    targetDir = "runtimes";
+    targetRuntimes = [ targetName ];
+
+    extraCMakeFlags = [
+      "-DLIBUNWIND_INCLUDE_DOCS=ON"
+      "-DLIBUNWIND_INCLUDE_TESTS=ON"
+      "-DLIBUNWIND_USE_COMPILER_RT=ON"
+    ];
+  };
+
+  libcxxabi = callPackage ./llvm.nix rec {
+    stdenv = rStdenv;
+    buildDocs = false; # No documentation to build
+    buildMan = false; # No man pages to build
+    targetName = "libcxxabi";
+    targetDir = "runtimes";
+
+    targetRuntimes = [
+      "libunwind"
+      targetName
+      "libcxx"
+    ];
+
+    extraCMakeFlags = [
+      "-DLIBCXXABI_INCLUDE_TESTS=ON"
+      "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
+      "-DLIBCXXABI_USE_COMPILER_RT=ON"
+
+      # Workaround having to build combined
+      "-DLIBUNWIND_INCLUDE_DOCS=OFF"
+      "-DLIBUNWIND_INCLUDE_TESTS=OFF"
+      "-DLIBUNWIND_USE_COMPILER_RT=ON"
+      "-DLIBUNWIND_INSTALL_LIBRARY=OFF"
+      "-DLIBUNWIND_INSTALL_HEADERS=OFF"
+      "-DLIBCXX_INCLUDE_DOCS=OFF"
+      "-DLIBCXX_INCLUDE_TESTS=OFF"
+      "-DLIBCXX_USE_COMPILER_RT=ON"
+      "-DLIBCXX_CXX_ABI=libcxxabi"
+      "-DLIBCXX_INSTALL_LIBRARY=OFF"
+      "-DLIBCXX_INSTALL_HEADERS=OFF"
+    ];
+  };
+
+  libcxx = callPackage ./llvm.nix rec {
+    stdenv = rStdenv;
+    buildMan = false; # No man pages to build
+    targetName = "libcxx";
+    targetDir = "runtimes";
+
+    targetRuntimes = [
+      "libunwind"
+      "libcxxabi"
+      targetName
+    ];
+
+    extraCMakeFlags = [
+      "-DLIBCXX_INCLUDE_DOCS=ON"
+      "-DLIBCXX_INCLUDE_TESTS=ON"
+      "-DLIBCXX_USE_COMPILER_RT=ON"
+      "-DLIBCXX_CXX_ABI=libcxxabi"
+
+      # Workaround having to build combined
+      "-DLIBUNWIND_INCLUDE_DOCS=OFF"
+      "-DLIBUNWIND_INCLUDE_TESTS=OFF"
+      "-DLIBUNWIND_USE_COMPILER_RT=ON"
+      "-DLIBUNWIND_INSTALL_LIBRARY=OFF"
+      "-DLIBUNWIND_INSTALL_HEADERS=OFF"
+      "-DLIBCXXABI_INCLUDE_TESTS=OFF"
+      "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
+      "-DLIBCXXABI_USE_COMPILER_RT=ON"
+      "-DLIBCXXABI_INSTALL_LIBRARY=OFF"
+      "-DLIBCXXABI_INSTALL_HEADERS=OFF"
+    ];
+
+    # Most of these can't find `bash` or `mkdir`, might just be hard-coded paths, or PATH is altered
+    extraPostPatch = ''
+      chmod +w -R ../libcxx/test/{libcxx,std}
+      rm -rf ../libcxx/test/libcxx/input.output/filesystems
+      rm ../libcxx/test/libcxx/selftest/remote-substitutions.sh.cpp
+      rm ../libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp
+      rm ../libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp
+      rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace_initializer_list.pass.cpp
+      rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp
+      rm -rf ../libcxx/test/std/utilities/optional/optional.object/optional.object.ctor
+      rm -rf ../libcxx/test/std/input.output/filesystems/{class.directory_entry,class.directory_iterator,class.rec.dir.itr,fs.op.funcs}
+    '';
+  };
+
+  compiler-rt = callPackage ./llvm.nix rec {
+    stdenv = rStdenv;
+    buildDocs = false; # No documentation to build
+    buildMan = false; # No man pages to build
+    targetName = "compiler-rt";
+    targetDir = "runtimes";
+
+    targetRuntimes = [
+      "libunwind"
+      "libcxxabi"
+      "libcxx"
+      targetName
+    ];
+
+    extraCMakeFlags = [
+      "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW"
+      "-DCOMPILER_RT_INCLUDE_TESTS=ON"
+      "-DCOMPILER_RT_USE_LLVM_UNWINDER=ON"
+      "-DCOMPILER_RT_CXX_LIBRARY=libcxx"
+      "-DCOMPILER_RT_CAN_EXECUTE_TESTS=OFF" # We can't run most of these
+
+      # Workaround having to build combined
+      "-DLIBUNWIND_INCLUDE_DOCS=OFF"
+      "-DLIBUNWIND_INCLUDE_TESTS=OFF"
+      "-DLIBUNWIND_USE_COMPILER_RT=ON"
+      "-DLIBUNWIND_INSTALL_LIBRARY=OFF"
+      "-DLIBUNWIND_INSTALL_HEADERS=OFF"
+      "-DLIBCXXABI_INCLUDE_TESTS=OFF"
+      "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
+      "-DLIBCXXABI_USE_COMPILER_RT=ON"
+      "-DLIBCXXABI_INSTALL_LIBRARY=OFF"
+      "-DLIBCXXABI_INSTALL_HEADERS=OFF"
+      "-DLIBCXX_INCLUDE_DOCS=OFF"
+      "-DLIBCXX_INCLUDE_TESTS=OFF"
+      "-DLIBCXX_USE_COMPILER_RT=ON"
+      "-DLIBCXX_CXX_ABI=libcxxabi"
+      "-DLIBCXX_INSTALL_LIBRARY=OFF"
+      "-DLIBCXX_INSTALL_HEADERS=OFF"
+    ];
+
+    extraPostPatch = ''
+      # `No such file or directory: 'ldd'`
+      substituteInPlace ../compiler-rt/test/lit.common.cfg.py \
+        --replace "'ldd'," "'${glibc.bin}/bin/ldd',"
+
+      # We can run these
+      substituteInPlace ../compiler-rt/test/CMakeLists.txt \
+        --replace "endfunction()" "endfunction()''\nadd_subdirectory(builtins)''\nadd_subdirectory(shadowcallstack)"
+    '';
+
+    extraLicenses = [ lib.licenses.mit ];
+  };
+
+  # Stage 3
+  # Helpers
+  rocmClangStdenv = overrideCC stdenv clang;
+
   clang = wrapCCWith rec {
-    cc = llvm;
+    # inherit libc libcxx bintools;
+    inherit libcxx bintools;
+
+    # We do this to avoid HIP pathing problems, and mimic a monolithic install
+    cc = stdenv.mkDerivation (finalAttrs: {
+      inherit (clang-unwrapped) pname version;
+      dontUnpack = true;
+
+      installPhase = ''
+        runHook preInstall
+
+        clang_version=`${clang-unwrapped}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"`
+        mkdir -p $out/{bin,include/c++/v1,lib/{cmake,clang/$clang_version/{include,lib}},libexec,share}
+
+        for path in ${llvm} ${clang-unwrapped} ${lld} ${libunwind} ${libcxxabi} ${libcxx} ${compiler-rt}; do
+          cp -as $path/* $out
+          chmod +w $out/{*,include/c++/v1,lib/{clang/$clang_version/include,cmake}}
+          rm -f $out/lib/libc++.so
+        done
+
+        ln -s $out/lib/* $out/lib/clang/$clang_version/lib
+        ln -s $out/include/* $out/lib/clang/$clang_version/include
+
+        runHook postInstall
+      '';
+
+      passthru.isClang = true;
+    });
+
+    extraPackages = [
+      llvm
+      lld
+      libunwind
+      libcxxabi
+      compiler-rt
+    ];
+
+    nixSupport.cc-cflags = [
+      "-resource-dir=$out/resource-root"
+      "-fuse-ld=lld"
+      "-rtlib=compiler-rt"
+      "-unwindlib=libunwind"
+      "-Wno-unused-command-line-argument"
+    ];
+
     extraBuildCommands = ''
       clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"`
-      rsrc="$out/resource-root"
-      mkdir "$rsrc"
-      ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc"
-      ln -s "${cc}/lib/clang/$clang_version/lib" "$rsrc/lib"
-      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-      echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags
+      mkdir -p $out/resource-root
+      ln -s ${cc}/lib/clang/$clang_version/{include,lib} $out/resource-root
+
+      # Not sure why, but hardening seems to make things break
       rm $out/nix-support/add-hardening.sh
       touch $out/nix-support/add-hardening.sh
-      # GPU compilation uses builtin lld
-      substituteInPlace $out/bin/clang \
-        --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;'
-      substituteInPlace $out/bin/clang++ \
-        --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;'
+
+      # GPU compilation uses builtin `lld`
+      substituteInPlace $out/bin/{clang,clang++} \
+        --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;"
     '';
   };
 
-  clangNoCompilerRt = wrapCCWith rec {
-    cc = llvm;
-    extraBuildCommands = ''
-      clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"`
-      rsrc="$out/resource-root"
-      mkdir "$rsrc"
-      ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc"
-      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-      echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags
-      rm $out/nix-support/add-hardening.sh
-      touch $out/nix-support/add-hardening.sh
-      # GPU compilation uses builtin lld
-      substituteInPlace $out/bin/clang \
-        --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;'
-      substituteInPlace $out/bin/clang++ \
-        --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;'
+  # Base
+  # Unfortunately, we cannot build `clang-tools-extra` separately.
+  clang-tools-extra = callPackage ./llvm.nix {
+    stdenv = rocmClangStdenv;
+    buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream<char>' and 'const llvm::StringRef')`
+    targetName = "clang-tools-extra";
+
+    targetProjects = [
+      "clang"
+      "clang-tools-extra"
+    ];
+
+    extraBuildInputs = [ gtest ];
+
+    extraCMakeFlags = [
+      "-DLLVM_INCLUDE_DOCS=OFF"
+      "-DLLVM_INCLUDE_TESTS=OFF"
+      "-DCLANG_INCLUDE_DOCS=OFF"
+      "-DCLANG_INCLUDE_TESTS=ON"
+      "-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON"
+    ];
+
+    extraPostInstall = ''
+      # Remove LLVM and Clang
+      for path in `find ${llvm} ${clang-unwrapped}`; do
+        if [ $path != ${llvm} ] && [ $path != ${clang-unwrapped} ]; then
+          rm -f $out''${path#${llvm}} $out''${path#${clang-unwrapped}} || true
+        fi
+      done
+
+      # Cleanup empty directories
+      find $out -type d -empty -delete
     '';
   };
 
-  llvm = callPackage ./llvm.nix {
-    inherit src version;
+  # Projects
+  libclc = let
+    spirv = (spirv-llvm-translator.override { inherit llvm; });
+  in callPackage ./llvm.nix rec {
+    stdenv = rocmClangStdenv;
+    buildDocs = false; # No documentation to build
+    buildMan = false; # No man pages to build
+    targetName = "libclc";
+    targetDir = targetName;
+    extraBuildInputs = [ spirv ];
+
+    # `spirv-mesa3d` isn't compiling with LLVM 15.0.0, it does with LLVM 14.0.0
+    # Try removing the `spirv-mesa3d` and `clspv` patches next update
+    # `clspv` tests fail, unresolved calls
+    extraPostPatch = ''
+      substituteInPlace CMakeLists.txt \
+        --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \
+          "find_program( LLVM_CLANG clang PATHS \"${clang}/bin\" NO_DEFAULT_PATH )" \
+        --replace "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \
+          "find_program( LLVM_SPIRV llvm-spirv PATHS \"${spirv}/bin\" NO_DEFAULT_PATH )" \
+        --replace "  spirv-mesa3d-" "" \
+        --replace "  spirv64-mesa3d-" "" \
+        --replace "NOT \''${t} MATCHES" \
+          "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES"
+    '';
+
+    checkTargets = [ ];
+  };
+
+  lldb = callPackage ./llvm.nix rec {
+    stdenv = rocmClangStdenv;
+    buildTests = false; # ld.lld: error: unable to find library -lllvm_gtest_main
+    targetName = "lldb";
+    targetDir = targetName;
+    extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ];
+
+    extraBuildInputs = [
+      xz
+      swig
+      lua5_3
+      gtest
+    ];
+
+    extraCMakeFlags = [
+      "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped"
+      "-DLLDB_INCLUDE_TESTS=ON"
+      "-DLLDB_INCLUDE_UNITTESTS=ON"
+    ];
+  };
+
+  mlir = callPackage ./llvm.nix rec {
+    stdenv = rocmClangStdenv;
+    buildDocs = false; # No decent way to hack this to work
+    buildMan = false; # No man pages to build
+    targetName = "mlir";
+    targetDir = targetName;
+    extraNativeBuildInputs = [ hipcc ];
+
+    extraBuildInputs = [
+      rocm-comgr
+      vulkan-headers
+      vulkan-loader
+      glslang
+      shaderc
+    ];
+
+    extraCMakeFlags = [
+      "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW"
+      "-DMLIR_INCLUDE_DOCS=ON"
+      "-DMLIR_INCLUDE_TESTS=ON"
+      "-DMLIR_ENABLE_ROCM_RUNNER=ON"
+      "-DMLIR_ENABLE_SPIRV_CPU_RUNNER=ON"
+      "-DMLIR_ENABLE_VULKAN_RUNNER=ON"
+      "-DROCM_TEST_CHIPSET=gfx000" # CPU runner
+    ];
+
+    extraPostPatch = ''
+      chmod +w ../llvm
+      mkdir -p ../llvm/build/bin
+      ln -s ${lit}/bin/lit ../llvm/build/bin/llvm-lit
+
+      substituteInPlace test/CMakeLists.txt \
+        --replace "FileCheck count not" "" \
+        --replace "list(APPEND MLIR_TEST_DEPENDS mlir_rocm_runtime)" ""
+
+      substituteInPlace lib/ExecutionEngine/CMakeLists.txt \
+        --replace "return()" ""
+
+      # Remove problematic tests
+      rm test/CAPI/execution_engine.c
+      rm test/Target/LLVMIR/llvmir-intrinsics.mlir
+      rm test/Target/LLVMIR/llvmir.mlir
+      rm test/Target/LLVMIR/openmp-llvm.mlir
+      rm test/mlir-cpu-runner/*.mlir
+      rm test/mlir-vulkan-runner/*.mlir
+    '';
+
+    extraPostInstall = ''
+      mkdir -p $out/bin
+      mv bin/mlir-tblgen $out/bin
+    '';
+
+    checkTargets = [ "check-${targetName}" ];
+  };
+
+  polly = callPackage ./llvm.nix rec {
+    stdenv = rocmClangStdenv;
+    targetName = "polly";
+    targetDir = targetName;
+    checkTargets = [ "check-${targetName}" ];
+  };
+
+  flang = callPackage ./llvm.nix rec {
+    stdenv = rocmClangStdenv;
+    buildTests = false; # `Executable "flang1" doesn't exist!`
+    targetName = "flang";
+    targetDir = targetName;
+    extraNativeBuildInputs = [ python3Packages.sphinx-markdown-tables ];
+    extraBuildInputs = [ mlir ];
+
+    extraCMakeFlags = [
+      "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW"
+      "-DCLANG_DIR=${clang-unwrapped}/lib/cmake/clang"
+      "-DFLANG_INCLUDE_TESTS=OFF"
+      "-DMLIR_TABLEGEN_EXE=${mlir}/bin/mlir-tblgen"
+    ];
+
+    extraPostPatch = ''
+      substituteInPlace test/CMakeLists.txt \
+        --replace "FileCheck" "" \
+        --replace "count" "" \
+        --replace "not" ""
+
+      substituteInPlace docs/CMakeLists.txt \
+        --replace "CLANG_TABLEGEN_EXE clang-tblgen" "CLANG_TABLEGEN_EXE ${clang-unwrapped}/bin/clang-tblgen"
+    '';
+  };
+
+  openmp = callPackage ./llvm.nix rec {
+    stdenv = rocmClangStdenv;
+    buildTests = false; # Too many failures, most pass
+    targetName = "openmp";
+    targetDir = targetName;
+    extraPatches = [ ./0000-fix-openmp.patch ];
+    extraNativeBuildInputs = [ perl ];
+
+    extraBuildInputs = [
+      rocm-device-libs
+      rocm-runtime
+      elfutils
+    ];
+
+    extraCMakeFlags = [
+      "-DCMAKE_MODULE_PATH=/build/source/llvm/cmake/modules" # For docs
+      "-DCLANG_TOOL=${clang}/bin/clang"
+      "-DCLANG_OFFLOAD_BUNDLER_TOOL=${clang-unwrapped}/bin/clang-offload-bundler"
+      "-DOPENMP_LLVM_TOOLS_DIR=${llvm}/bin"
+      "-DOPENMP_LLVM_LIT_EXECUTABLE=${lit}/bin/.lit-wrapped"
+      "-DDEVICELIBS_ROOT=${rocm-device-libs.src}"
+    ];
+
+    extraPostPatch = ''
+      # We can't build this target at the moment
+      substituteInPlace libomptarget/DeviceRTL/CMakeLists.txt \
+        --replace "gfx1010" ""
+    '';
+
+    checkTargets = [ "check-${targetName}" ];
+    extraLicenses = [ lib.licenses.mit ];
+  };
+
+  # Runtimes
+  pstl = callPackage ./llvm.nix rec {
+    stdenv = rocmClangStdenv;
+    buildDocs = false; # No documentation to build
+    buildMan = false; # No man pages to build
+    buildTests = false; # Too many errors
+    targetName = "pstl";
+    targetDir = "runtimes";
+    targetRuntimes = [ targetName ];
+    checkTargets = [ "check-${targetName}" ];
   };
 }
diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix
index b148b936ca56..82aee79cfe4a 100644
--- a/pkgs/development/compilers/llvm/rocm/llvm.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm.nix
@@ -1,22 +1,44 @@
-{ stdenv
-, lib
-, fetchgit
+{ lib
+, stdenv
 , fetchFromGitHub
-, writeScript
+, rocmUpdateScript
+, pkg-config
 , cmake
 , ninja
-, python3
+, git
+, doxygen
+, sphinx
+, lit
 , libxml2
-, libffi
-, libbfd
 , libxcrypt
-, ncurses
+, libedit
+, libffi
+, mpfr
 , zlib
-, debugVersion ? false
-, enableManpages ? false
-
-, version
-, src
+, ncurses
+, python3Packages
+, buildDocs ? true
+, buildMan ? true
+, buildTests ? true
+, targetName ? "llvm"
+, targetDir ? "llvm"
+, targetProjects ? [ ]
+, targetRuntimes ? [ ]
+, extraPatches ? [ ]
+, extraNativeBuildInputs ? [ ]
+, extraBuildInputs ? [ ]
+, extraCMakeFlags ? [ ]
+, extraPostPatch ? ""
+, checkTargets ? [(
+  lib.optionalString buildTests (
+    if targetDir == "runtimes"
+    then "check-runtimes"
+    else "check-all"
+  )
+)]
+, extraPostInstall ? ""
+, extraLicenses ? [ ]
+, isBroken ? false
 }:
 
 let
@@ -25,73 +47,119 @@ let
     else if stdenv.isAarch64 then "AArch64"
     else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
-  inherit src version;
+  pname = "rocm-llvm-${targetName}";
+  version = "5.4.0";
 
-  pname = "rocm-llvm";
-
-  sourceRoot = "${src.name}/llvm";
-
-  nativeBuildInputs = [ cmake ninja python3 ];
-
-  buildInputs = [ libxml2 libxcrypt ];
-
-  propagatedBuildInputs = [ ncurses zlib ];
-
-  cmakeFlags = with stdenv; [
-    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
-    "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
-    "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
-    "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt"
-  ]
-  ++ lib.optionals enableManpages [
-    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
-    "-DLLVM_BUILD_DOCS=ON"
-    "-DLLVM_ENABLE_SPHINX=ON"
-    "-DSPHINX_OUTPUT_MAN=ON"
-    "-DSPHINX_OUTPUT_HTML=OFF"
-    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildDocs [
+    "doc"
+  ] ++ lib.optionals buildMan [
+    "man"
+    "info" # Avoid `attribute 'info' missing` when using with wrapCC
   ];
 
-  postPatch = ''
+  patches = extraPatches;
+
+  src = fetchFromGitHub {
+    owner = "RadeonOpenCompute";
+    repo = "llvm-project";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-rlVo77h344PLGj/mIzsw+/ndWywsBsiKDXsEDpWSUno=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    ninja
+    git
+    python3Packages.python
+  ] ++ lib.optionals (buildDocs || buildMan) [
+    doxygen
+    sphinx
+    python3Packages.recommonmark
+  ] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [
+    lit
+  ] ++ extraNativeBuildInputs;
+
+  buildInputs = [
+    libxml2
+    libxcrypt
+    libedit
+    libffi
+    mpfr
+  ] ++ extraBuildInputs;
+
+  propagatedBuildInputs = lib.optionals finalAttrs.passthru.isLLVM [
+    zlib
+    ncurses
+  ];
+
+  sourceRoot = "${finalAttrs.src.name}/${targetDir}";
+
+  cmakeFlags = [
+    "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
+  ] ++ lib.optionals (finalAttrs.passthru.isLLVM && targetProjects != [ ]) [
+    "-DLLVM_ENABLE_PROJECTS=${lib.concatStringsSep ";" targetProjects}"
+  ] ++ lib.optionals ((finalAttrs.passthru.isLLVM || targetDir == "runtimes") && targetRuntimes != [ ]) [
+    "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" targetRuntimes}"
+  ] ++ lib.optionals (finalAttrs.passthru.isLLVM || finalAttrs.passthru.isClang) [
+    "-DLLVM_ENABLE_RTTI=ON"
+    "-DLLVM_ENABLE_EH=ON"
+  ] ++ lib.optionals (buildDocs || buildMan) [
+    "-DLLVM_INCLUDE_DOCS=ON"
+    "-DLLVM_BUILD_DOCS=ON"
+    # "-DLLVM_ENABLE_DOXYGEN=ON" Way too slow, only uses one core
+    "-DLLVM_ENABLE_SPHINX=ON"
+    "-DLLVM_ENABLE_OCAMLDOC=OFF"
+    "-DSPHINX_OUTPUT_HTML=ON"
+    "-DSPHINX_OUTPUT_MAN=ON"
+    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+  ] ++ lib.optionals buildTests [
+    "-DLLVM_INCLUDE_TESTS=ON"
+    "-DLLVM_BUILD_TESTS=ON"
+  ] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [
+    "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped"
+  ] ++ extraCMakeFlags;
+
+  postPatch = lib.optionalString finalAttrs.passthru.isLLVM ''
     patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh
-    substituteInPlace ../clang/cmake/modules/CMakeLists.txt \
-      --replace 'FILES_MATCHING' 'NO_SOURCE_PERMISSIONS FILES_MATCHING'
-  '';
+  '' + lib.optionalString (buildTests && finalAttrs.passthru.isLLVM) ''
+    # FileSystem permissions tests fail with various special bits
+    rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test
+    rm unittests/Support/Path.cpp
+
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "Path.cpp" ""
+  '' + extraPostPatch;
+
+  doCheck = buildTests;
+  checkTarget = lib.concatStringsSep " " checkTargets;
+
+  postInstall = lib.optionalString finalAttrs.passthru.isLLVM ''
+    # `lit` expects these for some test suites
+    mv bin/{FileCheck,not,count,yaml2obj,obj2yaml} $out/bin
+  '' + lib.optionalString buildMan ''
+    mkdir -p $info
+  '' + extraPostInstall;
 
   passthru = {
-    isClang = true;
+    isLLVM = targetDir == "llvm";
+    isClang = targetDir == "clang" || builtins.elem "clang" targetProjects;
 
-    updateScript = writeScript "update.sh" ''
-      #!/usr/bin/env nix-shell
-      #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github
-
-      version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-        -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
-
-      IFS='.' read -a version_arr <<< "$version"
-
-      if [ "''${#version_arr[*]}" == 2 ]; then
-        version="''${version}.0"
-      fi
-
-      current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)"
-      if [[ "$version" != "$current_version" ]]; then
-        tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")"
-        tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))"
-        sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \
-          -e 's,version = "\(.*\)",version = "'"$version"'",' \
-          -e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",'
-      else
-        echo rocm-llvm already up-to-date
-      fi
-    '';
+    updateScript = rocmUpdateScript {
+      name = finalAttrs.pname;
+      owner = finalAttrs.src.owner;
+      repo = finalAttrs.src.repo;
     };
+  };
 
   meta = with lib; {
     description = "ROCm fork of the LLVM compiler infrastructure";
     homepage = "https://github.com/RadeonOpenCompute/llvm-project";
-    license = with licenses; [ ncsa ];
+    license = with licenses; [ ncsa ] ++ extraLicenses;
     maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members;
     platforms = platforms.linux;
+    broken = isBroken;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d55ddeeca6f9..22c43b4d3451 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13843,6 +13843,7 @@ with pkgs;
   clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
   clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack;
   libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv;
+  rocmClangStdenv = llvmPackages_rocm.rocmClangStdenv;
 
   clasp-common-lisp = callPackage ../development/compilers/clasp {
     llvmPackages = llvmPackages_6;

From 785ed480aafdde6cbbffb7605f1cd988f8524dab Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Mon, 12 Dec 2022 17:36:53 -0600
Subject: [PATCH 134/953] rocm-related: standardize

rocminfo: standardize

rocm-thunk: standardize

rocm-opencl-icd: standardize

rocclr: standardize

rocm-device-libs: standardize

rocm-comgr: standardize

rocm-opencl-runtime: standardize

rocm-runtime: standardize

clang-ocl: standardize

composable_kernel: standardize

hipcub: standardize

hipsparse: standardize

miopengemm: standardize

rccl: standardize

rocfft: standardize

rocprim: standardize

rocsparse: standardize

rocmlir: standardize

rocrand: standardize

tensile: standardize

rocm-cmake: standardize

rocm-smi: standardize

miopen: standardize
---
 .../libraries/clang-ocl/default.nix           | 13 +--
 .../libraries/composable_kernel/default.nix   |  6 +-
 pkgs/development/libraries/hipcub/default.nix |  6 --
 .../libraries/hipsparse/default.nix           |  6 --
 pkgs/development/libraries/miopen/default.nix | 21 ++---
 .../libraries/miopengemm/default.nix          |  6 +-
 pkgs/development/libraries/rccl/default.nix   |  6 --
 pkgs/development/libraries/rocclr/default.nix | 11 ++-
 pkgs/development/libraries/rocfft/default.nix | 10 +--
 .../libraries/rocm-comgr/default.nix          | 35 ++++----
 .../libraries/rocm-device-libs/default.nix    | 29 ++++---
 .../libraries/rocm-opencl-icd/default.nix     | 10 ++-
 .../libraries/rocm-opencl-runtime/default.nix | 37 +++------
 .../libraries/rocm-runtime/default.nix        | 42 ++++++----
 .../libraries/rocm-thunk/default.nix          | 38 +++++----
 .../development/libraries/rocmlir/default.nix | 64 +++++++++++++--
 .../development/libraries/rocprim/default.nix |  9 +-
 .../development/libraries/rocrand/default.nix |  9 +-
 .../libraries/rocsparse/default.nix           |  6 --
 .../development/libraries/tensile/default.nix |  1 +
 .../build-managers/rocm-cmake/default.nix     |  1 +
 pkgs/development/tools/rocminfo/default.nix   | 33 ++++----
 pkgs/tools/system/rocm-smi/default.nix        |  1 +
 pkgs/top-level/all-packages.nix               | 82 +++++++++++++------
 24 files changed, 258 insertions(+), 224 deletions(-)

diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix
index 3341bc680fb0..8cbace27d4fb 100644
--- a/pkgs/development/libraries/clang-ocl/default.nix
+++ b/pkgs/development/libraries/clang-ocl/default.nix
@@ -5,7 +5,6 @@
 , cmake
 , rocm-cmake
 , rocm-device-libs
-, clang
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,17 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     rocm-cmake
-    clang
   ];
 
-  buildInputs = [
-    rocm-device-libs
-  ];
-
-  cmakeFlags = [
-    "-DCMAKE_C_COMPILER=clang"
-    "-DCMAKE_CXX_COMPILER=clang++"
-  ];
+  buildInputs = [ rocm-device-libs ];
 
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
@@ -45,6 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/RadeonOpenCompute/clang-ocl";
     license = with licenses; [ mit ];
     maintainers = teams.rocm.members;
-    broken = finalAttrs.version != clang.version;
+    broken = finalAttrs.version != stdenv.cc.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix
index f41a97b99ad7..82419873cbeb 100644
--- a/pkgs/development/libraries/composable_kernel/default.nix
+++ b/pkgs/development/libraries/composable_kernel/default.nix
@@ -6,6 +6,7 @@
 , rocm-cmake
 , hip
 , openmp
+, clang-tools-extra
 , gtest
 , buildTests ? false
 , buildExamples ? false
@@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     rocm-cmake
     hip
+    clang-tools-extra
   ];
 
   buildInputs = [
@@ -85,8 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
     license = with licenses; [ mit ];
     maintainers = teams.rocm.members;
-    # Several tests seem to either not compile or have a race condition
-    # Undefined reference to symbol '_ZTIN7testing4TestE'
+    # Well, at least we're getting something that makes sense now
+    # undefined symbol: testing::Message::Message()
     # Try removing this next update
     broken = buildTests;
   };
diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix
index 68f31e991d61..8a6ea0ca43c2 100644
--- a/pkgs/development/libraries/hipcub/default.nix
+++ b/pkgs/development/libraries/hipcub/default.nix
@@ -4,9 +4,6 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , rocprim
 , hip
 , gtest
@@ -42,9 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
     rocprim
   ] ++ lib.optionals buildTests [
     gtest
diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix
index fc1e62e65208..a1582a4ee484 100644
--- a/pkgs/development/libraries/hipsparse/default.nix
+++ b/pkgs/development/libraries/hipsparse/default.nix
@@ -4,9 +4,6 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , rocsparse
 , hip
 , gfortran
@@ -41,9 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
     rocsparse
     git
   ] ++ lib.optionals buildTests [
diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix
index d48adb09a04c..513b492ee981 100644
--- a/pkgs/development/libraries/miopen/default.nix
+++ b/pkgs/development/libraries/miopen/default.nix
@@ -6,14 +6,10 @@
 , pkg-config
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
-, rocm-opencl-runtime
 , rocblas
 , rocmlir
 , hip
-, clang
+, clang-tools-extra
 , clang-ocl
 , llvm
 , miopengemm
@@ -84,15 +80,11 @@ in stdenv.mkDerivation (finalAttrs: {
     cmake
     rocm-cmake
     hip
-    clang
-    llvm
+    clang-tools-extra
   ];
 
   buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
-    rocm-opencl-runtime
+    llvm
     rocblas
     rocmlir
     clang-ocl
@@ -126,8 +118,6 @@ in stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_CXX_COMPILER=hipcc"
     "-DMIOPEN_BACKEND=HIP"
   ] ++ lib.optionals useOpenCL [
-    "-DCMAKE_C_COMPILER=${clang}/bin/clang"
-    "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++"
     "-DMIOPEN_BACKEND=OpenCL"
   ] ++ lib.optionals buildTests [
     "-DBUILD_TESTS=ON"
@@ -148,8 +138,7 @@ in stdenv.mkDerivation (finalAttrs: {
       --replace "3 REQUIRED PATHS /opt/rocm)" "3 REQUIRED PATHS ${hip})" \
       --replace "hip REQUIRED PATHS /opt/rocm" "hip REQUIRED PATHS ${hip}" \
       --replace "rocblas REQUIRED PATHS /opt/rocm" "rocblas REQUIRED PATHS ${rocblas}" \
-      --replace "miopengemm PATHS /opt/rocm" "miopengemm PATHS ${miopengemm}" \
-      --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # Fix clang-tidy at some point
+      --replace "miopengemm PATHS /opt/rocm" "miopengemm PATHS ${miopengemm}"
   '' + lib.optionalString (!buildTests) ''
     substituteInPlace CMakeLists.txt \
       --replace "add_subdirectory(test)" ""
@@ -180,7 +169,7 @@ in stdenv.mkDerivation (finalAttrs: {
   '' + lib.optionalString buildTests ''
     mkdir -p $test/bin
     mv bin/test_* $test/bin
-    patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])}:$out/lib $test/bin/*
+    patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} $test/bin/*
   '';
 
   passthru.updateScript = rocmUpdateScript {
diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix
index ecc5ba09aad8..03d30906f94a 100644
--- a/pkgs/development/libraries/miopengemm/default.nix
+++ b/pkgs/development/libraries/miopengemm/default.nix
@@ -5,7 +5,6 @@
 , cmake
 , rocm-cmake
 , rocm-opencl-runtime
-, clang
 , texlive
 , doxygen
 , sphinx
@@ -54,7 +53,6 @@ in stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     rocm-cmake
-    clang
   ];
 
   buildInputs = [
@@ -70,8 +68,6 @@ in stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DCMAKE_C_COMPILER=clang"
-    "-DCMAKE_CXX_COMPILER=clang++"
     # Manually define CMAKE_INSTALL_<DIR>
     # See: https://github.com/NixOS/nixpkgs/pull/197838
     "-DCMAKE_INSTALL_BINDIR=bin"
@@ -121,6 +117,6 @@ in stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM";
     license = with licenses; [ mit ];
     maintainers = teams.rocm.members;
-    broken = finalAttrs.version != clang.version;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix
index 6a9b48545749..4a8df477e15e 100644
--- a/pkgs/development/libraries/rccl/default.nix
+++ b/pkgs/development/libraries/rccl/default.nix
@@ -4,9 +4,6 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , rocm-smi
 , hip
 , gtest
@@ -38,9 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
     rocm-smi
     gtest
   ] ++ lib.optionals buildTests [
diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix
index 2837f57897e7..bd0eb6bafbb6 100644
--- a/pkgs/development/libraries/rocclr/default.nix
+++ b/pkgs/development/libraries/rocclr/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 , rocmUpdateScript
@@ -26,18 +27,19 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  prePatch = ''
+  postPatch = ''
     substituteInPlace device/comgrctx.cpp \
       --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so"
   '';
 
-  buildPhase = "";
+  dontConfigure = true;
+  dontBuild = true;
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out
-    cp -r * $out/
+    cp -a * $out/
 
     runHook postInstall
   '';
@@ -57,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     # to be supported yet by the build infrastructure. Recheck in
     # the future.
     platforms = [ "x86_64-linux" ];
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix
index 8dbf5f16a447..b71f0dc5b07f 100644
--- a/pkgs/development/libraries/rocfft/default.nix
+++ b/pkgs/development/libraries/rocfft/default.nix
@@ -4,17 +4,14 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , hip
+, openmp
 , sqlite
 , python3
 , gtest
 , boost
 , fftw
 , fftwFloat
-, llvmPackages
 , buildTests ? false
 , buildBenchmarks ? false
 }:
@@ -45,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
     sqlite
     python3
   ] ++ lib.optionals buildTests [
@@ -56,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     fftw
     fftwFloat
-    llvmPackages.openmp
+    openmp
   ];
 
   propogatedBuildInputs = lib.optionals buildTests [
diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix
index 2d26f72fc1b0..93c56f5178d8 100644
--- a/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/pkgs/development/libraries/rocm-comgr/default.nix
@@ -3,12 +3,17 @@
 , fetchFromGitHub
 , rocmUpdateScript
 , cmake
-, clang
+, rocm-cmake
 , rocm-device-libs
-, llvm
+, libxml2
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  llvmNativeTarget =
+    if stdenv.isx86_64 then "X86"
+    else if stdenv.isAarch64 then "AArch64"
+    else throw "Unsupported ROCm LLVM platform";
+in stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-comgr";
   version = "5.4.0";
 
@@ -19,21 +24,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs=";
   };
 
-  sourceRoot = "source/lib/comgr";
+  patches = [ ./cmake.patch ];
+  sourceRoot = "${finalAttrs.src.name}/lib/comgr";
 
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ clang rocm-device-libs llvm ];
-
-  cmakeFlags = [
-    "-DCMAKE_C_COMPILER=${clang}/bin/clang"
-    "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++"
-    "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm"
-    "-DLLD_INCLUDE_DIRS=${llvm}/include"
-    "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\""
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
   ];
 
-  patches = [ ./cmake.patch ];
+  buildInputs = [
+    rocm-device-libs
+    libxml2
+  ];
+
+  cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" ];
 
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
@@ -47,5 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.ncsa;
     maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
     platforms = platforms.linux;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix
index b6245eea8449..e37baad6f891 100644
--- a/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/pkgs/development/libraries/rocm-device-libs/default.nix
@@ -1,12 +1,18 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , rocmUpdateScript
 , cmake
-, clang
-, llvm
+, rocm-cmake
+, libxml2
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  llvmNativeTarget =
+    if stdenv.isx86_64 then "X86"
+    else if stdenv.isAarch64 then "AArch64"
+    else throw "Unsupported ROCm LLVM platform";
+in stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-device-libs";
   version = "5.4.0";
 
@@ -17,17 +23,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  patches = [ ./cmake.patch ];
 
-  buildInputs = [ clang llvm ];
-
-  cmakeFlags = [
-    "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${llvm}/lib/cmake/clang"
-    "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'"
-    "-DCLANG=${clang}/bin/clang"
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
   ];
 
-  patches = [ ./cmake.patch ];
+  buildInputs = [ libxml2 ];
+  cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" ];
 
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
@@ -41,5 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.ncsa;
     maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
     platforms = platforms.linux;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix
index fb78c4f04dd0..4602d3646e47 100644
--- a/pkgs/development/libraries/rocm-opencl-icd/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix
@@ -1,4 +1,8 @@
-{ lib, callPackage, stdenv, rocm-opencl-runtime }:
+{ lib
+, stdenv
+, callPackage
+, rocm-opencl-runtime
+}:
 
 stdenv.mkDerivation rec {
   pname = "rocm-opencl-icd";
@@ -11,12 +15,12 @@ stdenv.mkDerivation rec {
     echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd
   '';
 
-  passthru.impureTests = { rocm-opencl = callPackage ./test.nix {}; };
+  passthru.impureTests = { rocm-opencl = callPackage ./test.nix { }; };
 
   meta = with lib; {
     description = "OpenCL ICD definition for AMD GPUs using the ROCm stack";
     license = licenses.mit;
-    maintainers = with maintainers; [ lovesegfault ];
+    maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index 1d250195c23c..ee588999a1b1 100644
--- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -1,23 +1,15 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , fetchFromGitHub
 , rocmUpdateScript
 , addOpenGLRunpath
 , cmake
-, rocm-cmake
-, clang
-, glew
-, libglvnd
-, libX11
-, llvm
-, mesa
-, numactl
-, python3
-, rocclr
 , rocm-comgr
-, rocm-device-libs
 , rocm-runtime
-, rocm-thunk
+, rocclr
+, glew
+, libX11
+, numactl
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,27 +23,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I=";
   };
 
-  nativeBuildInputs = [ cmake rocm-cmake ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    clang
-    glew
-    libglvnd
-    libX11
-    llvm
-    mesa
-    numactl
-    python3
     rocm-comgr
-    rocm-device-libs
     rocm-runtime
-    rocm-thunk
+    glew
+    libX11
+    numactl
   ];
 
   cmakeFlags = [
     "-DAMD_OPENCL_PATH=${finalAttrs.src}"
     "-DROCCLR_PATH=${rocclr}"
-    "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl"
   ];
 
   dontStrip = true;
@@ -80,5 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = with licenses; [ asl20 mit ];
     maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members;
     platforms = platforms.linux;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix
index 86ddf5b77038..b7e1212fd1b1 100644
--- a/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-runtime/default.nix
@@ -1,17 +1,18 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , fetchFromGitHub
 , rocmUpdateScript
-, addOpenGLRunpath
-, cmake
 , pkg-config
+, cmake
 , xxd
-, elfutils
-, libdrm
-, llvm
-, numactl
 , rocm-device-libs
-, rocm-thunk }:
+, rocm-thunk
+, libelf
+, libdrm
+, numactl
+, valgrind
+, libxml2
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-runtime";
@@ -24,13 +25,22 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-M9kv1Oe5ZZfd9H/+KUJUoK9L1EdyS2qRp2mJDK0dnPE=";
   };
 
-  sourceRoot = "source/src";
+  sourceRoot = "${finalAttrs.src.name}/src";
 
-  nativeBuildInputs = [ cmake pkg-config xxd ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    xxd
+  ];
 
-  buildInputs = [ elfutils libdrm llvm numactl ];
-
-  cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ];
+  buildInputs = [
+    rocm-thunk
+    libelf
+    libdrm
+    numactl
+    valgrind
+    libxml2
+  ];
 
   postPatch = ''
     patchShebangs image/blit_src/create_hsaco_ascii_file.sh
@@ -45,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   fixupPhase = ''
-    rm -rf $out/hsa
+    rm -rf $out/hsa/*
+    ln -s $out/{include,lib} $out/hsa
   '';
 
   passthru.updateScript = rocmUpdateScript {
@@ -59,5 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
     license = with licenses; [ ncsa ];
     maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix
index 6bca7a89fc48..bc966e501268 100644
--- a/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/pkgs/development/libraries/rocm-thunk/default.nix
@@ -2,10 +2,12 @@
 , stdenv
 , fetchFromGitHub
 , rocmUpdateScript
-, cmake
 , pkg-config
+, cmake
+, rocm-cmake
 , libdrm
 , numactl
+, valgrind
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,24 +21,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE=";
   };
 
-  preConfigure = ''
-    export cmakeFlags="$cmakeFlags "
-  '';
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    rocm-cmake
+  ];
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [
+    libdrm
+    numactl
+    valgrind
+  ];
 
-  buildInputs = [ libdrm numactl ];
-
-  # https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/issues/75
-  postPatch = ''
-    substituteInPlace libhsakmt.pc.in \
-      --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
-      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
-  '';
-
-  postInstall = ''
-    cp -r $src/include $out
-  '';
+  cmakeFlags = [
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ];
 
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
@@ -49,5 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface";
     license = with licenses; [ bsd2 mit ];
     maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix
index e40eb1b813c1..90bb1ad211ce 100644
--- a/pkgs/development/libraries/rocmlir/default.nix
+++ b/pkgs/development/libraries/rocmlir/default.nix
@@ -3,17 +3,36 @@
 , fetchFromGitHub
 , rocmUpdateScript
 , cmake
-, clang
+, ninja
+, hip
+, rocminfo
 , git
 , libxml2
 , libedit
+, zlib
+, ncurses
 , python3
+, buildRockCompiler ? false
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+# Theoretically, we could have our MLIR have an output
+# with the source and built objects so that we can just
+# use it as the external LLVM repo for this
+let
+  llvmNativeTarget =
+    if stdenv.isx86_64 then "X86"
+    else if stdenv.isAarch64 then "AArch64"
+    else throw "Unsupported ROCm LLVM platform";
+in stdenv.mkDerivation (finalAttrs: {
   pname = "rocmlir";
   version = "5.4.0";
 
+  outputs = [
+    "out"
+  ] ++ lib.optionals (!buildRockCompiler) [
+    "external"
+  ];
+
   src = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";
     repo = "rocMLIR";
@@ -23,7 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    clang
+    ninja
+  ] ++ lib.optionals (!buildRockCompiler) [
+    hip
   ];
 
   buildInputs = [
@@ -33,12 +54,39 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  cmakeFlags = [
-    "-DCMAKE_C_COMPILER=clang"
-    "-DCMAKE_CXX_COMPILER=clang++"
-    "-DBUILD_FAT_LIBROCKCOMPILER=ON"
+  propagatedBuildInputs = [
+    zlib
+    ncurses
   ];
 
+  cmakeFlags = [
+    "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
+    "-DLLVM_ENABLE_ZLIB=ON"
+    "-DLLVM_ENABLE_TERMINFO=ON"
+  ] ++ lib.optionals buildRockCompiler [
+    "-DBUILD_FAT_LIBROCKCOMPILER=ON"
+  ] ++ lib.optionals (!buildRockCompiler) [
+    "-DROCM_PATH=${rocminfo}"
+    "-DROCM_TEST_CHIPSET=gfx000"
+  ];
+
+  dontBuild = true;
+  doCheck = true;
+
+  # Certain libs aren't being generated, try enabling tests next update
+  checkTarget = if buildRockCompiler
+                then "librockCompiler"
+                else "check-mlir-miopen-build-only";
+
+  postInstall = let
+    libPath = lib.makeLibraryPath [ zlib ncurses hip stdenv.cc.cc ];
+  in lib.optionals (!buildRockCompiler) ''
+    mkdir -p $external/lib
+    cp -a external/llvm-project/llvm/lib/{*.a*,*.so*} $external/lib
+    patchelf --set-rpath $external/lib:$out/lib:${libPath} $external/lib/*.so*
+    patchelf --set-rpath $out/lib:$external/lib:${libPath} $out/{bin/*,lib/*.so*}
+  '';
+
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
     owner = finalAttrs.src.owner;
@@ -52,6 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
     license = with licenses; [ asl20 ];
     maintainers = teams.rocm.members;
-    broken = finalAttrs.version != clang.version;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix
index 9b5fabf0fb00..3ad3871bbd3d 100644
--- a/pkgs/development/libraries/rocprim/default.nix
+++ b/pkgs/development/libraries/rocprim/default.nix
@@ -4,9 +4,6 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , hip
 , gtest
 , gbenchmark
@@ -39,11 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     hip
   ];
 
-  buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
-  ] ++ lib.optionals buildTests [
+  buildInputs = lib.optionals buildTests [
     gtest
   ] ++ lib.optionals buildBenchmarks [
     gbenchmark
diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix
index f0b1cb3e69b6..a06615ec4122 100644
--- a/pkgs/development/libraries/rocrand/default.nix
+++ b/pkgs/development/libraries/rocrand/default.nix
@@ -4,9 +4,6 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , hip
 , gtest
 , gbenchmark
@@ -40,11 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     hip
   ];
 
-  buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
-  ] ++ lib.optionals buildTests [
+  buildInputs = lib.optionals buildTests [
     gtest
   ] ++ lib.optionals buildBenchmarks [
     gbenchmark
diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix
index 0edee46cfeb3..c0ee717d4bfc 100644
--- a/pkgs/development/libraries/rocsparse/default.nix
+++ b/pkgs/development/libraries/rocsparse/default.nix
@@ -5,9 +5,6 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , rocprim
 , hip
 , gfortran
@@ -46,9 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
     rocprim
     git
   ] ++ lib.optionals (buildTests || buildBenchmarks) [
diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix
index df3b580c059f..c45b15134f5f 100644
--- a/pkgs/development/libraries/tensile/default.nix
+++ b/pkgs/development/libraries/tensile/default.nix
@@ -36,5 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ROCmSoftwarePlatform/Tensile";
     license = with licenses; [ mit ];
     maintainers = teams.rocm.members;
+    broken = version != stdenv.cc.version;
   };
 }
diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 0a3e44e02299..0d7913543f10 100644
--- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.mit;
     maintainers = teams.rocm.members;
     platforms = platforms.unix;
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix
index 34dcb52526bd..2a714829d91c 100644
--- a/pkgs/development/tools/rocminfo/default.nix
+++ b/pkgs/development/tools/rocminfo/default.nix
@@ -1,13 +1,12 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , fetchFromGitHub
 , rocmUpdateScript
-, fetchpatch
 , cmake
-, rocm-runtime
-, python3
 , rocm-cmake
+, rocm-runtime
 , busybox
+, python3
 , gnugrep
   # rocminfo requires that the calling user have a password and be in
   # the video group. If we let rocm_agent_enumerator rely upon
@@ -29,25 +28,21 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U=";
   };
 
-  enableParallelBuilding = true;
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ rocm-cmake rocm-runtime ];
-
-  cmakeFlags = [
-    "-DROCM_DIR=${rocm-runtime}"
-    "-DROCRTST_BLD_TYPE=Release"
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
   ];
 
+  buildInputs = [ rocm-runtime ];
+  propagatedBuildInputs = [ python3 ];
+  cmakeFlags = [ "-DROCRTST_BLD_TYPE=Release" ];
+
   prePatch = ''
-    sed 's,#!/usr/bin/env python3,#!${python3}/bin/python,' -i rocm_agent_enumerator
+    patchShebangs rocm_agent_enumerator
     sed 's,lsmod | grep ,${busybox}/bin/lsmod | ${gnugrep}/bin/grep ,' -i rocminfo.cc
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp rocminfo $out/bin
-    cp rocm_agent_enumerator $out/bin
-  '' + lib.optionalString (defaultTargets != []) ''
+  postInstall = lib.optionalString (defaultTargets != [ ]) ''
     echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst
   '';
 
@@ -63,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.ncsa;
     maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
     platforms = platforms.linux;
-    broken = stdenv.isAarch64;
+    broken = stdenv.isAarch64 || finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix
index 33bda1e56455..0f303cc78531 100644
--- a/pkgs/tools/system/rocm-smi/default.nix
+++ b/pkgs/tools/system/rocm-smi/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
     platforms = [ "x86_64-linux" ];
+    broken = finalAttrs.version != stdenv.cc.version;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22c43b4d3451..511f5b705e08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15133,66 +15133,100 @@ with pkgs;
   rml = callPackage ../development/compilers/rml { };
 
   composable_kernel = callPackage ../development/libraries/composable_kernel {
-    inherit (llvmPackages) openmp;
+    inherit (llvmPackages_rocm) openmp clang-tools-extra;
+    stdenv = rocmClangStdenv;
   };
 
   clang-ocl = callPackage ../development/libraries/clang-ocl {
-    inherit (llvmPackages_rocm) clang;
+    stdenv = rocmClangStdenv;
   };
 
   rgxg = callPackage ../tools/text/rgxg { };
 
-  rocclr = callPackage ../development/libraries/rocclr { };
+  rocclr = callPackage ../development/libraries/rocclr {
+    stdenv = rocmClangStdenv;
+  };
 
   hip = callPackage ../development/compilers/hip {
     inherit (llvmPackages_rocm) clang llvm;
   };
 
-  hipcub = callPackage ../development/libraries/hipcub { };
+  hipcub = callPackage ../development/libraries/hipcub {
+    stdenv = rocmClangStdenv;
+  };
 
-  hipsparse = callPackage ../development/libraries/hipsparse { };
+  hipsparse = callPackage ../development/libraries/hipsparse {
+    stdenv = rocmClangStdenv;
+  };
 
-  rccl = callPackage ../development/libraries/rccl { };
+  rccl = callPackage ../development/libraries/rccl {
+    stdenv = rocmClangStdenv;
+  };
 
-  rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { };
+  rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake {
+    stdenv = rocmClangStdenv;
+  };
 
   rocm-comgr = callPackage ../development/libraries/rocm-comgr {
-    inherit (llvmPackages_rocm) clang llvm;
+    stdenv = rocmClangStdenv;
   };
 
   rocm-device-libs = callPackage ../development/libraries/rocm-device-libs {
-    inherit (llvmPackages_rocm) clang llvm;
+    stdenv = rocmClangStdenv;
   };
 
-  rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { };
+  rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd {
+    stdenv = rocmClangStdenv;
+  };
 
   rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime {
-    inherit (llvmPackages_rocm) clang llvm;
+    stdenv = rocmClangStdenv;
   };
 
   rocm-runtime = callPackage ../development/libraries/rocm-runtime {
-    inherit (llvmPackages_rocm) llvm;
+    stdenv = rocmClangStdenv;
   };
 
-  rocm-smi = python3Packages.callPackage ../tools/system/rocm-smi { };
+  rocm-smi = python3Packages.callPackage ../tools/system/rocm-smi {
+    stdenv = rocmClangStdenv;
+  };
 
-  rocm-thunk = callPackage ../development/libraries/rocm-thunk { };
+  rocm-thunk = callPackage ../development/libraries/rocm-thunk {
+    stdenv = rocmClangStdenv;
+  };
 
-  rocminfo = callPackage ../development/tools/rocminfo { };
+  rocminfo = callPackage ../development/tools/rocminfo {
+    stdenv = rocmClangStdenv;
+  };
 
   rocmlir = callPackage ../development/libraries/rocmlir {
-    inherit (llvmPackages_rocm) clang;
+    stdenv = rocmClangStdenv;
   };
 
-  rocprim = callPackage ../development/libraries/rocprim { };
+  rocmlir-rock = rocmlir.override {
+    buildRockCompiler = true;
+  };
 
-  rocsparse = callPackage ../development/libraries/rocsparse { };
+  rocprim = callPackage ../development/libraries/rocprim {
+    stdenv = rocmClangStdenv;
+  };
 
-  rocfft = callPackage ../development/libraries/rocfft { };
+  rocsparse = callPackage ../development/libraries/rocsparse {
+    stdenv = rocmClangStdenv;
+  };
 
-  rocrand = callPackage ../development/libraries/rocrand { };
+  rocfft = callPackage ../development/libraries/rocfft {
+    inherit (llvmPackages_rocm) openmp;
+    stdenv = rocmClangStdenv;
+  };
 
-  tensile = python3Packages.callPackage ../development/libraries/tensile { };
+  rocrand = callPackage ../development/libraries/rocrand {
+    stdenv = rocmClangStdenv;
+  };
+
+  tensile = python3Packages.callPackage ../development/libraries/tensile {
+    stdenv = rocmClangStdenv;
+  };
 
   rocwmma = callPackage ../development/libraries/rocwmma {
     inherit (llvmPackages) openmp;
@@ -15203,13 +15237,15 @@ with pkgs;
   };
 
   miopengemm = callPackage ../development/libraries/miopengemm {
-    inherit (llvmPackages_rocm) clang;
+    stdenv = rocmClangStdenv;
   };
 
   rocthrust = callPackage ../development/libraries/rocthrust { };
 
   miopen = callPackage ../development/libraries/miopen {
-    inherit (llvmPackages_rocm) clang llvm;
+    inherit (llvmPackages_rocm) llvm clang-tools-extra;
+    stdenv = rocmClangStdenv;
+    rocmlir = rocmlir-rock;
     boost = boost.override { enableStatic = true; };
   };
 

From fb8a7b62bb3f0c3e381761eb3332c8abefbbd9e6 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 16 Dec 2022 00:51:10 -0600
Subject: [PATCH 135/953] rocm-related: standardize and fix tests/benchmarks

rocblas: standardize and fix test/benchmarks

rocthrust: standardize and fix test/benchmarks

rocwmma: standardize and fix tests/benchmarks
---
 .../development/libraries/rocblas/default.nix | 55 ++++++++++---------
 .../libraries/rocthrust/default.nix           | 49 +++++++----------
 .../rocwmma/0000-dont-fetch-googletest.patch  | 28 +++++++---
 .../development/libraries/rocwmma/default.nix | 36 +++++++-----
 pkgs/top-level/all-packages.nix               | 10 +++-
 5 files changed, 98 insertions(+), 80 deletions(-)

diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix
index 24ead8242005..41c0b188318c 100644
--- a/pkgs/development/libraries/rocblas/default.nix
+++ b/pkgs/development/libraries/rocblas/default.nix
@@ -2,20 +2,17 @@
 , stdenv
 , fetchFromGitHub
 , rocmUpdateScript
-, fetchpatch
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , hip
 , python3
 , tensile
 , msgpack
 , libxml2
-, llvm
 , gtest
 , gfortran
+, openmp
+, amd-blis
 , python3Packages
 , buildTensile ? true
 , buildTests ? false
@@ -32,6 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocblas";
   version = "5.4.0";
 
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildTests [
+    "test"
+  ] ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
+
   src = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";
     repo = "rocBLAS";
@@ -39,16 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60=";
   };
 
-  # We currently need this patch due to faulty toolchain includes
-  # See: https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1277
-  patches = [
-    (fetchpatch {
-      name = "only-std_norm-from-rocblas_complex.patch";
-      url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/commit/44b99c6df26002139ca9ec68ee1fc8899c7b001f.patch";
-      hash = "sha256-vSZkVYY951fqfOThKFqnYBasWMblS6peEJZ6sFMCk9k=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     rocm-cmake
@@ -56,19 +51,19 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
     python3
   ] ++ lib.optionals buildTensile [
     msgpack
     libxml2
-    llvm
-    python3Packages.pyyaml
     python3Packages.msgpack
   ] ++ lib.optionals buildTests [
     gtest
+  ] ++ lib.optionals (buildTests || buildBenchmarks) [
     gfortran
+    openmp
+    amd-blis
+  ] ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [
+    python3Packages.pyyaml
   ];
 
   cmakeFlags = [
@@ -95,12 +90,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DBUILD_CLIENTS_TESTS=ON"
   ] ++ lib.optionals buildBenchmarks [
     "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ] ++ lib.optionals (buildTests || buildBenchmarks) [
+    "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis"
   ];
 
   # Tensile REALLY wants to write to the nix directory if we include it normally
-  # We need to manually fixup the path so tensile will generate .co and .dat files
   postPatch = lib.optionalString buildTensile ''
-    export PATH=${llvm}/bin:$PATH
     cp -a ${tensile} tensile
     chmod +w -R tensile
 
@@ -113,6 +108,18 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" ""
   '';
 
+  postInstall = lib.optionalString buildTests ''
+    mkdir -p $test/bin
+    cp -a $out/bin/* $test/bin
+    rm $test/bin/*-bench || true
+  '' + lib.optionalString buildBenchmarks ''
+    mkdir -p $benchmark/bin
+    cp -a $out/bin/* $benchmark/bin
+    rm $benchmark/bin/*-test || true
+  '' + lib.optionalString (buildTests || buildBenchmarks ) ''
+    rm -rf $out/bin
+  '';
+
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
     owner = finalAttrs.src.owner;
@@ -124,8 +131,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS";
     license = with licenses; [ mit ];
     maintainers = teams.rocm.members;
-    # Tests and benchmarks are a can of worms that I will tackle in a different PR
-    # It involves completely rewriting the amd-blis derivation
-    broken = finalAttrs.version != hip.version || buildTests || buildBenchmarks;
+    broken = finalAttrs.version != hip.version;
   };
 })
diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix
index 281620780832..7a45a794ad2d 100644
--- a/pkgs/development/libraries/rocthrust/default.nix
+++ b/pkgs/development/libraries/rocthrust/default.nix
@@ -4,9 +4,6 @@
 , rocmUpdateScript
 , cmake
 , rocm-cmake
-, rocm-runtime
-, rocm-device-libs
-, rocm-comgr
 , rocprim
 , hip
 , gtest
@@ -18,14 +15,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "rocthrust";
   version = "5.4.0";
 
-  # Comment out these outputs until tests/benchmarks are fixed (upstream?)
-  # outputs = [
-  #   "out"
-  # ] ++ lib.optionals buildTests [
-  #   "test"
-  # ] ++ lib.optionals buildBenchmarks [
-  #   "benchmark"
-  # ];
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildTests [
+    "test"
+  ] ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
 
   src = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";
@@ -41,11 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     hip
   ];
 
-  buildInputs = [
-    rocm-runtime
-    rocm-device-libs
-    rocm-comgr
-  ] ++ lib.optionals buildTests [
+  buildInputs = lib.optionals buildTests [
     gtest
   ];
 
@@ -61,18 +53,19 @@ stdenv.mkDerivation (finalAttrs: {
     "-DBUILD_TEST=ON"
   ] ++ lib.optionals buildBenchmarks [
     "-DBUILD_BENCHMARKS=ON"
+  ] ++ lib.optionals (buildTests || buildBenchmarks) [
+    "-DCMAKE_CXX_FLAGS=-Wno-deprecated-builtins" # Too much spam
   ];
 
-  # Comment out these outputs until tests/benchmarks are fixed (upstream?)
-  # postInstall = lib.optionalString buildTests ''
-  #   mkdir -p $test/bin
-  #   mv $out/bin/test_* $test/bin
-  # '' + lib.optionalString buildBenchmarks ''
-  #   mkdir -p $benchmark/bin
-  #   mv $out/bin/benchmark_* $benchmark/bin
-  # '' + lib.optionalString (buildTests || buildBenchmarks) ''
-  #   rmdir $out/bin
-  # '';
+  postInstall = lib.optionalString buildTests ''
+    mkdir -p $test/bin
+    mv $out/bin/{test_*,*.hip} $test/bin
+  '' + lib.optionalString buildBenchmarks ''
+    mkdir -p $benchmark/bin
+    mv $out/bin/benchmark_* $benchmark/bin
+  '' + lib.optionalString (buildTests || buildBenchmarks) ''
+    rm -rf $out/bin
+  '';
 
   passthru.updateScript = rocmUpdateScript {
     name = finalAttrs.pname;
@@ -85,8 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust";
     license = with licenses; [ asl20 ];
     maintainers = teams.rocm.members;
-    # Tests/Benchmarks don't seem to work, thousands of errors compiling with no clear fix
-    # Is this an upstream issue? We don't seem to be missing dependencies
-    broken = finalAttrs.version != hip.version || buildTests || buildBenchmarks;
+    broken = finalAttrs.version != hip.version;
   };
 })
diff --git a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch
index 7208d20a2127..cee603679758 100644
--- a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch
+++ b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch
@@ -1,19 +1,31 @@
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 7e0f2c8..db54eab 100644
+index e1160bb..2a5462e 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -31,14 +31,6 @@ cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests"
+@@ -30,26 +30,6 @@ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests"
+ cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF )
  cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF )
  
- # Test/benchmark requires additional dependencies
+-# Test/benchmark requires additional dependencies
 -include( FetchContent )
 -
 -FetchContent_Declare(
 -  googletest
--  URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+-  GIT_REPOSITORY https://github.com/google/googletest.git
+-  GIT_TAG 609281088cfefc76f9d0ce82e1ff6c30cc3591e5
 -)
--FetchContent_MakeAvailable(googletest)
--
- include(GoogleTest)
+-FetchContent_GetProperties(googletest)
+-if(NOT googletest_POPULATED)
+-  # Fetch the content using default details
+-  FetchContent_Populate(googletest)
+-  # Save the shared libs setting, then force to static libs
+-  set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
+-  set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build SHARED libraries" FORCE)
+-  # Add gtest targets as static libs
+-  add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
+-  # Restore shared libs setting
+-  set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE)
+-endif()
  
- set(ROCWMMA_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
+ set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp
diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix
index 786d48ee80ca..818d915cc133 100644
--- a/pkgs/development/libraries/rocwmma/default.nix
+++ b/pkgs/development/libraries/rocwmma/default.nix
@@ -14,6 +14,8 @@
 , python3Packages
 , buildDocs ? true
 , buildTests ? false
+, buildExtendedTests ? false
+, buildBenchmarks ? false
 , buildSamples ? false
 , gpuTargets ? [ ] # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ]
 }:
@@ -40,8 +42,10 @@ in stdenv.mkDerivation (finalAttrs: {
     "out"
   ] ++ lib.optionals buildDocs [
     "doc"
-  ] ++ lib.optionals buildTests [
+  ] ++ lib.optionals (buildTests || buildBenchmarks) [
     "test"
+  ] ++ lib.optionals buildBenchmarks [
+    "benchmark"
   ] ++ lib.optionals buildSamples [
     "sample"
   ];
@@ -53,7 +57,7 @@ in stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM=";
   };
 
-  patches = lib.optionals buildTests [
+  patches = lib.optionals (buildTests || buildBenchmarks) [
     ./0000-dont-fetch-googletest.patch
   ];
 
@@ -65,7 +69,7 @@ in stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     openmp
-  ] ++ lib.optionals buildTests [
+  ] ++ lib.optionals (buildTests || buildBenchmarks) [
     gtest
     rocblas
   ] ++ lib.optionals buildDocs [
@@ -78,8 +82,10 @@ in stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DCMAKE_CXX_COMPILER=hipcc"
-    "-DROCWMMA_BUILD_TESTS=${if buildTests then "ON" else "OFF"}"
+    "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}"
+    "-DROCWMMA_BUILD_VALIDATION_TESTS=ON"
     "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}"
+    "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON"
     # Manually define CMAKE_INSTALL_<DIR>
     # See: https://github.com/NixOS/nixpkgs/pull/197838
     "-DCMAKE_INSTALL_BINDIR=bin"
@@ -87,11 +93,10 @@ in stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
   ] ++ lib.optionals (gpuTargets != [ ]) [
     "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
-  ] ++ lib.optionals buildTests [
-    "-DROCWMMA_BUILD_VALIDATION_TESTS=ON"
-    "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON"
+  ] ++ lib.optionals buildExtendedTests [
     "-DROCWMMA_BUILD_EXTENDED_TESTS=ON"
-    "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON"
+  ] ++ lib.optionals buildBenchmarks [
+    "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON"
     "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON"
   ];
 
@@ -109,16 +114,19 @@ in stdenv.mkDerivation (finalAttrs: {
   postInstall = lib.optionalString buildDocs ''
     mv ../docs/source/_build/html $out/share/doc/rocwmma
     mv ../docs/source/_build/latex/rocWMMA.pdf $out/share/doc/rocwmma
-  '' + lib.optionalString buildTests ''
+  '' + lib.optionalString (buildTests || buildBenchmarks) ''
     mkdir -p $test/bin
-    mv $out/bin/*_test* $test/bin
+    mv $out/bin/{*_test,*-validate} $test/bin
+  '' + lib.optionalString buildBenchmarks ''
+    mkdir -p $benchmark/bin
+    mv $out/bin/*-bench $benchmark/bin
   '' + lib.optionalString buildSamples ''
     mkdir -p $sample/bin
     mv $out/bin/sgemmv $sample/bin
     mv $out/bin/simple_gemm $sample/bin
     mv $out/bin/simple_dlrm $sample/bin
-  '' + lib.optionalString (buildTests || buildSamples) ''
-    rmdir $out/bin
+  '' + lib.optionalString (buildTests || buildBenchmarks || buildSamples) ''
+    rm -rf $out/bin
   '';
 
   passthru.updateScript = rocmUpdateScript {
@@ -132,8 +140,6 @@ in stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA";
     license = with licenses; [ mit ];
     maintainers = teams.rocm.members;
-    # Building tests isn't working for now
-    # undefined reference to symbol '_ZTIN7testing4TestE'
-    broken = finalAttrs.version != hip.version || buildTests;
+    broken = finalAttrs.version != hip.version;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 511f5b705e08..d128b3ca725d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15229,18 +15229,22 @@ with pkgs;
   };
 
   rocwmma = callPackage ../development/libraries/rocwmma {
-    inherit (llvmPackages) openmp;
+    inherit (llvmPackages_rocm) openmp;
+    stdenv = rocmClangStdenv;
   };
 
   rocblas = callPackage ../development/libraries/rocblas {
-    inherit (llvmPackages_rocm) llvm;
+    inherit (llvmPackages_rocm) openmp;
+    stdenv = rocmClangStdenv;
   };
 
   miopengemm = callPackage ../development/libraries/miopengemm {
     stdenv = rocmClangStdenv;
   };
 
-  rocthrust = callPackage ../development/libraries/rocthrust { };
+  rocthrust = callPackage ../development/libraries/rocthrust {
+    stdenv = rocmClangStdenv;
+  };
 
   miopen = callPackage ../development/libraries/miopen {
     inherit (llvmPackages_rocm) llvm clang-tools-extra;

From f6e28e20587fbfef6b84cedb13afe25860cb33b8 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Wed, 14 Dec 2022 02:04:14 -0600
Subject: [PATCH 136/953] hip: rewrite and separate

hip-common: init at 5.4.0

hipcc: init at 5.4.1
---
 .../hip-common/0000-fixup-paths.patch         | 129 ++++++++
 .../compilers/hip-common/default.nix          |  59 ++++
 .../compilers/hip/0000-fixup-paths.patch      |  62 ++++
 pkgs/development/compilers/hip/default.nix    | 302 ++++++++----------
 .../compilers/hip/hip-config-paths.patch      |  35 --
 .../compilers/hip/hipamd-config-paths.patch   |  73 -----
 .../compilers/hipcc/0000-fixup-paths.patch    | 130 ++++++++
 pkgs/development/compilers/hipcc/default.nix  |  62 ++++
 .../compilers/llvm/rocm/default.nix           |   4 +-
 pkgs/top-level/all-packages.nix               |  22 +-
 10 files changed, 595 insertions(+), 283 deletions(-)
 create mode 100644 pkgs/development/compilers/hip-common/0000-fixup-paths.patch
 create mode 100644 pkgs/development/compilers/hip-common/default.nix
 create mode 100644 pkgs/development/compilers/hip/0000-fixup-paths.patch
 delete mode 100644 pkgs/development/compilers/hip/hip-config-paths.patch
 delete mode 100644 pkgs/development/compilers/hip/hipamd-config-paths.patch
 create mode 100644 pkgs/development/compilers/hipcc/0000-fixup-paths.patch
 create mode 100644 pkgs/development/compilers/hipcc/default.nix

diff --git a/pkgs/development/compilers/hip-common/0000-fixup-paths.patch b/pkgs/development/compilers/hip-common/0000-fixup-paths.patch
new file mode 100644
index 000000000000..f3fd73255520
--- /dev/null
+++ b/pkgs/development/compilers/hip-common/0000-fixup-paths.patch
@@ -0,0 +1,129 @@
+diff --git a/bin/hipcc.pl b/bin/hipcc.pl
+index da9559b..7aaa540 100755
+--- a/bin/hipcc.pl
++++ b/bin/hipcc.pl
+@@ -185,7 +185,7 @@ if ($HIP_PLATFORM eq "amd") {
+     chomp($HIP_CLANG_TARGET);
+ 
+     if (! defined $HIP_CLANG_INCLUDE_PATH) {
+-        $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");
++        $HIP_CLANG_INCLUDE_PATH = abs_path("@clang@/resource-root/include");
+     }
+     if (! defined $HIP_INCLUDE_PATH) {
+         $HIP_INCLUDE_PATH = "$HIP_PATH/include";
+@@ -206,8 +206,8 @@ if ($HIP_PLATFORM eq "amd") {
+         print ("HIP_CLANG_TARGET=$HIP_CLANG_TARGET\n");
+     }
+ 
+-    $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\"";
+-    $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\"";
++    $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\"";
++    $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\"";
+     $HIPLDFLAGS .= " -L\"$HIP_LIB_PATH\"";
+     if ($isWindows) {
+       $HIPLDFLAGS .= " -lamdhip64";
+@@ -625,7 +625,7 @@ if($HIP_PLATFORM eq "amd"){
+             $targetsStr = $ENV{HCC_AMDGPU_TARGET};
+         } elsif (not $isWindows) {
+             # Else try using rocm_agent_enumerator
+-            $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator";
++            $ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator";
+             $targetsStr = `${ROCM_AGENT_ENUM} -t GPU`;
+             $targetsStr =~ s/\n/,/g;
+         }
+@@ -724,16 +724,16 @@ if ($HIP_PLATFORM eq "amd") {
+ 
+     if (not $isWindows  and not $compileOnly) {
+       if ($linkType eq 0) {
+-        $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
++        $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
+       } else {
+         $toolArgs = ${toolArgs} . " -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 ";
+       }
+       # To support __fp16 and _Float16, explicitly link with compiler-rt
+-      $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a";
++      $HIP_CLANG_BUILTIN_LIB="@clang@/resource-root/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a";
+       if (-e $HIP_CLANG_BUILTIN_LIB) {
+-        $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET -lclang_rt.builtins "
++        $toolArgs .= " -L@clang@/resource-root/lib/$HIP_CLANG_TARGET -lclang_rt.builtins "
+       } else {
+-        $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 "
++        $toolArgs .= " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 "
+       }
+     }
+ }
+diff --git a/bin/hipconfig.pl b/bin/hipconfig.pl
+index 5ddb8e9..6a76a2e 100755
+--- a/bin/hipconfig.pl
++++ b/bin/hipconfig.pl
+@@ -77,7 +77,7 @@ if ($HIP_COMPILER eq "clang") {
+     $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -D__HIP_PLATFORM_AMD__=";
+ 
+     $HIP_PATH_INCLUDE = $HIP_PATH."/include";
+-    $HIP_CLANG_INCLUDE = $HIP_CLANG_PATH."/../lib/clang/".$HIP_CLANG_VERSION;
++    $HIP_CLANG_INCLUDE = "@clang@/resource-root/include";
+     if($isWindows) {
+         $CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\"";
+     } else {
+@@ -168,7 +168,7 @@ if (!$printed or $p_full) {
+             print ("HIP_CLANG_PATH   : $HIP_CLANG_PATH\n");
+             if ($isWindows) {
+                 system("\"$HIP_CLANG_PATH/clang++\" --version");
+-                system("\"$HIP_CLANG_PATH/llc\" --version");
++                system("\"@llvm@/bin/llc\" --version");
+                 printf("hip-clang-cxxflags : ");
+                 $win_output = `perl \"$HIP_PATH/bin/hipcc\" --cxxflags`;
+                 printf("$win_output \n");
+@@ -177,7 +177,7 @@ if (!$printed or $p_full) {
+                 printf("$win_output \n");
+             } else {
+                 system("$HIP_CLANG_PATH/clang++ --version");
+-                system("$HIP_CLANG_PATH/llc --version");
++                system("@llvm@/bin/llc --version");
+                 print ("hip-clang-cxxflags : ");
+                 system("$HIP_PATH/bin/hipcc --cxxflags");
+                 printf("\n");
+@@ -219,8 +219,8 @@ if (!$printed or $p_full) {
+         system ("uname -a");
+     }
+ 
+-    if (-e "/usr/bin/lsb_release") {
+-        system ("/usr/bin/lsb_release -a");
++    if (-e "@lsb_release@/bin/lsb_release") {
++        system ("@lsb_release@/bin/lsb_release -a");
+     }
+ 
+     print "\n" ;
+diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in
+index 9250a68..f6e27b7 100644
+--- a/hip-lang-config.cmake.in
++++ b/hip-lang-config.cmake.in
+@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH)
+ 
+ 
+ #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY
+-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include")
+-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include")
++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include")
++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@clang@/resource-root/include")
+ find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h
+     HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS}
+           ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG}
+@@ -89,7 +89,7 @@ find_path(HSA_HEADER hsa/hsa.h
+   PATHS
+     "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY
+     "${_IMPORT_PREFIX}/include"
+-    "${ROCM_PATH}/include"
++    "@rocm_runtime@/include"
+ )
+ 
+ if (NOT HSA_HEADER)
+@@ -97,7 +97,7 @@ if (NOT HSA_HEADER)
+ endif()
+ 
+ get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY)
+-file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*")
++file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*")
+ find_library(CLANGRT_BUILTINS
+     NAMES
+       clang_rt.builtins
diff --git a/pkgs/development/compilers/hip-common/default.nix b/pkgs/development/compilers/hip-common/default.nix
new file mode 100644
index 000000000000..a6343c920376
--- /dev/null
+++ b/pkgs/development/compilers/hip-common/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rocmUpdateScript
+, substituteAll
+, llvm
+, rocm-runtime
+, rocminfo
+, lsb-release
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hip-common";
+  version = "5.4.0";
+
+  src = fetchFromGitHub {
+    owner = "ROCm-Developer-Tools";
+    repo = "HIP";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-34SJM2n3jZWIS2uwpboWOXVFhaVWGK5ELPKD/cJc1zw=";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./0000-fixup-paths.patch;
+      inherit llvm rocminfo;
+      clang = stdenv.cc;
+      rocm_runtime = rocm-runtime;
+      lsb_release = lsb-release;
+    })
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv * $out
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
+
+  meta = with lib; {
+    description = "C++ Heterogeneous-Compute Interface for Portability";
+    homepage = "https://github.com/ROCm-Developer-Tools/HIP";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
+    platforms = platforms.linux;
+    broken = finalAttrs.version != stdenv.cc.version;
+  };
+})
diff --git a/pkgs/development/compilers/hip/0000-fixup-paths.patch b/pkgs/development/compilers/hip/0000-fixup-paths.patch
new file mode 100644
index 000000000000..423857218ee7
--- /dev/null
+++ b/pkgs/development/compilers/hip/0000-fixup-paths.patch
@@ -0,0 +1,62 @@
+diff --git a/hip-config.cmake.in b/hip-config.cmake.in
+index 89d1224..dc9ba05 100755
+--- a/hip-config.cmake.in
++++ b/hip-config.cmake.in
+@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang")
+       file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT)
+     endif()
+   else()
+-    set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm")
++    set(HIP_CLANG_ROOT "@clang@")
+   endif()
+   if(NOT HIP_CXX_COMPILER)
+     set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER})
+@@ -171,7 +171,7 @@ if(HIP_COMPILER STREQUAL "clang")
+     get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY)
+     get_filename_component(HIP_CLANG_ROOT "${_HIP_CLANG_BIN_PATH}" DIRECTORY)
+   endif()
+-  file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS ${HIP_CLANG_ROOT}/lib/clang/*/include)
++  file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include")
+   find_path(HIP_CLANG_INCLUDE_PATH stddef.h
+       HINTS
+           ${HIP_CLANG_INCLUDE_SEARCH_PATHS}
+@@ -209,7 +209,7 @@ if(NOT WIN32)
+       "${_IMPORT_PREFIX}/include"
+       #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility
+       "${_IMPORT_PREFIX}/../include"
+-      ${ROCM_PATH}/include
++      "@rocm_runtime@/include"
+   )
+ 
+   if (NOT HSA_HEADER)
+@@ -291,7 +291,7 @@ if(HIP_COMPILER STREQUAL "clang")
+     endif()
+   endif()
+ 
+-  file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_CLANG_ROOT}/lib/clang/*/lib/*")
++  file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*")
+   find_library(CLANGRT_BUILTINS
+     NAMES
+       clang_rt.builtins
+diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh
+index 0a1572b..2feb19a 100755
+--- a/src/hip_embed_pch.sh
++++ b/src/hip_embed_pch.sh
+@@ -149,7 +149,7 @@ EOF
+ 
+   $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui &&
+ 
+-  $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj &&
++  @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj &&
+ 
+   rm -rf $tmp
+ }
+@@ -195,7 +195,7 @@ EOF
+   set -x
+   $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib --hip-version=4.4 -isystem $HIP_INC_DIR -isystem $HIP_BUILD_INC_DIR -isystem $HIP_AMD_INC_DIR --cuda-device-only -D__HIPCC_RTC__ -x hip $tmp/hipRTC_header.h -E -o $tmp/hiprtc &&
+   cat $macroFile >> $tmp/hiprtc &&
+-  $LLVM_DIR/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj &&
++  @llvm@/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj &&
+   $LLVM_DIR/bin/clang $tmp/hiprtc_header.o -o $rtc_shared_lib_out -shared &&
+   $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib -nogpuinc -emit-llvm -c -o $tmp/tmp.bc --cuda-device-only -D__HIPCC_RTC__ --offload-arch=gfx906 -x hip-cpp-output $tmp/hiprtc &&
+   rm -rf $tmp
diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix
index 066fd906984d..ecb763cea83f 100644
--- a/pkgs/development/compilers/hip/default.nix
+++ b/pkgs/development/compilers/hip/default.nix
@@ -1,114 +1,62 @@
-{ stdenv
-, binutils-unwrapped
-, clang
-, cmake
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
-, file
-, lib
-, libglvnd
-, libX11
-, libxml2
-, llvm
+, rocmUpdateScript
+, substituteAll
 , makeWrapper
-, numactl
-, perl
-, python3
-, python3Packages
+, hip-common
+, hipcc
 , rocclr
+, roctracer
+, cmake
+, perl
+, llvm
+, rocminfo
+, rocm-thunk
 , rocm-comgr
 , rocm-device-libs
-, rocm-opencl-runtime
 , rocm-runtime
-, rocm-thunk
-, rocminfo
-, substituteAll
-, writeScript
-, writeText
+, rocm-opencl-runtime
+, cudatoolkit
+, numactl
+, libxml2
+, libX11
+, libglvnd
+, doxygen
+, graphviz
+, fontconfig
+, python3Packages
+, buildDocs ? true
+, buildTests ? false
+, useNVIDIA ? false
 }:
 
 let
-  hip = stdenv.mkDerivation (finalAttrs: {
-    pname = "hip";
-    version = "5.4.0";
+  hipPlatform = if useNVIDIA then "nvidia" else "amd";
 
-    src = fetchFromGitHub {
-      owner = "ROCm-Developer-Tools";
-      repo = "HIP";
-      rev = "rocm-${finalAttrs.version}";
-      hash = "sha256-34SJM2n3jZWIS2uwpboWOXVFhaVWGK5ELPKD/cJc1zw=";
-    };
-
-    patches = [
-      (substituteAll {
-        src = ./hip-config-paths.patch;
-        inherit llvm;
-        rocm_runtime = rocm-runtime;
-      })
-    ];
-
-    # - fix bash paths
-    # - fix path to rocm_agent_enumerator
-    # - fix hcc path
-    # - fix hcc version parsing
-    # - add linker flags for libhsa-runtime64 and hc_am since libhip_hcc
-    #   refers to them.
-    prePatch = ''
-      for f in $(find bin -type f); do
-        sed -e 's,#!/usr/bin/perl,#!${perl}/bin/perl,' \
-            -e 's,#!/bin/bash,#!${stdenv.shell},' \
-            -i "$f"
-      done
-
-      sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py
-
-      sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \
-          -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \
-          -e 's,^\($HIP_COMPILER=\).*$,\1"clang";,' \
-          -e 's,^\($HIP_RUNTIME=\).*$,\1"ROCclr";,' \
-          -e 's,^\([[:space:]]*$HSA_PATH=\).*$,\1"${rocm-runtime}";,'g \
-          -e 's,^\([[:space:]]*\)$HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");,\1$HIP_CLANG_INCLUDE_PATH = "${llvm}/lib/clang/$HIP_CLANG_VERSION/include";,' \
-          -e 's,^\([[:space:]]*$HIPCXXFLAGS .= " -isystem \\"$HIP_CLANG_INCLUDE_PATH/..\\"\)";,\1 -isystem ${rocm-runtime}/include";,' \
-          -e 's,$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION,$HIP_CLANG_PATH/../resource-root,g' \
-          -e 's,`file,`${file}/bin/file,g' \
-          -e 's,`readelf,`${binutils-unwrapped}/bin/readelf,' \
-          -e 's, ar , ${binutils-unwrapped}/bin/ar ,g' \
-          -i bin/hipcc.pl
-
-      sed -e 's,^\($HSA_PATH=\).*$,\1"${rocm-runtime}";,' \
-          -e 's,^\($HIP_CLANG_PATH=\).*$,\1"${clang}/bin";,' \
-          -e 's,^\($HIP_PLATFORM=\).*$,\1"amd";,' \
-          -e 's,$HIP_CLANG_PATH/llc,${llvm}/bin/llc,' \
-          -e 's, abs_path, Cwd::abs_path,' \
-          -i bin/hipconfig.pl
-
-      sed -e 's, abs_path, Cwd::abs_path,' -i bin/hipvars.pm
-    '';
-
-    buildPhase = "";
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out
-      cp -r * $out/
-
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "C++ Heterogeneous-Compute Interface for Portability";
-      homepage = "https://github.com/ROCm-Developer-Tools/HIP";
-      license = licenses.mit;
-      maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
-      platforms = platforms.linux;
-    };
-  });
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "hip";
+  wrapperArgs = [
+    "--prefix PATH : $out/bin"
+    "--prefix LD_LIBRARY_PATH : ${rocm-runtime}"
+    "--set HIP_PLATFORM ${hipPlatform}"
+    "--set HIP_PATH $out"
+    "--set HIP_CLANG_PATH ${stdenv.cc}/bin"
+    "--set DEVICE_LIB_PATH ${rocm-device-libs}/amdgcn/bitcode"
+    "--set HSA_PATH ${rocm-runtime}"
+    "--set ROCM_PATH $out"
+  ] ++ lib.optionals useNVIDIA [
+    "--set CUDA_PATH ${cudatoolkit}"
+  ];
+in stdenv.mkDerivation (finalAttrs: {
+  pname = "hip-${hipPlatform}";
   version = "5.4.0";
 
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildDocs [
+    "doc"
+  ];
+
   src = fetchFromGitHub {
     owner = "ROCm-Developer-Tools";
     repo = "hipamd";
@@ -116,105 +64,115 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-VL0vZVv099pZPX0J2pXPFvrhkVO/b6X+ZZDaD9B1hYI=";
   };
 
-  nativeBuildInputs = [ cmake python3 makeWrapper perl ];
-  buildInputs = [ libxml2 numactl libglvnd libX11 python3Packages.cppheaderparser ];
-  propagatedBuildInputs = [
-    clang
-    llvm
-    rocm-comgr
-    rocm-device-libs
-    rocm-runtime
-    rocm-thunk
-    rocminfo
-  ];
-
   patches = [
     (substituteAll {
-      src = ./hipamd-config-paths.patch;
-      inherit clang llvm hip;
+      src = ./0000-fixup-paths.patch;
+      inherit llvm;
+      clang = stdenv.cc;
       rocm_runtime = rocm-runtime;
     })
+
+    # https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9
+    (fetchpatch {
+      url = "https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9.patch";
+      hash = "sha256-eTC4mUIN1FwRce1n38uDOlITFL/vpcOhvnaZTo5R7lo=";
+    })
   ];
 
-  prePatch = ''
-    sed -e 's,#!/bin/bash,#!${stdenv.shell},' \
-        -i src/hip_embed_pch.sh
-  '';
+  nativeBuildInputs = [
+    makeWrapper
+    cmake
+    perl
+    python3Packages.python
+    python3Packages.cppheaderparser
+  ] ++ lib.optionals buildDocs [
+    doxygen
+    graphviz
+    fontconfig
+  ];
 
-  preConfigure = ''
-    export HIP_CLANG_PATH=${clang}/bin
-    export DEVICE_LIB_PATH=${rocm-device-libs}/lib
-  '';
+  buildInputs = [
+    numactl
+    libxml2
+    libX11
+    libglvnd
+  ];
+
+  propagatedBuildInputs = [
+    stdenv.cc
+    llvm
+    rocminfo
+    rocm-thunk
+    rocm-comgr
+    rocm-device-libs
+    rocm-runtime
+    rocm-opencl-runtime
+  ] ++ lib.optionals useNVIDIA [
+    cudatoolkit
+  ];
 
   cmakeFlags = [
-    "-DHIP_PLATFORM=amd"
-    "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}"
-    "-DHIP_COMMON_DIR=${hip}"
+    "-DROCM_PATH=${rocminfo}"
+    "-DHIP_PLATFORM=${hipPlatform}"
+    "-DHIP_COMMON_DIR=${hip-common}"
+    "-DHIPCC_BIN_DIR=${hipcc}/bin"
+    "-DHIP_LLVM_ROOT=${stdenv.cc}"
     "-DROCCLR_PATH=${rocclr}"
-    "-DHIP_VERSION_BUILD_ID=0"
+    "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}"
+    "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext"
     # Temporarily set variables to work around upstream CMakeLists issue
     # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed
     "-DCMAKE_INSTALL_BINDIR=bin"
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_LIBDIR=lib"
+  ] ++ lib.optionals buildTests [
+    "-DHIP_CATCH_TEST=1"
   ];
 
+  postPatch = ''
+    export HIP_CLANG_PATH=${stdenv.cc}/bin
+    patchShebangs src
+  '' + lib.optionalString buildDocs ''
+    export HOME=$(mktemp -d)
+    export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
+  '';
+
+  doCheck = buildTests;
+  checkTarget = "build_tests";
+
+  preCheck = lib.optionalString buildTests ''
+    export ROCM_PATH=$PWD
+    export DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode
+    patchShebangs bin
+  '';
+
   postInstall = ''
     patchShebangs $out/bin
-    wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${llvm}/bin --set ROCM_PATH $out
-    wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin
+    cp -a $out/bin/hipcc $out/bin/hipcc-pl
+    cp -a $out/bin/hipconfig $out/bin/hipconfig-pl
+    wrapProgram $out/bin/hipcc --set HIP_USE_PERL_SCRIPTS 0
+    wrapProgram $out/bin/hipconfig --set HIP_USE_PERL_SCRIPTS 0
+    wrapProgram $out/bin/hipcc.bin ${lib.concatStringsSep " " wrapperArgs}
+    wrapProgram $out/bin/hipconfig.bin ${lib.concatStringsSep " " wrapperArgs}
+    wrapProgram $out/bin/hipcc-pl --set HIP_USE_PERL_SCRIPTS 1
+    wrapProgram $out/bin/hipconfig-pl --set HIP_USE_PERL_SCRIPTS 1
+    wrapProgram $out/bin/hipcc.pl ${lib.concatStringsSep " " wrapperArgs}
+    wrapProgram $out/bin/hipconfig.pl ${lib.concatStringsSep " " wrapperArgs}
   '';
 
-  # TODO: Separate HIP and hipamd into separate derivations
-  passthru.updateScript = writeScript "update.sh" ''
-    #!/usr/bin/env nix-shell
-    #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github
-    version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-      -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
-
-    IFS='.' read -a version_arr <<< "$version"
-
-    if [ "''${#version_arr[*]}" == 2 ]; then
-      version="''${version}.0"
-    fi
-
-    current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)"
-    if [[ "$version" != "$current_version" ]]; then
-      tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")"
-      tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))"
-      sed -i -z "pkgs/development/compilers/hip/default.nix" \
-        -e 's,version = "[^'"'"'"]*",version = "'"$version"'",1' \
-        -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",1'
-    else
-      echo hip already up-to-date
-    fi
-
-    version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-      -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
-
-    IFS='.' read -a version_arr <<< "$version"
-
-    if [ "''${#version_arr[*]}" == 2 ]; then
-      version="''${version}.0"
-    fi
-
-    current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)"
-    if [[ "$version" != "$current_version" ]]; then
-      tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")"
-      tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))"
-      sed -i -z "pkgs/development/compilers/hip/default.nix" \
-        -e 's,version = "[^'"'"'"]*",version = "'"$version"'",2' \
-        -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",2'
-    else
-      echo hipamd already up-to-date
-    fi
-  '';
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
 
   meta = with lib; {
-    description = "C++ Heterogeneous-Compute Interface for Portability";
+    description = "C++ Heterogeneous-Compute Interface for Portability specifically for AMD platform";
     homepage = "https://github.com/ROCm-Developer-Tools/hipamd";
-    license = licenses.mit;
+    license = with licenses; [ mit ];
     maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
     platforms = platforms.linux;
+    # Tests require GPU, also include issues
+    broken = finalAttrs.version != hip-common.version || finalAttrs.version != hipcc.version || buildTests;
   };
 })
diff --git a/pkgs/development/compilers/hip/hip-config-paths.patch b/pkgs/development/compilers/hip/hip-config-paths.patch
deleted file mode 100644
index 25fa3b8da95a..000000000000
--- a/pkgs/development/compilers/hip/hip-config-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in
-index 1a72643a..7f35031f 100644
---- a/hip-lang-config.cmake.in
-+++ b/hip-lang-config.cmake.in
-@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH)
- 
- 
- #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY
--file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include")
--file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include")
-+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@llvm@/lib/clang/*/include")
-+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@llvm@/lib/clang/*/include")
- find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h
-     HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS}
-           ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG}
-@@ -87,9 +87,7 @@ endif()
- #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH=<HSA_PATH>
- find_path(HSA_HEADER hsa/hsa.h
-   PATHS
--    "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY
--    "${_IMPORT_PREFIX}/include"
--    "${ROCM_PATH}/include"
-+    "@rocm_runtime@/include"
- )
- 
- if (NOT HSA_HEADER)
-@@ -97,7 +94,7 @@ if (HSA_HEADER-NOTFOUND)
- endif()
- 
- get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY)
--file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*")
-+file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@llvm@/lib/clang/*/lib/*")
- find_library(CLANGRT_BUILTINS
-     NAMES
-       clang_rt.builtins
diff --git a/pkgs/development/compilers/hip/hipamd-config-paths.patch b/pkgs/development/compilers/hip/hipamd-config-paths.patch
deleted file mode 100644
index 78838836e9aa..000000000000
--- a/pkgs/development/compilers/hip/hipamd-config-paths.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/hip-config.cmake.in b/hip-config.cmake.in
-index 89d1224e..120b68c6 100755
---- a/hip-config.cmake.in
-+++ b/hip-config.cmake.in
-@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang")
-       file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT)
-     endif()
-   else()
--    set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm")
-+    set(HIP_CLANG_ROOT "@clang@")
-   endif()
-   if(NOT HIP_CXX_COMPILER)
-     set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER})
-@@ -206,10 +206,7 @@ if(NOT WIN32)
-   #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH=<HSA_PATH>
-   find_path(HSA_HEADER hsa/hsa.h
-     PATHS
--      "${_IMPORT_PREFIX}/include"
--      #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility
--      "${_IMPORT_PREFIX}/../include"
--      ${ROCM_PATH}/include
-+      "@rocm_runtime@/include"
-   )
-
-   if (NOT HSA_HEADER)
-@@ -224,8 +221,8 @@ set_target_properties(hip::host PROPERTIES
-
- if(HIP_RUNTIME MATCHES "rocclr")
-   set_target_properties(hip::amdhip64 PROPERTIES
--    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
--    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
-+    INTERFACE_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}"
-+    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}"
-   )
-
-   get_target_property(amdhip64_type hip::amdhip64 TYPE)
-@@ -233,8 +230,8 @@ if(HIP_RUNTIME MATCHES "rocclr")
-
-   if(NOT WIN32)
-     set_target_properties(hip::device PROPERTIES
--      INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
--      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-+      INTERFACE_INCLUDE_DIRECTORIES "@hip@/include"
-+      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include"
-     )
-   endif()
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 83866d83..4125d3aa 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -178,7 +178,7 @@ if(__HIP_ENABLE_PCH)
-       ${ROCM_PATH}/llvm)
-   # find_package(LLVM) returns the lib/cmake/llvm location. We require the root.
-   if(NOT DEFINED HIP_LLVM_ROOT)
--    set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..")
-+    set(HIP_LLVM_ROOT "@clang@")
-   endif()
-
-   execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/hip_embed_pch.sh ${HIP_COMMON_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC)
-diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh
-index 0a1572b2..aa855d63 100755
---- a/src/hip_embed_pch.sh
-+++ b/src/hip_embed_pch.sh
-@@ -149,7 +149,7 @@ EOF
-
-   $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui &&
-
--  $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj &&
-+  @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj &&
-
-   rm -rf $tmp
- }
diff --git a/pkgs/development/compilers/hipcc/0000-fixup-paths.patch b/pkgs/development/compilers/hipcc/0000-fixup-paths.patch
new file mode 100644
index 000000000000..4f52c1ad11aa
--- /dev/null
+++ b/pkgs/development/compilers/hipcc/0000-fixup-paths.patch
@@ -0,0 +1,130 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c21f247..5bd3e45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,6 +17,6 @@ if (NOT WIN32) # C++17 does not require the std lib linking
+   target_link_libraries(hipconfig.bin ${LINK_LIBS} ) # for hipconfig.bin
+ endif()
+ 
+-set(HIP_VERSION_MAJOR 4 PARENT_SCOPE)
+-set(HIP_VERSION_MINOR 4 PARENT_SCOPE)
+-set(HIP_VERSION_PATCH 4 PARENT_SCOPE)
++set(HIP_VERSION_MAJOR @version_major@)
++set(HIP_VERSION_MINOR @version_minor@)
++set(HIP_VERSION_PATCH @version_patch@)
+diff --git a/src/hipBin_amd.h b/src/hipBin_amd.h
+index f94e4a5..f0b1b83 100644
+--- a/src/hipBin_amd.h
++++ b/src/hipBin_amd.h
+@@ -207,7 +207,7 @@ void HipBinAmd::initializeHipCXXFlags() {
+   hipClangIncludePath = getCompilerIncludePath();
+   hipCXXFlags += " -isystem \"" + hipClangIncludePath;
+   fs::path hipCXXFlagsTempFs = hipCXXFlags;
+-  hipCXXFlagsTempFs /= "..\"";
++  hipCXXFlagsTempFs /= "\"";
+   hipCXXFlags = hipCXXFlagsTempFs.string();
+   const EnvVariables& var = getEnvVariables();
+   // Allow __fp16 as function parameter and return type.
+@@ -266,7 +266,7 @@ void HipBinAmd::printCompilerInfo() const {
+     string cmd = hipClangPath + "/clang++ --version";
+     system(cmd.c_str());  // hipclang version
+     cout << "llc-version :" << endl;
+-    cmd = hipClangPath + "/llc --version";
++    cmd = "@llvm@/bin/llc --version";
+     system(cmd.c_str());  // llc version
+     cout << "hip-clang-cxxflags :" << endl;
+     cmd = hipPath + "/bin/hipcc  --cxxflags";
+@@ -278,7 +278,7 @@ void HipBinAmd::printCompilerInfo() const {
+   } else {
+     string cmd = hipClangPath + "/clang++ --version";
+     system(cmd.c_str());  // hipclang version
+-    cmd = hipClangPath + "/llc --version";
++    cmd = "@llvm@/bin/llc --version";
+     system(cmd.c_str());  // llc version
+     cout << "hip-clang-cxxflags :" << endl;
+     cmd = hipPath + "/bin/hipcc --cxxflags";
+@@ -331,10 +331,7 @@ string HipBinAmd::getCppConfig() {
+   hipPathInclude /= "include";
+ 
+   const string& compilerPath = getCompilerPath();
+-  hipClangInclude = compilerPath;
+-  hipClangInclude = hipClangInclude.parent_path();
+-  hipClangInclude /= "lib/clang/";
+-  hipClangInclude /= compilerVersion;
++  hipClangInclude = "@clang@/resource-root/include";
+   string hipClangPath = hipClangInclude.string();
+ 
+   const OsType& osInfo = getOSInfo();
+@@ -442,17 +439,7 @@ string HipBinAmd::getHipCC() const {
+ 
+ 
+ string HipBinAmd::getCompilerIncludePath() {
+-  string hipClangVersion, includePath, compilerIncludePath;
+-  const string& hipClangPath = getCompilerPath();
+-  hipClangVersion = getCompilerVersion();
+-  fs::path includePathfs = hipClangPath;
+-  includePathfs = includePathfs.parent_path();
+-  includePathfs /= "lib/clang/";
+-  includePathfs /= hipClangVersion;
+-  includePathfs /= "include";
+-  includePathfs = fs::absolute(includePathfs).string();
+-  compilerIncludePath = includePathfs.string();
+-  return compilerIncludePath;
++  return "@clang@/resource-root/include";
+ }
+ 
+ 
+@@ -506,8 +493,8 @@ void HipBinAmd::printFull() {
+   cout << endl << "== Envirnoment Variables" << endl;
+   printEnvironmentVariables();
+   getSystemInfo();
+-  if (fs::exists("/usr/bin/lsb_release"))
+-    system("/usr/bin/lsb_release -a");
++  if (fs::exists("@lsb_release@/bin/lsb_release"))
++    system("@lsb_release@/bin/lsb_release -a");
+   cout << endl;
+ }
+ 
+@@ -993,7 +980,7 @@ void HipBinAmd::executeHipCCCmd(vector<string> argv) {
+     } else if (os != windows) {
+       // Else try using rocm_agent_enumerator
+       string ROCM_AGENT_ENUM;
+-      ROCM_AGENT_ENUM = roccmPath + "/bin/rocm_agent_enumerator";
++      ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator";
+       targetsStr = ROCM_AGENT_ENUM +" -t GPU";
+       SystemCmdOut sysOut = hipBinUtilPtr_->exec(targetsStr.c_str());
+       regex toReplace("\n+");
+@@ -1097,7 +1084,7 @@ void HipBinAmd::executeHipCCCmd(vector<string> argv) {
+     string hipClangVersion, toolArgTemp;
+     if (linkType == 0) {
+       toolArgTemp = " -L"+ hipLibPath + "-lamdhip64 -L" +
+-                      roccmPath+ "/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs;
++                      "@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs;
+       toolArgs = toolArgTemp;
+     } else {
+       toolArgTemp =  toolArgs + " -Wl,--enable-new-dtags -Wl,-rpath=" + hipLibPath + ":"
+@@ -1107,8 +1094,7 @@ void HipBinAmd::executeHipCCCmd(vector<string> argv) {
+ 
+     hipClangVersion = getCompilerVersion();
+     // To support __fp16 and _Float16, explicitly link with compiler-rt
+-    toolArgs += " -L" + hipClangPath + "/../lib/clang/" +
+-                hipClangVersion + "/lib/linux -lclang_rt.builtins-x86_64 ";
++    toolArgs += " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 ";
+   }
+   if (!var.hipccCompileFlagsAppendEnv_.empty()) {
+     HIPCXXFLAGS += " " + var.hipccCompileFlagsAppendEnv_ + " ";
+diff --git a/src/hipBin_nvidia.h b/src/hipBin_nvidia.h
+index 6feb315..b61739d 100644
+--- a/src/hipBin_nvidia.h
++++ b/src/hipBin_nvidia.h
+@@ -157,8 +157,8 @@ void HipBinNvidia::printFull() {
+   cout << endl << "== Envirnoment Variables" << endl;
+   printEnvironmentVariables();
+   getSystemInfo();
+-  if (fs::exists("/usr/bin/lsb_release"))
+-    system("/usr/bin/lsb_release -a");
++  if (fs::exists("@lsb_release@/bin/lsb_release"))
++    system("@lsb_release@/bin/lsb_release -a");
+ }
+ 
+ // returns hip include
diff --git a/pkgs/development/compilers/hipcc/default.nix b/pkgs/development/compilers/hipcc/default.nix
new file mode 100644
index 000000000000..8351e3a29123
--- /dev/null
+++ b/pkgs/development/compilers/hipcc/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rocmUpdateScript
+, substituteAll
+, cmake
+, llvm
+, rocm-runtime
+, rocminfo
+, lsb-release
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hipcc";
+  version = "5.4.1";
+
+  src = fetchFromGitHub {
+    owner = "ROCm-Developer-Tools";
+    repo = "HIPCC";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-PEwue4O43MiMkF8UmTeHsmlikBG2V3/nFQLKmtHrRWQ=";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./0000-fixup-paths.patch;
+      inherit llvm rocminfo;
+      version_major = lib.versions.major finalAttrs.version;
+      version_minor = lib.versions.minor finalAttrs.version;
+      version_patch = lib.versions.patch finalAttrs.version;
+      clang = stdenv.cc;
+      rocm_runtime = rocm-runtime;
+      lsb_release = lsb-release;
+    })
+  ];
+
+  nativeBuildInputs = [ cmake ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    mv *.bin $out/bin
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
+
+  meta = with lib; {
+    description = "Compiler driver utility that calls clang or nvcc";
+    homepage = "https://github.com/ROCm-Developer-Tools/HIPCC";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
+    platforms = platforms.linux;
+    broken = finalAttrs.version != stdenv.cc.version;
+  };
+})
diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix
index 4f96c567a631..75314a4b4633 100644
--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@@ -12,7 +12,7 @@
 , swig
 , lua5_3
 , gtest
-, hipcc
+, hip
 , rocm-comgr
 , vulkan-loader
 , vulkan-headers
@@ -471,7 +471,7 @@ in rec {
     buildMan = false; # No man pages to build
     targetName = "mlir";
     targetDir = targetName;
-    extraNativeBuildInputs = [ hipcc ];
+    extraNativeBuildInputs = [ hip ];
 
     extraBuildInputs = [
       rocm-comgr
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d128b3ca725d..08f3d9f25ba2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15147,8 +15147,28 @@ with pkgs;
     stdenv = rocmClangStdenv;
   };
 
+  hip-common = callPackage ../development/compilers/hip-common {
+    inherit (llvmPackages_rocm) llvm;
+    stdenv = rocmClangStdenv;
+  };
+
+  hipcc = callPackage ../development/compilers/hipcc {
+    inherit (llvmPackages_rocm) llvm;
+    stdenv = rocmClangStdenv;
+  };
+
   hip = callPackage ../development/compilers/hip {
-    inherit (llvmPackages_rocm) clang llvm;
+    inherit (llvmPackages_rocm) llvm;
+    inherit (cudaPackages) cudatoolkit;
+    stdenv = rocmClangStdenv;
+  };
+
+  hip-amd = hip.override {
+    useNVIDIA = false;
+  };
+
+  hip-nvidia = hip.override {
+    useNVIDIA = true;
   };
 
   hipcub = callPackage ../development/libraries/hipcub {

From b943545109674c85163b9e034a6f4798262ef3c3 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 16 Dec 2022 03:27:28 -0600
Subject: [PATCH 137/953] rocprofiler: init at 5.4.0

---
 ...0000-dont-require-hsa_amd_aqlprofile.patch | 20 ++++++
 .../libraries/rocprofiler/default.nix         | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 89 insertions(+)
 create mode 100644 pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch
 create mode 100644 pkgs/development/libraries/rocprofiler/default.nix

diff --git a/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch b/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch
new file mode 100644
index 000000000000..b70163b08e48
--- /dev/null
+++ b/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch
@@ -0,0 +1,20 @@
+diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp
+index 643ff16..c08d98f 100644
+--- a/src/util/hsa_rsrc_factory.cpp
++++ b/src/util/hsa_rsrc_factory.cpp
+@@ -127,15 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize
+   if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+   if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+
+-  // Get AqlProfile API table
+-  aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+-  status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+-  status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+-  CHECK_STATUS("aqlprofile API table load failed", status);
+-
+   // Get Loader API table
+   loader_api_ = {0};
+   status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, sizeof(loader_api_), &loader_api_);
diff --git a/pkgs/development/libraries/rocprofiler/default.nix b/pkgs/development/libraries/rocprofiler/default.nix
new file mode 100644
index 000000000000..0d0639edbe53
--- /dev/null
+++ b/pkgs/development/libraries/rocprofiler/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rocmUpdateScript
+, cmake
+, rocm-runtime
+, rocm-thunk
+, roctracer
+, numactl
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocprofiler";
+  version = "5.4.0";
+
+  src = fetchFromGitHub {
+    owner = "ROCm-Developer-Tools";
+    repo = "rocprofiler";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-CpD/+soMN8WTeSb5X7dsnZ596PMkw+4EVsVSvFtKCak=";
+  };
+
+  patches = [ ./0000-dont-require-hsa_amd_aqlprofile.patch ];
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    rocm-thunk
+    rocm-runtime
+    numactl
+  ];
+
+  cmakeFlags = [
+    "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ];
+
+  postPatch = ''
+    patchShebangs bin test
+
+    substituteInPlace cmake_modules/env.cmake \
+      --replace "FATAL_ERROR \"AQL_PROFILE" "WARNING \"AQL_PROFILE"
+  '';
+
+  postInstall = ''
+    patchelf --set-rpath $out/lib:${lib.makeLibraryPath finalAttrs.buildInputs} $out/lib/rocprofiler/librocprof-tool.so
+  '';
+
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
+
+  meta = with lib; {
+    description = "Profiling with perf-counters and derived metrics";
+    homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler";
+    license = with licenses; [ mit ]; # mitx11
+    maintainers = teams.rocm.members;
+    broken = finalAttrs.version != stdenv.cc.version;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08f3d9f25ba2..228dc4a6b4d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15137,6 +15137,10 @@ with pkgs;
     stdenv = rocmClangStdenv;
   };
 
+  rocprofiler = callPackage ../development/libraries/rocprofiler {
+    stdenv = rocmClangStdenv;
+  };
+
   clang-ocl = callPackage ../development/libraries/clang-ocl {
     stdenv = rocmClangStdenv;
   };

From 5b74e4ef126b19831cdcaa6f3b7052fb4d637162 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 16 Dec 2022 03:28:05 -0600
Subject: [PATCH 138/953] roctracer: init at 5.4.0

---
 .../libraries/roctracer/default.nix           | 97 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +
 2 files changed, 102 insertions(+)
 create mode 100644 pkgs/development/libraries/roctracer/default.nix

diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix
new file mode 100644
index 000000000000..b8d1902d468d
--- /dev/null
+++ b/pkgs/development/libraries/roctracer/default.nix
@@ -0,0 +1,97 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rocmUpdateScript
+, cmake
+, clang
+, hip
+, rocm-device-libs
+, rocprofiler
+, libxml2
+, doxygen
+, graphviz
+, python3Packages
+, buildDocs ? false # Nothing seems to be generated, so not making the output
+, buildTests ? false
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "roctracer";
+  version = "5.4.0";
+
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildDocs [
+    "doc"
+  ] ++ lib.optionals buildTests [
+    "test"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "ROCm-Developer-Tools";
+    repo = "roctracer";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-hDo/tz39/m6lKqLg3UJi3LWWF7/QUtVDymZY1O8L4IQ=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    clang
+    hip
+  ] ++ lib.optionals buildDocs [
+    doxygen
+    graphviz
+  ];
+
+  buildInputs = [
+    rocm-device-libs
+    rocprofiler
+    libxml2
+    python3Packages.python
+    python3Packages.cppheaderparser
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_MODULE_PATH=${hip}/hip/cmake"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ];
+
+  postPatch = ''
+    export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode
+  '' + lib.optionalString (!buildTests) ''
+    substituteInPlace CMakeLists.txt \
+      --replace "add_subdirectory(test)" ""
+  '';
+
+  # Tests always fail, probably need GPU
+  # doCheck = buildTests;
+
+  postInstall = lib.optionalString buildDocs ''
+    mkdir -p $doc
+  '' + lib.optionalString buildTests ''
+    mkdir -p $test/bin
+    # Not sure why this is an install target
+    find $out/test -executable -type f -exec mv {} $test/bin \;
+    rm $test/bin/{*.sh,*.py}
+    patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} $test/bin/*
+    rm -rf $out/test
+  '';
+
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
+
+  meta = with lib; {
+    description = "Tracer callback/activity library";
+    homepage = "https://github.com/ROCm-Developer-Tools/roctracer";
+    license = with licenses; [ mit ]; # mitx11
+    maintainers = teams.rocm.members;
+    broken = finalAttrs.version != hip.version;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 228dc4a6b4d6..f08c9638029f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15287,6 +15287,11 @@ with pkgs;
 
   rocmUpdateScript = callPackage ../development/rocm-modules/update-script { };
 
+  # Requires GCC
+  roctracer = callPackage ../development/libraries/roctracer {
+    inherit (llvmPackages_rocm) clang;
+  };
+
   rtags = callPackage ../development/tools/rtags {
     inherit (darwin) apple_sdk;
   };

From ecaaa49b651b8385ba86e9ede313a8e337289d93 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 16 Dec 2022 06:00:57 -0600
Subject: [PATCH 139/953] rocsolver: init at 5.4.0

---
 .../libraries/rocsolver/default.nix           | 92 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 2 files changed, 96 insertions(+)
 create mode 100644 pkgs/development/libraries/rocsolver/default.nix

diff --git a/pkgs/development/libraries/rocsolver/default.nix b/pkgs/development/libraries/rocsolver/default.nix
new file mode 100644
index 000000000000..dfb09f49cddc
--- /dev/null
+++ b/pkgs/development/libraries/rocsolver/default.nix
@@ -0,0 +1,92 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rocmUpdateScript
+, cmake
+, rocm-cmake
+, rocblas
+, hip
+, fmt
+, gtest
+, gfortran
+, lapack-reference
+, buildTests ? false
+, buildBenchmarks ? false
+, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx906:xnack-" ]
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocsolver";
+  version = "5.4.0";
+
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildTests [
+    "test"
+  ] ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "ROCmSoftwarePlatform";
+    repo = "rocSOLVER";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-UHUcA9CVPuYFpE2DTvRrRMMj51yNPo5wMTKnByL2RTg=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
+    hip
+  ] ++ lib.optionals (buildTests || buildBenchmarks) [
+    gfortran
+  ];
+
+  buildInputs = [
+    rocblas
+    fmt
+  ] ++ lib.optionals buildTests [
+    gtest
+  ] ++ lib.optionals (buildTests || buildBenchmarks) [
+    lapack-reference
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_CXX_COMPILER=hipcc"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ] ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ] ++ lib.optionals buildTests [
+    "-DBUILD_CLIENTS_TESTS=ON"
+  ] ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ];
+
+  postInstall = lib.optionalString buildTests ''
+    mkdir -p $test/bin
+    mv $out/bin/rocsolver-test $test/bin
+  '' + lib.optionalString buildBenchmarks ''
+    mkdir -p $benchmark/bin
+    mv $out/bin/rocsolver-bench $benchmark/bin
+  '' + lib.optionalString (buildTests || buildBenchmarks) ''
+    rmdir $out/bin
+  '';
+
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
+
+  meta = with lib; {
+    description = "ROCm LAPACK implementation";
+    homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER";
+    license = with licenses; [ bsd2 ];
+    maintainers = teams.rocm.members;
+    broken = finalAttrs.version != hip.version;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f08c9638029f..ae593144acc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15203,6 +15203,10 @@ with pkgs;
     stdenv = rocmClangStdenv;
   };
 
+  rocsolver = callPackage ../development/libraries/rocsolver {
+    stdenv = rocmClangStdenv;
+  };
+
   rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime {
     stdenv = rocmClangStdenv;
   };

From f69c8df2f3b6f64e4432e5feeb0be12afc158f6a Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 16 Dec 2022 07:21:53 -0600
Subject: [PATCH 140/953] rocalution: init at 5.4.0

---
 .../libraries/rocalution/default.nix          | 114 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   5 +
 2 files changed, 119 insertions(+)
 create mode 100644 pkgs/development/libraries/rocalution/default.nix

diff --git a/pkgs/development/libraries/rocalution/default.nix b/pkgs/development/libraries/rocalution/default.nix
new file mode 100644
index 000000000000..00d117f00fa9
--- /dev/null
+++ b/pkgs/development/libraries/rocalution/default.nix
@@ -0,0 +1,114 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rocmUpdateScript
+, cmake
+, rocm-cmake
+, rocblas
+, rocsparse
+, rocprim
+, rocrand
+, hip
+, git
+, openmp
+, openmpi
+, gtest
+, buildTests ? false
+, buildBenchmarks ? false
+, buildSamples ? false
+, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ]
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocalution";
+  version = "5.4.0";
+
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildTests [
+    "test"
+  ] ++ lib.optionals buildBenchmarks [
+    "benchmark"
+  ] ++ lib.optionals buildSamples [
+    "sample"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "ROCmSoftwarePlatform";
+    repo = "rocALUTION";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-jovhodhNa7tr1bSqpZCKI/9xF7Ie96JB+giqAEfis2k=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
+    hip
+    git
+  ];
+
+  buildInputs = [
+    rocblas
+    rocsparse
+    rocprim
+    rocrand
+    openmp
+    openmpi
+  ] ++ lib.optionals buildTests [
+    gtest
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_CXX_COMPILER=hipcc"
+    "-DROCM_PATH=${hip}"
+    "-DHIP_ROOT_DIR=${hip}"
+    "-DSUPPORT_HIP=ON"
+    "-DSUPPORT_OMP=ON"
+    "-DSUPPORT_MPI=ON"
+    "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}"
+    # Manually define CMAKE_INSTALL_<DIR>
+    # See: https://github.com/NixOS/nixpkgs/pull/197838
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ] ++ lib.optionals (gpuTargets != [ ]) [
+    "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
+  ] ++ lib.optionals buildTests [
+    "-DBUILD_CLIENTS_TESTS=ON"
+  ] ++ lib.optionals buildBenchmarks [
+    "-DBUILD_CLIENTS_BENCHMARKS=ON"
+  ];
+
+  postInstall = lib.optionalString buildTests ''
+    mkdir -p $test/bin
+    mv $out/bin/rocalution-test $test/bin
+  '' + lib.optionalString buildBenchmarks ''
+    mkdir -p $benchmark/bin
+    mv $out/bin/rocalution-bench $benchmark/bin
+  '' + lib.optionalString buildSamples ''
+    mkdir -p $sample/bin
+    mv clients/staging/* $sample/bin
+    rm $sample/bin/rocalution-test || true
+    rm $sample/bin/rocalution-bench || true
+
+    patchelf --set-rpath \
+      $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} \
+      $sample/bin/*
+  '' + lib.optionalString (buildTests || buildBenchmarks) ''
+    rmdir $out/bin
+  '';
+
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
+
+  meta = with lib; {
+    description = "Iterative sparse solvers for ROCm";
+    homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION";
+    license = with licenses; [ mit ];
+    maintainers = teams.rocm.members;
+    broken = finalAttrs.version != hip.version;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae593144acc9..6765d94fb98a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15195,6 +15195,11 @@ with pkgs;
     stdenv = rocmClangStdenv;
   };
 
+  rocalution = callPackage ../development/libraries/rocalution {
+    inherit (llvmPackages_rocm) openmp;
+    stdenv = rocmClangStdenv;
+  };
+
   rocm-device-libs = callPackage ../development/libraries/rocm-device-libs {
     stdenv = rocmClangStdenv;
   };

From 9e0472e20658de07cbb16b3af6476ffde98fbf4f Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 16 Dec 2022 15:24:05 +0000
Subject: [PATCH 141/953] =?UTF-8?q?rocm-related:=205.4.0=20=E2=86=92=205.4?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

clang-ocl: 5.4.0 → 5.4.1

hipsparse: 5.4.0 → 5.4.1

composable_kernel: unstable-2022-12-08 → unstable-2022-12-15

llvmPackages_rocm.llvm: 5.4.0 → 5.4.1

miopen: 5.4.0 → 5.4.1

miopengemm: 5.4.0 → 5.4.1

rccl: 5.4.0 → 5.4.1

rocalution: 5.4.0 → 5.4.1

hipcub: 5.4.0 → 5.4.1

rocclr: 5.4.0 → 5.4.1

rocfft: 5.4.0 → 5.4.1

rocm-cmake: 5.4.0 → 5.4.1

rocm-comgr: 5.4.0 → 5.4.1

rocm-device-libs: 5.4.0 → 5.4.1

hip: 5.4.0 → 5.4.1

rocblas: 5.4.0 → 5.4.1

rocm-runtime: 5.4.0 → 5.4.1

rocm-opencl-runtime: 5.4.0 → 5.4.1

rocm-thunk: 5.4.0 → 5.4.1

rocprim: 5.4.0 → 5.4.1

rocm-smi: 5.4.0 → 5.4.1

rocminfo: 5.4.0 → 5.4.1

rocsolver: 5.4.0 → 5.4.1

rocrand: 5.4.0 → 5.4.1

rocthrust: 5.4.0 → 5.4.1

rocprofiler: 5.4.0 → 5.4.1

rocwmma: 5.4.0 → 5.4.1

roctracer: 5.4.0 → 5.4.1

rocsparse: 5.4.0 → 5.4.1

tensile: 5.4.0 → 5.4.1
---
 pkgs/development/compilers/hip-common/default.nix           | 4 ++--
 pkgs/development/compilers/hip/default.nix                  | 2 +-
 pkgs/development/compilers/llvm/rocm/llvm.nix               | 2 +-
 pkgs/development/libraries/clang-ocl/default.nix            | 2 +-
 pkgs/development/libraries/composable_kernel/default.nix    | 6 +++---
 pkgs/development/libraries/hipcub/default.nix               | 2 +-
 pkgs/development/libraries/hipsparse/default.nix            | 2 +-
 pkgs/development/libraries/miopen/default.nix               | 4 ++--
 pkgs/development/libraries/miopengemm/default.nix           | 2 +-
 pkgs/development/libraries/rccl/default.nix                 | 4 ++--
 pkgs/development/libraries/rocalution/default.nix           | 2 +-
 pkgs/development/libraries/rocblas/default.nix              | 2 +-
 pkgs/development/libraries/rocclr/default.nix               | 2 +-
 pkgs/development/libraries/rocfft/default.nix               | 4 ++--
 pkgs/development/libraries/rocm-comgr/default.nix           | 2 +-
 pkgs/development/libraries/rocm-device-libs/default.nix     | 2 +-
 pkgs/development/libraries/rocm-opencl-runtime/default.nix  | 2 +-
 pkgs/development/libraries/rocm-runtime/default.nix         | 4 ++--
 pkgs/development/libraries/rocm-thunk/default.nix           | 2 +-
 pkgs/development/libraries/rocprim/default.nix              | 2 +-
 pkgs/development/libraries/rocprofiler/default.nix          | 2 +-
 pkgs/development/libraries/rocrand/default.nix              | 2 +-
 pkgs/development/libraries/rocsolver/default.nix            | 2 +-
 pkgs/development/libraries/rocsparse/default.nix            | 2 +-
 pkgs/development/libraries/rocthrust/default.nix            | 2 +-
 pkgs/development/libraries/roctracer/default.nix            | 4 ++--
 pkgs/development/libraries/rocwmma/default.nix              | 2 +-
 pkgs/development/libraries/tensile/default.nix              | 2 +-
 .../development/tools/build-managers/rocm-cmake/default.nix | 2 +-
 pkgs/development/tools/rocminfo/default.nix                 | 2 +-
 pkgs/tools/system/rocm-smi/default.nix                      | 2 +-
 31 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/compilers/hip-common/default.nix b/pkgs/development/compilers/hip-common/default.nix
index a6343c920376..fc5e09a45982 100644
--- a/pkgs/development/compilers/hip-common/default.nix
+++ b/pkgs/development/compilers/hip-common/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hip-common";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "ROCm-Developer-Tools";
     repo = "HIP";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-34SJM2n3jZWIS2uwpboWOXVFhaVWGK5ELPKD/cJc1zw=";
+    hash = "sha256-JpHWTsR2Z8pXp1gNjO29pDYvH/cJvd5Dlpeig33UD28=";
   };
 
   patches = [
diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix
index ecb763cea83f..5b3d2c8e0273 100644
--- a/pkgs/development/compilers/hip/default.nix
+++ b/pkgs/development/compilers/hip/default.nix
@@ -49,7 +49,7 @@ let
   ];
 in stdenv.mkDerivation (finalAttrs: {
   pname = "hip-${hipPlatform}";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix
index 82aee79cfe4a..731c0557bf2e 100644
--- a/pkgs/development/compilers/llvm/rocm/llvm.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm.nix
@@ -48,7 +48,7 @@ let
     else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-llvm-${targetName}";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix
index 8cbace27d4fb..1e844157e419 100644
--- a/pkgs/development/libraries/clang-ocl/default.nix
+++ b/pkgs/development/libraries/clang-ocl/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clang-ocl";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix
index 82419873cbeb..9d2abbdf37ba 100644
--- a/pkgs/development/libraries/composable_kernel/default.nix
+++ b/pkgs/development/libraries/composable_kernel/default.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "composable_kernel";
-  version = "unstable-2022-12-08";
+  version = "unstable-2022-12-15";
 
   outputs = [
     "out"
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";
     repo = "composable_kernel";
-    rev = "d58b7f5155b44c8b608f3edc6a6eab314493ec1a";
-    hash = "sha256-4nzyaWhPnY/0TygcoJAqVzdgfXOkf+o/BE2V9N+Bm7Q=";
+    rev = "0345963eef4f92e9c5eab608bb8557b5463a1dcb";
+    hash = "sha256-IJbUZ3/UIPbYO9H+BUPP6T2HyUnC+FVbVPXQE5bEjRg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix
index 8a6ea0ca43c2..d0c7d9a1b053 100644
--- a/pkgs/development/libraries/hipcub/default.nix
+++ b/pkgs/development/libraries/hipcub/default.nix
@@ -15,7 +15,7 @@
 # CUB can also be used as a backend instead of rocPRIM.
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipcub";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix
index a1582a4ee484..def3466a952d 100644
--- a/pkgs/development/libraries/hipsparse/default.nix
+++ b/pkgs/development/libraries/hipsparse/default.nix
@@ -15,7 +15,7 @@
 # This can also use cuSPARSE as a backend instead of rocSPARSE
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipsparse";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix
index 513b492ee981..deed581b2fac 100644
--- a/pkgs/development/libraries/miopen/default.nix
+++ b/pkgs/development/libraries/miopen/default.nix
@@ -58,7 +58,7 @@ let
   };
 in stdenv.mkDerivation (finalAttrs: {
   pname = "miopen";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
@@ -72,7 +72,7 @@ in stdenv.mkDerivation (finalAttrs: {
     owner = "ROCmSoftwarePlatform";
     repo = "MIOpen";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-EOe3LUafOeVLzRoahPdS6DMZ/+6WWeVI7jG25zfPrx8=";
+    hash = "sha256-GfXPCXiVJVve3d8sQCQcFLb/vEnKkVEn7xYUhHkEEVI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix
index 03d30906f94a..45c83021162c 100644
--- a/pkgs/development/libraries/miopengemm/default.nix
+++ b/pkgs/development/libraries/miopengemm/default.nix
@@ -31,7 +31,7 @@ let
   };
 in stdenv.mkDerivation (finalAttrs: {
   pname = "miopengemm";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix
index 4a8df477e15e..f501d0e8ced5 100644
--- a/pkgs/development/libraries/rccl/default.nix
+++ b/pkgs/development/libraries/rccl/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rccl";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCmSoftwarePlatform";
     repo = "rccl";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-NbHzRmrUe4kJwkHZtZ+zHjIy2uk+dpN9caE0L5hUnbc=";
+    hash = "sha256-y9gTGk8LyX7owb2xdtb6VlnIXu/CYHOjnNa/wrNl02g=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/rocalution/default.nix b/pkgs/development/libraries/rocalution/default.nix
index 00d117f00fa9..30d61391ec99 100644
--- a/pkgs/development/libraries/rocalution/default.nix
+++ b/pkgs/development/libraries/rocalution/default.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocalution";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix
index 41c0b188318c..2d79024c94c9 100644
--- a/pkgs/development/libraries/rocblas/default.nix
+++ b/pkgs/development/libraries/rocblas/default.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocblas";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix
index bd0eb6bafbb6..01c1522636af 100644
--- a/pkgs/development/libraries/rocclr/default.nix
+++ b/pkgs/development/libraries/rocclr/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocclr";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "ROCm-Developer-Tools";
diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix
index b71f0dc5b07f..aad49db494e6 100644
--- a/pkgs/development/libraries/rocfft/default.nix
+++ b/pkgs/development/libraries/rocfft/default.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocfft";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCmSoftwarePlatform";
     repo = "rocFFT";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-XlpWT6PS+VpJjA4iG8yaiFRxE63kugNG1ZyQXoQVJL8=";
+    hash = "sha256-NsYeEoBQ/0z31ZQ32l7N+qavWEVkH37snkTHntot7nE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix
index 93c56f5178d8..fee10be5db50 100644
--- a/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/pkgs/development/libraries/rocm-comgr/default.nix
@@ -15,7 +15,7 @@ let
     else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-comgr";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix
index e37baad6f891..6ed70a6565ac 100644
--- a/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/pkgs/development/libraries/rocm-device-libs/default.nix
@@ -14,7 +14,7 @@ let
     else throw "Unsupported ROCm LLVM platform";
 in stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-device-libs";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index ee588999a1b1..5d37c8ad9f25 100644
--- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-opencl-runtime";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix
index b7e1212fd1b1..7b4bd6c11ae5 100644
--- a/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-runtime/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-runtime";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "ROCR-Runtime";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-M9kv1Oe5ZZfd9H/+KUJUoK9L1EdyS2qRp2mJDK0dnPE=";
+    hash = "sha256-JkTXTQmdESHSFbA6HZdMK3pYEApz9aoAlMzdXayzdyY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix
index bc966e501268..b5825996a44d 100644
--- a/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/pkgs/development/libraries/rocm-thunk/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-thunk";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix
index 3ad3871bbd3d..88fad249b8c3 100644
--- a/pkgs/development/libraries/rocprim/default.nix
+++ b/pkgs/development/libraries/rocprim/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocprim";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/rocprofiler/default.nix b/pkgs/development/libraries/rocprofiler/default.nix
index 0d0639edbe53..d51e5de6966e 100644
--- a/pkgs/development/libraries/rocprofiler/default.nix
+++ b/pkgs/development/libraries/rocprofiler/default.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocprofiler";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "ROCm-Developer-Tools";
diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix
index a06615ec4122..a3742a5d9725 100644
--- a/pkgs/development/libraries/rocrand/default.nix
+++ b/pkgs/development/libraries/rocrand/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocrand";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/rocsolver/default.nix b/pkgs/development/libraries/rocsolver/default.nix
index dfb09f49cddc..5b3ad6ce24c4 100644
--- a/pkgs/development/libraries/rocsolver/default.nix
+++ b/pkgs/development/libraries/rocsolver/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocsolver";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix
index c0ee717d4bfc..0edb0bd14e5e 100644
--- a/pkgs/development/libraries/rocsparse/default.nix
+++ b/pkgs/development/libraries/rocsparse/default.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocsparse";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix
index 7a45a794ad2d..0fc3726761a7 100644
--- a/pkgs/development/libraries/rocthrust/default.nix
+++ b/pkgs/development/libraries/rocthrust/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocthrust";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix
index b8d1902d468d..c0655aaf7d4e 100644
--- a/pkgs/development/libraries/roctracer/default.nix
+++ b/pkgs/development/libraries/roctracer/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "roctracer";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ROCm-Developer-Tools";
     repo = "roctracer";
     rev = "rocm-${finalAttrs.version}";
-    hash = "sha256-hDo/tz39/m6lKqLg3UJi3LWWF7/QUtVDymZY1O8L4IQ=";
+    hash = "sha256-5vYUNczylB2ehlvhq1u/H8KUXt8ku2E+jawKrKsU7LY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix
index 818d915cc133..ecd802612550 100644
--- a/pkgs/development/libraries/rocwmma/default.nix
+++ b/pkgs/development/libraries/rocwmma/default.nix
@@ -36,7 +36,7 @@ let
   };
 in stdenv.mkDerivation (finalAttrs: {
   pname = "rocwmma";
-  version = "5.4.0";
+  version = "5.4.1";
 
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix
index c45b15134f5f..bfef4716e127 100644
--- a/pkgs/development/libraries/tensile/default.nix
+++ b/pkgs/development/libraries/tensile/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tensile";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";
diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 0d7913543f10..6fd4c2b58868 100644
--- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-cmake";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix
index 2a714829d91c..64368fa0c95a 100644
--- a/pkgs/development/tools/rocminfo/default.nix
+++ b/pkgs/development/tools/rocminfo/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "5.4.0";
+  version = "5.4.1";
   pname = "rocminfo";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix
index 0f303cc78531..6b67ef13128b 100644
--- a/pkgs/tools/system/rocm-smi/default.nix
+++ b/pkgs/tools/system/rocm-smi/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocm-smi";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";

From 187452f58e6c5b0d4f50ca155c1a4b912006d630 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Fri, 16 Dec 2022 09:32:53 -0600
Subject: [PATCH 142/953] rocmlir: don't enable broken as long as minor version
 is the same

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

diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix
index 90bb1ad211ce..98843fecfcc7 100644
--- a/pkgs/development/libraries/rocmlir/default.nix
+++ b/pkgs/development/libraries/rocmlir/default.nix
@@ -100,6 +100,7 @@ in stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
     license = with licenses; [ asl20 ];
     maintainers = teams.rocm.members;
-    broken = finalAttrs.version != stdenv.cc.version;
+    # Once again, they haven't updated the tags...
+    broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version;
   };
 })

From 93ec556b19a9cddc7798231536c7eed470e9da64 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sat, 17 Dec 2022 23:22:27 -0600
Subject: [PATCH 143/953] rocmUpdateScript: fix llvmPackages_rocm updating

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

diff --git a/pkgs/development/rocm-modules/update-script/default.nix b/pkgs/development/rocm-modules/update-script/default.nix
index 1d2b268a34b6..6188587de31a 100644
--- a/pkgs/development/rocm-modules/update-script/default.nix
+++ b/pkgs/development/rocm-modules/update-script/default.nix
@@ -1,4 +1,4 @@
-{ runtimeShell
+{ lib
 , writeScript
 }:
 
@@ -10,6 +10,11 @@
 }:
 
 let
+  pname =
+    if lib.hasPrefix "rocm-llvm-" name
+    then "llvmPackages_rocm.${lib.removePrefix "rocm-llvm-" name}"
+    else name;
+
   updateScript = writeScript "update.sh" ''
     #!/usr/bin/env nix-shell
     #!nix-shell -i bash -p curl jq common-updater-scripts
@@ -22,6 +27,6 @@ let
       version="''${version}.0"
     fi
 
-    update-source-version ${name} "$version" --ignore-same-hash
+    update-source-version ${pname} "$version" --ignore-same-hash
   '';
 in [ updateScript ]

From f84b81a23c4483f1b6b3309e9be5dedf6b22535b Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 18 Dec 2022 00:28:59 -0600
Subject: [PATCH 144/953] composable_kernel: fix tests, disable examples

---
 .../libraries/composable_kernel/default.nix   | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix
index 9d2abbdf37ba..2e74d8ba2765 100644
--- a/pkgs/development/libraries/composable_kernel/default.nix
+++ b/pkgs/development/libraries/composable_kernel/default.nix
@@ -43,8 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     openmp
-  ] ++ lib.optionals buildTests [
-    gtest
   ];
 
   cmakeFlags = [
@@ -52,16 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_CXX_COMPILER=hipcc"
   ] ++ lib.optionals (gpuTargets != [ ]) [
     "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
+  ] ++ lib.optionals buildTests [
+    "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names
   ];
 
   # No flags to build selectively it seems...
-  postPatch = ''
-    substituteInPlace test/CMakeLists.txt \
-      --replace "include(googletest)" ""
-
-    substituteInPlace CMakeLists.txt \
-      --replace "enable_testing()" ""
-  '' + lib.optionalString (!buildTests) ''
+  postPatch = lib.optionalString (!buildTests) ''
     substituteInPlace CMakeLists.txt \
       --replace "add_subdirectory(test)" ""
   '' + lib.optionalString (!buildExamples) ''
@@ -69,15 +63,12 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "add_subdirectory(example)" ""
   '';
 
-  postInstall = ''
-    mkdir -p $out/bin
-    mv bin/ckProfiler $out/bin
-  '' + lib.optionalString buildTests ''
+  postInstall = lib.optionalString buildTests ''
     mkdir -p $test/bin
-    mv bin/test_* $test/bin
+    mv $out/bin/test_* $test/bin
   '' + lib.optionalString buildExamples ''
     mkdir -p $example/bin
-    mv bin/example_* $example/bin
+    mv $out/bin/example_* $example/bin
   '';
 
   passthru.updateScript = unstableGitUpdater { };
@@ -87,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
     license = with licenses; [ mit ];
     maintainers = teams.rocm.members;
-    # Well, at least we're getting something that makes sense now
-    # undefined symbol: testing::Message::Message()
-    # Try removing this next update
-    broken = buildTests;
+    broken = buildExamples; # bin/example_grouped_gemm_xdl_bfp16] Error 139
   };
 })

From e86c679d092b06e5edfd324eecc66b37f61b6d98 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 18 Dec 2022 05:25:16 -0600
Subject: [PATCH 145/953] miopen: fixup, enable kdbs by default, symlink for
 hydra

---
 pkgs/development/libraries/miopen/default.nix | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix
index deed581b2fac..0e9b9c2dc02b 100644
--- a/pkgs/development/libraries/miopen/default.nix
+++ b/pkgs/development/libraries/miopen/default.nix
@@ -23,17 +23,11 @@
 , doxygen
 , sphinx
 , zlib
+, gtest
 , python3Packages
 , buildDocs ? true
 , buildTests ? false
-# LFS isn't working, so we will manually fetch these
-# This isn't strictly required, but is recommended to enable
-# https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1373
-#
-# MIOpen will produce a very large output due to KDBs fetched
-# Also possibly in the future because of KDB generation
-# This is disabled by default so we can cache on hydra
-, fetchKDBs ? false
+, fetchKDBs ? true
 , useOpenCL ? false
 }:
 
@@ -127,36 +121,35 @@ in stdenv.mkDerivation (finalAttrs: {
     "-DMIOPEN_TEST_GFX908=ON"
     "-DMIOPEN_TEST_GFX90A=ON"
     "-DMIOPEN_TEST_GFX103X=ON"
+    "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names
   ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace "enable_testing()" "" \
       --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \
-      --replace "/opt/rocm/hip" "${hip}" \
-      --replace "/opt/rocm/llvm" "${llvm}" \
-      --replace "3 REQUIRED PATHS /opt/rocm)" "3 REQUIRED PATHS ${hip})" \
-      --replace "hip REQUIRED PATHS /opt/rocm" "hip REQUIRED PATHS ${hip}" \
-      --replace "rocblas REQUIRED PATHS /opt/rocm" "rocblas REQUIRED PATHS ${rocblas}" \
-      --replace "miopengemm PATHS /opt/rocm" "miopengemm PATHS ${miopengemm}"
+      --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # error: missing required key 'key'
+  '' + lib.optionalString buildTests ''
+    substituteInPlace test/gtest/CMakeLists.txt \
+      --replace "enable_testing()" ""
   '' + lib.optionalString (!buildTests) ''
     substituteInPlace CMakeLists.txt \
       --replace "add_subdirectory(test)" ""
   '' + lib.optionalString fetchKDBs ''
-    cp -a ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb
-    cp -a ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb
-    cp -a ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb
-    cp -a ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb
-    cp -a ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb
-    cp -a ${kdbs.gfx90878} src/kernels/gfx90878.kdb
-    cp -a ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb
-    cp -a ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb
+    ln -sf ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb
+    ln -sf ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb
+    ln -sf ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb
+    ln -sf ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb
+    ln -sf ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb
+    ln -sf ${kdbs.gfx90878} src/kernels/gfx90878.kdb
+    ln -sf ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb
+    ln -sf ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb
   '';
 
   # Unfortunately, it seems like we have to call make on these manually
   postBuild = lib.optionalString buildDocs ''
     export HOME=$(mktemp -d)
-    make doc
+    make -j$NIX_BUILD_CORES doc
   '' + lib.optionalString buildTests ''
     make -j$NIX_BUILD_CORES check
   '';
@@ -170,6 +163,10 @@ in stdenv.mkDerivation (finalAttrs: {
     mkdir -p $test/bin
     mv bin/test_* $test/bin
     patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} $test/bin/*
+  '' + lib.optionalString fetchKDBs ''
+    # Apparently gfx1030_40 wasn't generated so the developers suggest just renaming gfx1030_36 to it
+    # Should be fixed in the next miopen kernel generation batch
+    ln -s ${kdbs.gfx1030_36} $out/share/miopen/db/gfx1030_40.kdb
   '';
 
   passthru.updateScript = rocmUpdateScript {

From 8de23957e97b7bb04978829e62f53a4b848a500b Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 18 Dec 2022 12:41:25 -0600
Subject: [PATCH 146/953] rocm-related: add release notes

---
 .../from_md/release-notes/rl-2305.section.xml  | 18 ++++++++++++++++++
 .../manual/release-notes/rl-2305.section.md    |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index a3b711d1388e..eaeeed9c676c 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -138,6 +138,17 @@
           or configure your firewall.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>llvmPackages_rocm.llvm</literal> will not contain
+          <literal>clang</literal> or <literal>compiler-rt</literal>.
+          <literal>llvmPackages_rocm.clang</literal> will not contain
+          <literal>llvm</literal>.
+          <literal>llvmPackages_rocm.clangNoCompilerRt</literal> has
+          been removed in favor of using
+          <literal>llvmPackages_rocm.clang-unwrapped</literal>.
+        </para>
+      </listitem>
       <listitem>
         <para>
           The EC2 image module previously detected and automatically
@@ -276,6 +287,13 @@
           option.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>hip</literal> has been separated into
+          <literal>hip</literal>, <literal>hip-common</literal> and
+          <literal>hipcc</literal>.
+        </para>
+      </listitem>
       <listitem>
         <para>
           Resilio sync secret keys can now be provided using a secrets
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index d2cc43a5dffc..3573fcb79554 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -43,6 +43,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall.
 
+- `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`.
+
 - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2.
 
 - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.
@@ -80,6 +82,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - Enabling global redirect in `services.nginx.virtualHosts` now allows one to add exceptions with the `locations` option.
 
+- `hip` has been separated into `hip`, `hip-common` and `hipcc`.
+
 - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store.
 
 - The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)).

From 31c7a1b61466e9323973a487288e9b98fbb4d746 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sun, 18 Dec 2022 15:20:45 -0800
Subject: [PATCH 147/953] python310Packages.trustme: remove aarch64-darwin
 workarounds

These are no longer necessary now that pyopenssl is no longer broken on
aarch64-darwin.
---
 .../python-modules/trustme/default.nix          | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix
index fb145ac9a99a..649e2de1c179 100644
--- a/pkgs/development/python-modules/trustme/default.nix
+++ b/pkgs/development/python-modules/trustme/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -21,10 +20,9 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
-    service-identity
-    pytestCheckHook
-  ] ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [
     pyopenssl
+    pytestCheckHook
+    service-identity
   ];
 
   propagatedBuildInputs = [
@@ -34,17 +32,6 @@ buildPythonPackage rec {
     futures
   ];
 
-  # aarch64-darwin forbids W+X memory, but this tests depends on it:
-  # * https://github.com/pyca/pyopenssl/issues/873
-  disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
-    "test_pyopenssl_end_to_end"
-  ];
-
-  postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
-    substituteInPlace "tests/test_trustme.py" \
-      --replace "import OpenSSL.SSL" ""
-  '';
-
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
 

From 967b87ea6e287814a099f2177f38dbc31211e000 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Dec 2022 01:06:51 +0000
Subject: [PATCH 148/953] krb5: 1.20 -> 1.20.1

---
 pkgs/development/libraries/kerberos/krb5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index fc8fb7398701..f9a509ab4862 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -19,11 +19,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${type}krb5";
-  version = "1.20";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz";
-    sha256 = "sha256-fgIr3TyFGDAXP5+qoAaiMKDg/a1MlT6Fv/S/DaA24S8";
+    sha256 = "sha256-cErtSbGetacXizSyhzYg7CmdsIdS1qhXT5XUGHmriFE=";
   };
 
   outputs = [ "out" "dev" ];

From 8e80bc7dd2179cbb4733edfde76b00e103bae363 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 18 Dec 2022 21:15:54 -0600
Subject: [PATCH 149/953] hipsparse: fixup samples

---
 pkgs/development/libraries/hipsparse/default.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix
index def3466a952d..a4f8a212310a 100644
--- a/pkgs/development/libraries/hipsparse/default.nix
+++ b/pkgs/development/libraries/hipsparse/default.nix
@@ -9,7 +9,9 @@
 , gfortran
 , git
 , gtest
+, openmp
 , buildTests ? false
+, buildSamples ? false
 }:
 
 # This can also use cuSPARSE as a backend instead of rocSPARSE
@@ -21,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
   ] ++ lib.optionals buildTests [
     "test"
+  ] ++ lib.optionals buildSamples [
+    "sample"
   ];
 
   src = fetchFromGitHub {
@@ -42,10 +46,14 @@ stdenv.mkDerivation (finalAttrs: {
     git
   ] ++ lib.optionals buildTests [
     gtest
+  ] ++ lib.optionals (buildTests || buildSamples) [
+    openmp
   ];
 
   cmakeFlags = [
+    "-DCMAKE_C_COMPILER=hipcc"
     "-DCMAKE_CXX_COMPILER=hipcc"
+    "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}"
     # Manually define CMAKE_INSTALL_<DIR>
     # See: https://github.com/NixOS/nixpkgs/pull/197838
     "-DCMAKE_INSTALL_BINDIR=bin"
@@ -104,6 +112,11 @@ stdenv.mkDerivation (finalAttrs: {
     mv $out/bin/hipsparse-test $test/bin
     mv /build/source/matrices $test
     rmdir $out/bin
+  '' + lib.optionalString buildSamples ''
+    mkdir -p $sample/bin
+    mv clients/staging/example_* $sample/bin
+    patchelf --set-rpath $out/lib:${lib.makeLibraryPath (
+      finalAttrs.buildInputs ++ [ hip gfortran.cc ])} $sample/bin/example_*
   '';
 
   passthru.updateScript = rocmUpdateScript {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6765d94fb98a..72178e65432f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15180,6 +15180,7 @@ with pkgs;
   };
 
   hipsparse = callPackage ../development/libraries/hipsparse {
+    inherit (llvmPackages_rocm) openmp;
     stdenv = rocmClangStdenv;
   };
 

From ce1fd653e3e02ba3420b1edfe5d2374b44b70e5c Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 18 Dec 2022 21:32:59 -0600
Subject: [PATCH 150/953] miopen: fixup tests

---
 pkgs/development/libraries/miopen/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix
index 0e9b9c2dc02b..1e93c149da8c 100644
--- a/pkgs/development/libraries/miopen/default.nix
+++ b/pkgs/development/libraries/miopen/default.nix
@@ -24,6 +24,7 @@
 , sphinx
 , zlib
 , gtest
+, rocm-comgr
 , python3Packages
 , buildDocs ? true
 , buildTests ? false
@@ -162,7 +163,8 @@ in stdenv.mkDerivation (finalAttrs: {
   '' + lib.optionalString buildTests ''
     mkdir -p $test/bin
     mv bin/test_* $test/bin
-    patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} $test/bin/*
+    patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++
+      [ hip rocm-comgr ])} $test/bin/*
   '' + lib.optionalString fetchKDBs ''
     # Apparently gfx1030_40 wasn't generated so the developers suggest just renaming gfx1030_36 to it
     # Should be fixed in the next miopen kernel generation batch

From 3690ec3a8d4385cc34edbee0aab3828bc2f74656 Mon Sep 17 00:00:00 2001
From: Madoura <madouura@gmail.com>
Date: Sun, 18 Dec 2022 21:42:33 -0600
Subject: [PATCH 151/953] roctracer: fixup tests

---
 pkgs/development/libraries/roctracer/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix
index c0655aaf7d4e..6b5b23fae9f5 100644
--- a/pkgs/development/libraries/roctracer/default.nix
+++ b/pkgs/development/libraries/roctracer/default.nix
@@ -10,6 +10,8 @@
 , libxml2
 , doxygen
 , graphviz
+, gcc-unwrapped
+, rocm-runtime
 , python3Packages
 , buildDocs ? false # Nothing seems to be generated, so not making the output
 , buildTests ? false
@@ -77,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Not sure why this is an install target
     find $out/test -executable -type f -exec mv {} $test/bin \;
     rm $test/bin/{*.sh,*.py}
-    patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} $test/bin/*
+    patchelf --set-rpath $out/lib:${lib.makeLibraryPath (
+      finalAttrs.buildInputs ++ [ hip gcc-unwrapped.lib rocm-runtime ])} $test/bin/*
     rm -rf $out/test
   '';
 

From aebf6f67c269dc383a4ceececf7e36458c348b53 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 Dec 2022 10:04:23 +0100
Subject: [PATCH 152/953] python310Packages.pycares: add changelog to meta

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

diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
index 74dc59aefbe8..26fd9c2aa735 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -4,15 +4,19 @@
 , cffi
 , fetchPypi
 , idna
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "pycares";
   version = "4.2.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U=";
+    hash = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U=";
   };
 
   buildInputs = [
@@ -31,11 +35,14 @@ buildPythonPackage rec {
   # Requires network access
   doCheck = false;
 
-  pythonImportsCheck = [ "pycares" ];
+  pythonImportsCheck = [
+    "pycares"
+  ];
 
   meta = with lib; {
     description = "Python interface for c-ares";
     homepage = "https://github.com/saghul/pycares";
+    changelog = "https://github.com/saghul/pycares/releases/tag/pycares-${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 1ca0fd7d6d623a8c5189d0ba18f09a09a791a167 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 Dec 2022 10:05:40 +0100
Subject: [PATCH 153/953] python310Packages.pycares: 4.2.2 -> 4.3.0

Changelog: https://github.com/saghul/pycares/releases/tag/pycares-4.3.0
---
 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 26fd9c2aa735..14345cfafcf3 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pycares";
-  version = "4.2.2";
+  version = "4.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U=";
+    hash = "sha256-xUJpb22sl46dmRkjhHRaZfgKfZRQUBFR5KdWPgYBDUU=";
   };
 
   buildInputs = [

From 2b1696598917eef6d0e4d2f5467a9c208a6cacdd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 Dec 2022 11:08:38 +0100
Subject: [PATCH 154/953] python310Packages.pycares: add passthru.tests

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

diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
index 14345cfafcf3..84a7cbe1ba42 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -1,10 +1,12 @@
 { lib
+, aiodns
 , buildPythonPackage
 , c-ares
 , cffi
 , fetchPypi
 , idna
 , pythonOlder
+, tornado
 }:
 
 buildPythonPackage rec {
@@ -35,6 +37,10 @@ buildPythonPackage rec {
   # Requires network access
   doCheck = false;
 
+  passthru.tests = {
+    inherit aiodns tornado;
+  };
+
   pythonImportsCheck = [
     "pycares"
   ];

From 811a1563a0933254b909c41d7a7295232752e569 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 Dec 2022 10:46:53 +0100
Subject: [PATCH 155/953] python310Packages.watchdog: add changelog to meta

---
 .../python-modules/watchdog/default.nix       | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index f42645940aac..636b160dadde 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -1,14 +1,15 @@
 { lib
 , stdenv
 , buildPythonPackage
-, fetchPypi
-, pathtools
-, pyyaml
-, flaky
-, pytest-timeout
-, pytestCheckHook
 , CoreServices
 , fetchpatch
+, fetchPypi
+, flaky
+, pathtools
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, pyyaml
 }:
 
 buildPythonPackage rec {
@@ -16,9 +17,11 @@ buildPythonPackage rec {
   version = "2.1.9";
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Q84g67NqUfIfo3b3bR1GkkUrJSfM1gGVDWntNrniFgk=";
+    hash = "sha256-Q84g67NqUfIfo3b3bR1GkkUrJSfM1gGVDWntNrniFgk=";
   };
 
   patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [
@@ -31,7 +34,9 @@ buildPythonPackage rec {
     })
   ];
 
-  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    CoreServices
+  ];
 
   propagatedBuildInputs = [
     pathtools
@@ -70,6 +75,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python API and shell utilities to monitor file system events";
     homepage = "https://github.com/gorakhargosh/watchdog";
+    changelog = "https://github.com/gorakhargosh/watchdog/blob/v${version}/changelog.rst";
     license = licenses.asl20;
     maintainers = with maintainers; [ goibhniu ];
   };

From dbecef299504803e718f7e6b31f2c358f9365d0f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 Dec 2022 10:50:00 +0100
Subject: [PATCH 156/953] python310Packages.watchdog: 2.1.9 -> 2.2.0

Changelog: https://github.com/gorakhargosh/watchdog/blob/v2.2.0/changelog.rst
---
 pkgs/development/python-modules/watchdog/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 636b160dadde..b4c8dcaf6b0c 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -14,24 +14,18 @@
 
 buildPythonPackage rec {
   pname = "watchdog";
-  version = "2.1.9";
+  version = "2.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Q84g67NqUfIfo3b3bR1GkkUrJSfM1gGVDWntNrniFgk=";
+    hash = "sha256-g8+Lxg2cYTtmpMAYBRhz1ic9nkXQQO7QbWqWJBvY7AE=";
   };
 
   patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [
     ./force-kqueue.patch
-  ] ++ [
-    (fetchpatch {
-      url = "https://github.com/gorakhargosh/watchdog/commit/255d1e45c17929dd5ba8a6f91aa28771109931cd.patch";
-      sha256 = "sha256-gGgEGuB/0g+4Pv1dXMvIdObjqKruWKkxtufS/dzSlY8=";
-      excludes = [ "changelog.rst" ];
-    })
   ];
 
   buildInputs = lib.optionals stdenv.isDarwin [

From c53bf3afbad0016428fda2bf6b0e605aa289ca57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 Dec 2022 11:31:08 +0100
Subject: [PATCH 157/953] python310Packages.pyelftools: add changelog to meta

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

diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix
index 1f0bcc15b3ea..655f1f14fd4f 100644
--- a/pkgs/development/python-modules/pyelftools/default.nix
+++ b/pkgs/development/python-modules/pyelftools/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for analyzing ELF files and DWARF debugging information";
     homepage = "https://github.com/eliben/pyelftools";
+    changelog = "https://github.com/eliben/pyelftools/blob/v${version}/CHANGES";
     license = licenses.publicDomain;
     maintainers = with maintainers; [ igsha pamplemousse ];
   };

From 1c45ce632716eaad9d002cb5bae65e0d0d5a3a15 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 Dec 2022 16:01:21 +0100
Subject: [PATCH 158/953] python310Packages.pyelftools: 0.28 -> 0.29

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

diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix
index 655f1f14fd4f..817a39cedf9e 100644
--- a/pkgs/development/python-modules/pyelftools/default.nix
+++ b/pkgs/development/python-modules/pyelftools/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyelftools";
-  version = "0.28";
+  version = "0.29";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,14 +17,16 @@ buildPythonPackage rec {
     owner = "eliben";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-+T5C0ah2oj5E8fWaQbuzYRVgD5bSiUbaArrlxNLojvw=";
+    hash = "sha256-tPY0C5CoA9hGHeEA/KWQ1RAVT5kqMlAwuWpOSH+KJ9Y=";
   };
 
   doCheck = stdenv.hostPlatform.system == "x86_64-linux" && stdenv.hostPlatform.isGnu;
 
   checkPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf
-    ${python.interpreter} test/all_tests.py
+    ${python.interpreter} test/run_all_unittests.py
+    ${python.interpreter} test/run_examples_test.py
+    ${python.interpreter} test/run_readelf_tests.py --parallel
   '';
 
   pythonImportsCheck = [

From f8fa52c4edeeca248053a135c8110bb4689b9c18 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 Dec 2022 16:24:56 +0100
Subject: [PATCH 159/953] python310Packages.unidecode: add changelog to meta

---
 pkgs/development/python-modules/unidecode/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix
index 96e487871aa3..a15190908dbe 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@@ -29,7 +29,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "ASCII transliterations of Unicode text";
-    homepage = "https://pypi.python.org/pypi/Unidecode/";
+    homepage = "https://github.com/avian2/unidecode";
+    changelog = "https://github.com/avian2/unidecode/blob/unidecode-${version}/ChangeLog";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ domenkozar ];
   };

From 8e63b88831614b507e22a4c4a3ca966aab5cd21e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 19 Dec 2022 16:27:03 +0100
Subject: [PATCH 160/953] python310Packages.unidecode: 1.34 -> 1.3.6

Changelog: https://github.com/avian2/unidecode/blob/unidecode-1.3.6/ChangeLog
---
 pkgs/development/python-modules/unidecode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix
index a15190908dbe..e2ac00de2177 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "unidecode";
-  version = "1.3.4";
+  version = "1.3.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "avian2";
     repo = pname;
     rev = "${pname}-${version}";
-    hash = "sha256-2LRV6Egst2bdxefEzfuA9Ef8zMSWvmlCEV/sIzezyPw=";
+    hash = "sha256-75E2OlrGIxvwR9MeZEB4bDLdFd1SdprCVcBIJCPS3hM=";
   };
 
   checkInputs = [

From 7b9adf4dee7614a0621758819d2db601bf853bc1 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 19 Dec 2022 15:01:10 -0300
Subject: [PATCH 161/953] libarchive: refactor

- Remove "override" references on all-packages.nix
- use finalAttrs style to get rid of rec
- refactor postPatch to use Nix code instead of shell script
---
 .../libraries/libarchive/default.nix          | 52 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index c7e9f117f94c..381689f9cb65 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -22,44 +22,48 @@
 , cmake
 , nix
 , samba
+, buildPackages
 }:
 
+let
+  autoreconfHook = buildPackages.autoreconfHook269;
+in
 assert xarSupport -> libxml2 != null;
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libarchive";
   version = "3.6.2";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg=";
   };
 
-  postPatch = ''
+  outputs = [ "out" "lib" "dev" ];
+
+  postPatch = let
+    skipTestPaths = [
+      # test won't work in nix sandbox
+      "libarchive/test/test_write_disk_perms.c"
+      # the filesystem does not necessarily have sparse capabilities
+      "libarchive/test/test_sparse_basic.c"
+      # the filesystem does not necessarily have hardlink capabilities
+      "libarchive/test/test_write_disk_hardlink.c"
+      # access-time-related tests flakey on some systems
+      "cpio/test/test_option_a.c"
+      "cpio/test/test_option_t.c"
+    ];
+    removeTest = testPath: ''
+      substituteInPlace Makefile.am --replace "${testPath}" ""
+      rm "${testPath}"
+    '';
+  in ''
     substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)"
 
-    declare -a skip_test_paths=(
-      # test won't work in nix sandbox
-      'libarchive/test/test_write_disk_perms.c'
-      # can't be sure builder will have sparse-capable fs
-      'libarchive/test/test_sparse_basic.c'
-      # can't even be sure builder will have hardlink-capable fs
-      'libarchive/test/test_write_disk_hardlink.c'
-      # access-time-related tests flakey on some systems
-      'cpio/test/test_option_a.c'
-      'cpio/test/test_option_t.c'
-    )
-
-    for test_path in "''${skip_test_paths[@]}" ; do
-      substituteInPlace Makefile.am --replace "$test_path" ""
-      rm "$test_path"
-    done
+    ${lib.concatStringsSep "\n" (map removeTest skipTestPaths)}
   '';
 
-  outputs = [ "out" "lib" "dev" ];
-
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
@@ -105,7 +109,7 @@ stdenv.mkDerivation rec {
       includes implementations of the common tar, cpio, and zcat command-line
       tools that use the libarchive library.
     '';
-    changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}";
+    changelog = "https://github.com/libarchive/libarchive/releases/tag/v${finalAttrs.version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ jcumming AndersonTorres ];
     platforms = platforms.all;
@@ -114,4 +118,4 @@ stdenv.mkDerivation rec {
   passthru.tests = {
     inherit cmake nix samba;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0636572aa450..c9e3f6fd4a42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20172,9 +20172,7 @@ with pkgs;
 
   libargs = callPackage ../development/libraries/libargs { };
 
-  libarchive = callPackage ../development/libraries/libarchive {
-    autoreconfHook = buildPackages.autoreconfHook269;
-  };
+  libarchive = callPackage ../development/libraries/libarchive { };
 
   libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { };
 

From 47de6ecabb0609bc8b4212842fb01533b3616874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
 <gdamjan@gmail.com>
Date: Wed, 21 Dec 2022 16:57:44 +0100
Subject: [PATCH 162/953] systemd: 252.3 -> 252.4

also fixes an security issue with systemd-coredump:
https://www.openwall.com/lists/oss-security/2022/12/21/3
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7a872c3b5456..eb9a43908fd3 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -123,7 +123,7 @@ assert withHomed -> withCryptsetup;
 let
   wantCurl = withRemote || withImportd;
   wantGcrypt = withResolved || withImportd;
-  version = "252.3";
+  version = "252.4";
 
   # Bump this variable on every (major) version change. See below (in the meson options list) for why.
   # command:
@@ -140,7 +140,7 @@ stdenv.mkDerivation {
     owner = "systemd";
     repo = "systemd-stable";
     rev = "v${version}";
-    hash = "sha256-F2wtg12amigd5KNCWmG3b9Yu6PUOby9mQgZ2VFtxl5A==";
+    hash = "sha256-8ejSEt3QyCSARGGVbXWac2dB9jdUpC4eX2rN0iENQX0=";
   };
 
   # On major changes, or when otherwise required, you *must* reformat the patches,

From c44fb852ce2cf9edff9a8825419a820fc80884d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 Dec 2022 23:11:01 +0100
Subject: [PATCH 163/953] curl: 7.86.0 -> 7.87.0

https://daniel.haxx.se/blog/2022/12/21/curl-7-87-0/
https://curl.se/docs/CVE-2022-43551.html
https://curl.se/docs/CVE-2022-43552.html

Fixes: CVE-2022-43551, CVE-2022-43552
---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 6d5f28e7a82f..311e9e1b8c76 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -47,14 +47,14 @@ assert !(opensslSupport && wolfsslSupport);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
-  version = "7.86.0";
+  version = "7.87.0";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2"
       "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2"
     ];
-    sha256 = "sha256-9cpp2wPuoX+ocFvfsan1jXakbJAQUYEJuzjzExN+Cig=";
+    hash = "sha256-XW4Sh2G3EQlG0Sdq/28PJm8rcm9eYZ9+CgV6R0FV8wc=";
   };
 
   patches = [

From bae75df20ec7f187b9995f4f27016de54f3ca02b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 Dec 2022 23:00:14 +0100
Subject: [PATCH 164/953] libksba: 1.6.2 -> 1.6.3

https://gnupg.org/blog/20221017-pepe-left-the-ksba.html

Fixes: CVE-2022-3515
---
 pkgs/development/libraries/libksba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 5bfb0d029cdf..d7f5aa24c155 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libksba";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2";
-    sha256 = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971";
+    hash = "sha256-P3LGjbMJceu/FDZ1J3GUI/Ck1fgQP8n0ocAan6RA3lw=";
   };
 
   outputs = [ "out" "dev" "info" ];

From 5aef081f74333a74ee4d5022adf27d0c421f08ad Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dominik.ritter@chefkoch.de>
Date: Wed, 21 Dec 2022 18:04:36 +0100
Subject: [PATCH 165/953] freetype: add brotli

---
 pkgs/development/libraries/freetype/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 9d94fe0c44ec..68907d798e19 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl
 , buildPackages, pkgsHostHost
 , pkg-config, which, makeWrapper
-, zlib, bzip2, libpng, gnumake, glib
+, zlib, bzip2, brotli, libpng, gnumake, glib
 
 , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
   # LCD filtering is also known as ClearType and covered by several Microsoft patents.
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8=";
   };
 
-  propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
+  propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype
 
   # dependence on harfbuzz is looser than the reverse dependence
   nativeBuildInputs = [ pkg-config which makeWrapper ]

From 729c7fb1c8c610a360d652c7047ef0da10f6a04c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 22 Dec 2022 17:43:24 +0100
Subject: [PATCH 166/953] nasm: 2.15.05 -> 2.16.01

Fixes CVE-2020-18974.

https://nasm.us/doc/nasmdocc.html
---
 pkgs/development/compilers/nasm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index ce053e87130f..b9f0e856f65c 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nasm";
-  version = "2.15.05";
+  version = "2.16.01";
 
   src = fetchurl {
     url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw";
+    sha256 = "sha256-x3dF9IAjde/u4uxcCta38DfqnIfJKxSaljf/CZ8WJVg=";
   };
 
   nativeBuildInputs = [ perl ];

From cdf92e56f7e51e97c7acf3020977be20ba8086c4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 23 Dec 2022 17:03:47 +0300
Subject: [PATCH 167/953] mesa: enable separateDebugInfo

It is generally useful, and it also makes rusticl work for ??? reasons ???
---
 pkgs/development/libraries/mesa/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 8d8562468757..067a71e2904b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -93,6 +93,10 @@ self = stdenv.mkDerivation {
     ++ lib.optional stdenv.isLinux "driversdev"
     ++ lib.optional enableOpenCL "opencl";
 
+  # FIXME: this fixes rusticl/iris segfaulting on startup, _somehow_.
+  # Needs more investigating.
+  separateDebugInfo = true;
+
   preConfigure = ''
     PATH=${llvmPackages.libllvm.dev}/bin:$PATH
   '';

From b1834a461edf7abf4a6fb89db0ed65904a48a01c Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 15 Dec 2022 18:38:33 -0500
Subject: [PATCH 168/953] Revert "rustc: propagate libiconv on darwin"

This reverts commit b6fc00b8f4bc25a72c43320b70082bbee06321db.

Rust 1.66.0 contains a fix for libiconv being linked unconditionally on macOS, but this only applies to packages that don't depend on older versions of `libc`.

For now, let's go back to including libiconv in `buildInputs` by default for packages that use `buildRustPackage`. As packages bump their `libc` versions, we can eventually stop including it by default, and manually add it where needed.
---
 pkgs/build-support/rust/build-rust-package/default.nix | 1 +
 pkgs/development/compilers/rust/cargo.nix              | 4 ++--
 pkgs/development/compilers/rust/rustc.nix              | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 20fb41d0aaa7..e7eab34e45d9 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -134,6 +134,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
   ];
 
   buildInputs = buildInputs
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]
     ++ lib.optionals stdenv.hostPlatform.isMinGW [ windows.pthreads ];
 
   patches = cargoPatches ++ patches;
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 5571918fdc62..291a64f2210c 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, pkgsHostHost
 , file, curl, pkg-config, python3, openssl, cmake, zlib
 , installShellFiles, makeWrapper, cacert, rustPlatform, rustc
-, libiconv, CoreFoundation, Security
+, CoreFoundation, Security
 , auditable ? false # TODO: change to true when this is the default
 }:
 
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
     (lib.getDev pkgsHostHost.curl)
   ];
   buildInputs = [ cacert file curl python3 openssl zlib ]
-    ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ];
+    ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
 
   # cargo uses git-rs which is made for a version of libgit2 from recent master that
   # is not compatible with the current version in nixpkgs.
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 8288cd5c61e3..06d9de15ab8d 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -163,11 +163,9 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ openssl ]
-    ++ optionals stdenv.isDarwin [ Security ]
+    ++ optionals stdenv.isDarwin [ libiconv Security ]
     ++ optional (!withBundledLLVM) llvmShared;
 
-  depsTargetTargetPropagated = optionals stdenv.isDarwin [ libiconv ];
-
   outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;
 

From edfbbaf28258d968de64b364d4a0868a80cdf1c2 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 15 Dec 2022 18:49:05 -0500
Subject: [PATCH 169/953] rustc: add note about libiconv dependency

---
 pkgs/development/compilers/rust/rustc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 06d9de15ab8d..43d603923c97 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -163,6 +163,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ openssl ]
+    # TODO: remove libiconv once 1.66 is used to bootstrap
     ++ optionals stdenv.isDarwin [ libiconv Security ]
     ++ optional (!withBundledLLVM) llvmShared;
 

From f402b4b29e8c75f2fd0ea491b2c1a982fd5b0398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 19 Dec 2022 10:30:42 -0800
Subject: [PATCH 170/953] python310Packages.pytz: 2022.6 -> 2022.7

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

diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix
index 79750bb2435b..374187f9b97e 100644
--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/pkgs/development/python-modules/pytz/default.nix
@@ -2,11 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pytz";
-  version = "2022.6";
+  version = "2022.7";
+
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6JUSQGt5PKOfWXG8mZzFOM4SXA5RwnlBvvRWi0YAleI=";
+    hash = "sha256-fM+ue0ssBnRkpnM8YmFnP9uP0b6QVGA5a5egc+n6aDo=";
   };
 
   checkInputs = [ unittestCheckHook ];

From e07df68f1ecae8e74171aa459c836e6a6b9b5f26 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 13 Dec 2022 20:48:02 +0000
Subject: [PATCH 171/953] sqlite: add patch for CVE-2022-46908

(cherry-picked from commit a7a2489afd1a5d30a33d5673bcc46d700b224f32
on the staging-22.11 branch)
---
 .../3.39.4-autoconf-CVE-2022-46908.patch      | 25 +++++++++++++++++++
 pkgs/development/libraries/sqlite/default.nix |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch

diff --git a/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch b/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch
new file mode 100644
index 000000000000..27ab2af2014a
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch
@@ -0,0 +1,25 @@
+adapted for preprocessed source files from upstream
+https://sqlite.org/src/vpatch?from=a60e56627fc0ef88&to=cefc032473ac5ad2
+
+diff --git a/shell.c b/shell.c
+index e66ae08..d423278 100644
+--- a/shell.c
++++ b/shell.c
+@@ -12921,7 +12921,7 @@ static int safeModeAuth(
+     "zipfile",
+     "zipfile_cds",
+   };
+-  UNUSED_PARAMETER(zA2);
++  UNUSED_PARAMETER(zA1);
+   UNUSED_PARAMETER(zA3);
+   UNUSED_PARAMETER(zA4);
+   switch( op ){
+@@ -12936,7 +12936,7 @@ static int safeModeAuth(
+     case SQLITE_FUNCTION: {
+       int i;
+       for(i=0; i<ArraySize(azProhibitedFunctions); i++){
+-        if( sqlite3_stricmp(zA1, azProhibitedFunctions[i])==0 ){
++        if( sqlite3_stricmp(zA2, azProhibitedFunctions[i])==0 ){
+           failIfSafeMode(p, "cannot use the %s() function in safe mode",
+                          azProhibitedFunctions[i]);
+         }
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 5e3e8f362e03..3f4081acc044 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-AzNVIHbScAx1NSJW6Rx4v1zWJJFYm6DGmu0KgYaJgOc=";
   };
 
+  patches = [
+    ./3.39.4-autoconf-CVE-2022-46908.patch
+  ];
+
   outputs = [ "bin" "dev" "out" ];
   separateDebugInfo = stdenv.isLinux;
 

From 02ffcc0ba31ed9d216b8c8ca0790b48573050ce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Dec 2022 03:02:07 +0000
Subject: [PATCH 172/953] gnused: 4.8 -> 4.9

---
 pkgs/tools/text/gnused/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 32f6f30cb1ac..f493e4f358d6 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnused";
-  version = "4.8";
+  version = "4.9";
 
   src = fetchurl {
     url = "mirror://gnu/sed/sed-${version}.tar.xz";
-    sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp";
+    sha256 = "sha256-biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE=";
   };
 
   outputs = [ "out" "info" ];

From 81465ba9497e05a3ef1c1dcb6a15223ca1cfa2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 22 Dec 2022 03:19:20 -0800
Subject: [PATCH 173/953] python310Packages.pybind11: 2.10.1 -> 2.10.2

https://github.com/pybind/pybind11/blob/v2.10.2/docs/changelog.rst
---
 pkgs/development/python-modules/pybind11/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index 642d3c7e97f5..146ffce784fa 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "pybind11";
-  version = "2.10.1";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "pybind";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9NS0/fLW2zEmEXhI9GfNN3C/CeI5xibFHwMoUebI90U=";
+    hash = "sha256-YxAkozyWNTKMCIEk3AhHZbRHtzhRrCSB3wh/Qy9CIyU=";
   };
 
   postPatch = ''

From 4b4777638c424fa29224330d078b065503806aad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Dec 2022 07:50:56 +0000
Subject: [PATCH 174/953] soundtouch: 2.3.1 -> 2.3.2

---
 pkgs/development/libraries/soundtouch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix
index 318ead830f9b..c337edfa0917 100644
--- a/pkgs/development/libraries/soundtouch/default.nix
+++ b/pkgs/development/libraries/soundtouch/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "soundtouch";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "soundtouch";
     repo = "soundtouch";
     rev = version;
-    sha256 = "10znckb8mrnmvwj7vq12732al873qhqw27fpb5f8r0bkjdpcj3vr";
+    sha256 = "sha256-+RprzCn0NCueHhDkk2Lgg7Ihw8JDzu25eIVoVZwF+BA=";
   };
 
   nativeBuildInputs = [ autoconf automake libtool ];

From a16c64bf42513ea5353d235a050b629e58517cd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Dec 2022 17:53:04 +0000
Subject: [PATCH 175/953] libbpf: 1.0.1 -> 1.1.0

---
 pkgs/os-specific/linux/libbpf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 04322a35b4fe..d6bb9d4a431b 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libbpf";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
     rev = "v${version}";
-    sha256 = "sha256-2rzVah+CxCztKnlEWMIQrUS2JJTLiWscfIA1aOBtIzs=";
+    sha256 = "sha256-/vt6IA1o0gjFtXUWhEKIZ1DUWIN2LOvrhLfFzJBACGY=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From b4b746ca00bb6ee7e21be8ed6826892fdf0ee4ed Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Tue, 20 Dec 2022 22:10:23 +0100
Subject: [PATCH 176/953] libcamera: 0.0.1 -> 0.0.3

libcamera 0.0.3 has been released
https://git.libcamera.org/libcamera/libcamera.git/tag/?h=v0.0.3
---
 pkgs/development/libraries/libcamera/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix
index ff7cd7a193e3..d03783f2fd90 100644
--- a/pkgs/development/libraries/libcamera/default.nix
+++ b/pkgs/development/libraries/libcamera/default.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libcamera";
-  version = "0.0.1";
+  version = "0.0.3";
 
   src = fetchgit {
     url = "https://git.libcamera.org/libcamera/libcamera.git";
     rev = "v${version}";
-    hash = "sha256-u5FnfXBCjwSp8QBrH8KIkVGV32/9pff41ZWjWXOwuMI=";
+    hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE=";
   };
 
   postPatch = ''

From 78c276f9b14436ca2ea45a90d53a3e221a7689d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 21 Dec 2022 00:25:44 +0100
Subject: [PATCH 177/953] nixos/no-x-libs: add gst_all_1.gst-plugins-base, turn
 gstreamer back on for libextractor

---
 nixos/modules/config/no-x-libs.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 70e265a65a60..3c964cb20913 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -33,10 +33,13 @@ with lib;
       ffmpeg_4 = super.ffmpeg_4-headless;
       ffmpeg_5 = super.ffmpeg_5-headless;
       gobject-introspection = super.gobject-introspection.override { x11Support = false; };
+      gst_all_1 = super.gst_all_1 // {
+        gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; };
+      };
       gpsd = super.gpsd.override { guiSupport = false; };
       imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
       imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
-      libextractor = super.libextractor.override { gstreamerSupport = false; gtkSupport = false; };
+      libextractor = super.libextractor.override { gtkSupport = false; };
       libva = super.libva-minimal;
       limesuite = super.limesuite.override { withGui = false; };
       msmtp = super.msmtp.override { withKeyring = false; };

From c5551f19e5d76d3ed1e83fbc659686a56a297cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 21 Dec 2022 18:53:04 +0100
Subject: [PATCH 178/953] nixos/no-x-libs: add mpv-unwrapped

---
 nixos/modules/config/no-x-libs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 3c964cb20913..9c83a44d7b0e 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -42,6 +42,7 @@ with lib;
       libextractor = super.libextractor.override { gtkSupport = false; };
       libva = super.libva-minimal;
       limesuite = super.limesuite.override { withGui = false; };
+      mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; };
       msmtp = super.msmtp.override { withKeyring = false; };
       networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
       networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };

From 1557d417975bd1369c11a72715e36e23cf982a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 21 Dec 2022 18:53:18 +0100
Subject: [PATCH 179/953] gst_all_1.gst-plugins-base: fix build without x11

---
 pkgs/development/libraries/gstreamer/base/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index dac712e82387..395708c2a680 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -79,17 +79,16 @@ stdenv.mkDerivation rec {
     libjpeg
     tremor
     libGL
+    pango
   ] ++ lib.optionals (!stdenv.isDarwin) [
     libvisual
   ] ++ lib.optionals stdenv.isDarwin [
-    pango
     OpenGL
   ] ++ lib.optionals enableAlsa [
     alsa-lib
   ] ++ lib.optionals enableX11 [
     libXext
     libXv
-    pango
   ] ++ lib.optionals enableWayland [
     wayland
     wayland-protocols

From a4a1e28e2d3fcbb9efa9e4f4fdc238623148a0d8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Dec 2022 20:51:57 +0100
Subject: [PATCH 180/953] python310Packages.pytest-httpserver: add changelog to
 meta

- switch to pyproject
- adjust inputs
---
 .../pytest-httpserver/default.nix             | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
index cba9a9294e7c..eebbcacb5037 100644
--- a/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -1,35 +1,50 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, pytest-cov
+, fetchFromGitHub
+, poetry-core
 , pytestCheckHook
+, pythonOlder
 , requests
+, toml
 , werkzeug
 }:
 
 buildPythonPackage rec {
   pname = "pytest-httpserver";
   version = "1.0.6";
+  format = "pyproject";
 
-  src = fetchPypi {
-    pname = "pytest_httpserver";
-    inherit version;
-    sha256 = "sha256-kEDQe/WaxF2N49sdRGj9LR1geXXk2kyHLswEAs2/ez4=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "csernazs";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-LY5Ur0cIcsNrgvyQlY2E479ZzRcuwqTuiT2MtRupVcs=";
   };
 
-  propagatedBuildInputs = [ werkzeug ];
-
-  checkInputs = [
-    pytest-cov
-    pytestCheckHook
-    requests
+  nativeBuildInputs = [
+    poetry-core
   ];
 
-  pythonImportsCheck = [ "pytest_httpserver" ];
+  propagatedBuildInputs = [
+    werkzeug
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    requests
+    toml
+  ];
+
+  pythonImportsCheck = [
+    "pytest_httpserver"
+  ];
 
   meta = with lib; {
     description = "HTTP server for pytest to test HTTP clients";
     homepage = "https://www.github.com/csernazs/pytest-httpserver";
+    changelog = "https://github.com/csernazs/pytest-httpserver/blob/${version}/CHANGES.rst";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 69ba914b99bc7c43f5d821f7afef8d28a4d73d22 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 12 Dec 2022 07:12:45 +1000
Subject: [PATCH 181/953] git: 2.38.1 -> 2.39.0

Changelog: https://github.com/git/git/blob/v2.39.0/Documentation/RelNotes/2.39.0.txt
---
 pkgs/applications/version-management/git/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 2d63ae403791..19b9f97c17f7 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.38.1";
+  version = "2.39.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
 in
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "sha256-l9346liiueD7wlCOJFAoynWRG9ONFVFhaxSMGqV0Ctk=";
+    sha256 = "sha256-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";

From 67ce2eda82f8bc27b9abf9a63882532264f6bd3d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 26 Dec 2022 14:45:00 +0000
Subject: [PATCH 182/953] tcb: fix cross-compilation of tcb

Without the change build fails to find `gcc`:

    $ nix build --no-link -f. pkgsCross.riscv64.shadow
    > make[1]: Entering directory '/build/source/libs'
    > gcc -O2  -I../include -Wall -Wextra -fPIC -c libtcb.c -o libtcb.o
    > /nix/store/b9jxsncywlygxjjyql0z5bq6z29m6j4r-bash-5.1-p16/bin/bash: line 1: gcc: command not found
---
 pkgs/tools/security/tcb/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/tools/security/tcb/default.nix
index 63b252be9521..b49f7767dcbd 100644
--- a/pkgs/tools/security/tcb/default.nix
+++ b/pkgs/tools/security/tcb/default.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
       --replace "PREFIX = /usr" "PREFIX = $out" \
       --replace "SBINDIR = /sbin" "SBINDIR = $bin/bin" \
       --replace "INCLUDEDIR = \$(PREFIX)/include" "INCLUDEDIR = $dev/include"
+
+    # Override default 'CC=gcc'
+    makeFlagsArray+=("CC=$CC")
   '';
 
   meta = with lib; {

From 37a44b41fcf1aebd06e4417bde5cbb1e5be3bc2b Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 23 Dec 2022 16:47:20 +0100
Subject: [PATCH 183/953] git: set reasonable default features

Git should come with a reasonable set of baseline features. Arguable
git-send-email is one of them. Development flows, such as those of
Linux, depend on the tool being available.

The difference in closure size between this and the previous version
is is negligible. There are no additional build-time dependencies
pulled in and the runtime closure difference is about 1%.
---
 pkgs/applications/version-management/git/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 19b9f97c17f7..56f7e697ec87 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -12,7 +12,7 @@
 , withManual ? true
 , pythonSupport ? true
 , withpcre2 ? true
-, sendEmailSupport ? false
+, sendEmailSupport ? perlSupport
 , Security, CoreServices
 , nixosTests
 , withLibsecret ? false

From 8f421eef7d265e53eb24aa33ba583bee19738a97 Mon Sep 17 00:00:00 2001
From: SnIcK <ido.samuelson@gmail.com>
Date: Mon, 26 Dec 2022 16:49:30 -0600
Subject: [PATCH 184/953] maintainers: add realsnick

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 99907a6877f8..0d7e7b238591 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11436,6 +11436,12 @@
     githubId = 1973389;
     name = "Reuben D'Netto";
   };
+  realsnick = {
+    name = "Ido Samuelson";
+    email = "ido.samuelson@gmail.com";
+    github = "realsnick";
+    githubId = 1440852;
+  };
   redbaron = {
     email = "ivanov.maxim@gmail.com";
     github = "redbaron";

From fff47fb03946e6036bad1a7e22de2d47aed1c211 Mon Sep 17 00:00:00 2001
From: SnIcK <ido.samuelson@gmail.com>
Date: Mon, 26 Dec 2022 16:50:13 -0600
Subject: [PATCH 185/953] libusb1: add option to build with examples

---
 pkgs/development/libraries/libusb1/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index f7f1633ed446..326ee3028158 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
@@ -8,6 +9,7 @@
 , libobjc
 , IOKit
 , Security
+, withExamples ? false
 , withStatic ? false
 }:
 
@@ -31,12 +33,20 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = withStatic;
 
-  configureFlags = lib.optional (!enableUdev) "--disable-udev";
+  configureFlags =
+    lib.optional (!enableUdev) "--disable-udev"
+    ++ lib.optional (withExamples) "--enable-examples-build";
 
   preFixup = lib.optionalString enableUdev ''
     sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 
+  postInstall = lib.optionalString withExamples ''
+    mkdir -p $out/{bin,sbin,examples/bin}
+    cp -r examples/.libs/* $out/examples/bin
+    ln -s $out/examples/bin/fxload $out/sbin/fxload
+  '';
+
   meta = with lib; {
     homepage = "https://libusb.info/";
     description = "cross-platform user-mode USB device library";
@@ -45,6 +55,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.all;
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ prusnak ];
+    maintainers = with maintainers; [ prusnak realsnick ];
   };
 }

From 6257a5ae5d24bbb23e37c65902875a65ae438f15 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 26 Dec 2022 18:16:40 +0800
Subject: [PATCH 186/953] gtk3: add missing libXdamage, explicitly add
 libXfixes

libXdamage is an optional dependency, however this is needed for XEmbed
tray icons on MATE to work properly. This is already enabled in gtk4.

https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.36/meson.build#L583
https://gitlab.gnome.org/search?search=xdamage&project_id=665&group_id=8&search_code=true&repository_ref=gtk-3-24

Also explicitly add libXfixes since gtk3 also optionally directly depends
on it.

https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.36/meson.build#L577
---
 pkgs/development/libraries/gtk/3.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 282486dc88d5..112158a47276 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -145,6 +145,8 @@ stdenv.mkDerivation rec {
     libSM
     libXcomposite
     libXcursor
+    libXdamage
+    libXfixes
     libXi
     libXrandr
     libXrender

From 7843a268f214f89dba7fdab1030872bdc96b9606 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 25 Dec 2022 20:22:18 +0000
Subject: [PATCH 187/953] poetry2nix: drop unused pkgs.xlibsWrapper import

It's a cherry-pick of upstream
https://github.com/nix-community/poetry2nix/pull/897

Merging this earlier will allow removing `xlibsWrapper` entirely.
---
 .../tools/poetry2nix/poetry2nix/overrides/default.nix            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
index 9979153842b1..36a66d091aeb 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
@@ -1669,7 +1669,6 @@ lib.composeManyExtensions [
 
             propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [
               pkgs.cairo
-              pkgs.xlibsWrapper
             ];
 
             mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ];

From 3eec3c8fed0251563841e26e044600139c2f92eb Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Mon, 12 Dec 2022 17:59:18 +0100
Subject: [PATCH 188/953] buildRustPackage: remove git from nativeBuildInputs

Having git in nativeBuildInputs causes thousands of rebuilds when git is touched
because every derivation that somehow transiently depends on a rust package will
change. See https://github.com/NixOS/nixpkgs/pull/205682 for instance.

AFAICT git is unused. Only the fetcher needs git which it has already.

Fixes https://github.com/NixOS/nixpkgs/issues/205804
---
 pkgs/build-support/rust/build-rust-package/default.nix | 2 --
 pkgs/development/compilers/rust/make-rust-platform.nix | 1 -
 2 files changed, 3 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index e7eab34e45d9..a24425bf27aa 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -5,7 +5,6 @@
 , stdenv
 , callPackage
 , cacert
-, git
 , cargoBuildHook
 , cargoCheckHook
 , cargoInstallHook
@@ -125,7 +124,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
     })
   ] ++ [
     cacert
-    git
     cargoBuildHook
     (if useNextest then cargoNextestHook else cargoCheckHook)
     cargoInstallHook
diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix
index 7e98684ecff1..fcfd02dcf6cd 100644
--- a/pkgs/development/compilers/rust/make-rust-platform.nix
+++ b/pkgs/development/compilers/rust/make-rust-platform.nix
@@ -13,7 +13,6 @@ rec {
   };
 
   buildRustPackage = callPackage ../../../build-support/rust/build-rust-package {
-    git = buildPackages.gitMinimal;
     inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook
       fetchCargoTarball importCargoLock rustc;
   };

From c88535bc54bd665d82172a581286f4ccc429becb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 27 Dec 2022 17:04:20 +0300
Subject: [PATCH 189/953] pipewire: backport a few fixes

---
 pkgs/development/libraries/pipewire/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 8f0852b06a12..62b6536c047d 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -102,6 +102,19 @@ let
       ./0090-pipewire-config-template-paths.patch
       # Place SPA data files in lib output to avoid dependency cycles
       ./0095-spa-data-dir.patch
+
+      # FIXME: backports, remove after 0.3.64
+      # fix bluetooth issues
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c7b3ef0d9ff16a1e69a299870860bebcb628e298.patch";
+        hash = "sha256-hiZ6VUhMu8NgwX5DZ/JRVl/g1Go0nZQSjQVrmqIzXoY=";
+      })
+
+      # fix routes getting lost
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/89ac6b353521fb9a6d6eb6bb74724c4fa968f75c.patch";
+        hash = "sha256-vzHiKWGmyuUF2iDS/ZQws+bCXVYYEl048JaMckY/fGI=";
+      })
     ];
 
     nativeBuildInputs = [

From b21655f6617e1c6eea3fa6b38ab1ec5934f9fb70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Dec 2022 04:15:03 +0000
Subject: [PATCH 190/953] ell: 0.54 -> 0.55

---
 pkgs/os-specific/linux/ell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 1e188fbe6074..3306d875272f 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.54";
+  version = "0.55";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    sha256 = "sha256-Oi+S4DWXuTUL36Xh3iWIZj9rdN2qUDHmZiFSH1csW+8=";
+    sha256 = "sha256-vMWs+0iaszq+p55Z9AhqkNHWeOwlgt2iq7uuA8xGjJ4=";
   };
 
   nativeBuildInputs = [

From 3fba3bf53f2412cc5e324c3ad19215c058de5617 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 23 Dec 2022 22:17:07 +0000
Subject: [PATCH 191/953] gawk: 5.1.1 -> 5.2.1

Had to pull in yet unreleased patch to avoid persistent memory alocator
on darwin as the hack in release relies on x86_64 emulation for aarch64
ports.

changelogs:
- 5.2.1: https://lists.gnu.org/archive/html/info-gnu/2022-11/msg00008.html
- 5.2.0: https://lists.gnu.org/archive/html/info-gnu/2022-09/msg00003.html
---
 pkgs/tools/text/gawk/darwin-no-pma.patch | 31 ++++++++++++++++++++++++
 pkgs/tools/text/gawk/default.nix         | 15 +++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/text/gawk/darwin-no-pma.patch

diff --git a/pkgs/tools/text/gawk/darwin-no-pma.patch b/pkgs/tools/text/gawk/darwin-no-pma.patch
new file mode 100644
index 000000000000..f198acd41af1
--- /dev/null
+++ b/pkgs/tools/text/gawk/darwin-no-pma.patch
@@ -0,0 +1,31 @@
+https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=e0b7737930f8a677d3c509f8ce72b9130965ec0a
+--- a/m4/pma.m4
++++ b/m4/pma.m4
+@@ -23,15 +23,18 @@ then
+ 				[LDFLAGS="${LDFLAGS} -no-pie"
+ 				export LDFLAGS])
+ 			;;
+-		*darwin*)
+-			# 23 October 2022: See README_d/README.macosx for
+-			# the details on what's happening here. See also
+-			# the manual.
+-
+-			# Compile as Intel binary all the time, even on M1.
+-			CFLAGS="${CFLAGS} -arch x86_64"
+-			LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
+-			export CFLAGS LDFLAGS
++ 		*darwin*)
++			# 27 November 2022: PMA only works on Intel.
++			case $host in
++			x86_64-*)
++				LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
++				export LDFLAGS
++				;;
++			*)
++				# disable on all other macOS systems
++				use_persistent_malloc=no
++				;;
++			esac
+ 			;;
+ 		*cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
+ 			true	# nothing do, exes on these systems are not PIE
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 3f91a301fd1b..f07da96aa48b 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -2,6 +2,7 @@
 # TODO: links -lsigsegv but loses the reference for some reason
 , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv
 , interactive ? false, readline
+, autoreconfHook # no-pma fix
 
 /* Test suite broke on:
        stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
@@ -17,18 +18,26 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
 
 stdenv.mkDerivation rec {
   pname = "gawk" + lib.optionalString interactive "-interactive";
-  version = "5.1.1";
+  version = "5.2.1";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/gawk-${version}.tar.xz";
-    sha256 = "18kybw47fb1sdagav7aj95r9pp09r5gm202y3ahvwjw9dqw2jxnq";
+    hash = "sha256-ZzVTuR+eGMxXku1RB1341RDJBA9VCm904Jya3SQ6fk8=";
   };
 
+  patches = [
+    # Pull upstream fix for aarch64-darwin where pma does not work.
+    # Can be removed after next gawk release.
+    ./darwin-no-pma.patch
+  ];
+
   # When we do build separate interactive version, it makes sense to always include man.
   outputs = [ "out" "info" ]
     ++ lib.optional (!interactive) "man";
 
-  nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales;
+  nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales
+    # no-pma fix
+    ++ [ autoreconfHook ];
 
   buildInputs = lib.optional withSigsegv libsigsegv
     ++ lib.optional interactive readline

From 3c478e4b5db3bb02d981980e00b6470f6addea6f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 27 Dec 2022 09:20:42 +0000
Subject: [PATCH 192/953] xlibsWrapper: remove deprecated and now unused
 wrapper package

There should be no reason to use this package as it's a remnant of
non-modular X. Chances are you do not want every single library it
used to pull in:

      freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt
      xorg.libXft xorg.libXext xorg.libSM xorg.libICE

Just pick the ones you really need instead.

`nixpkgs` does not have any users of `xlibsWrapper`.

Closes: https://github.com/NixOS/nixpkgs/issues/194054
---
 .../from_md/release-notes/rl-2305.section.xml |  8 +++++++
 .../manual/release-notes/rl-2305.section.md   |  2 ++
 .../libraries/xlibs-wrapper/default.nix       | 21 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  8 -------
 5 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/xlibs-wrapper/default.nix

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index cceac682c3a0..4be8ef71367b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -242,6 +242,14 @@
           that it configures the NixOS boot process, not the Nix daemon.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Deprecated <literal>xlibsWrapper</literal> transitional
+          package has been removed in favour of direct use of its
+          constitutents: <literal>xorg.libX11</literal>,
+          <literal>freetype</literal> and others.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-23.05-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 89dc182361d5..d8a827c397c8 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -63,6 +63,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon.
 
+- Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others.
+
 ## Other Notable Changes {#sec-release-23.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix
deleted file mode 100644
index 5340306de79a..000000000000
--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{lib, stdenv, packages}:
-
-stdenv.mkDerivation {
-  name = "xlibs-wrapper";
-
-  dontBuild = true;
-
-  installPhase = "mkdir -p $out";
-  unpackPhase = "sourceRoot=.";
-
-  propagatedBuildInputs = packages;
-
-  preferLocalBuild = true;
-
-  # For compatability with XFree86.
-  passthru.buildClientLibs = true;
-
-  meta = {
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 61448e77e798..6755dfac6700 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1627,6 +1627,7 @@ mapAliases ({
   xfceUnstable = throw "xfceUnstable has been removed, use xfce instead"; # added 2022-12-25
   xineLib = xine-lib; # Added 2021-04-27
   xineUI = xine-ui; # Added 2021-04-27
+  xlibsWrapper = throw "'xlibsWrapper' has been replaced by its constituents"; # Converted to throw 2022-12-27
   xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22
   xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
   xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b2e4a5a2457..d100ac3ec34e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23434,14 +23434,6 @@ with pkgs;
 
   xgeometry-select = callPackage ../tools/X11/xgeometry-select { };
 
-  # Avoid using this. It isn't really a wrapper anymore, but we keep the name.
-  xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
-    packages = [
-      freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt
-      xorg.libXft xorg.libXext xorg.libSM xorg.libICE
-    ];
-  };
-
   xmlada = callPackage ../development/libraries/ada/xmlada { };
 
   xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };

From 97b4a0e4a7cc205615d05a8e17f47e40c4cbcf23 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 28 Dec 2022 09:51:24 +0000
Subject: [PATCH 193/953] ansible-language-server: restore lost updater and
 prepactk handling on merge

---
 .../tools/language-servers/ansible-language-server/default.nix  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix
index 4b9fb6e6c05e..f9946ed45963 100644
--- a/pkgs/development/tools/language-servers/ansible-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix
@@ -27,9 +27,11 @@ buildNpmPackage rec {
   # wiping out node_modules, which causes a mysterious error stating that tsc isn't installed.
   postPatch = ''
     sed -i '/"prepare"/d' package.json
+    sed -i '/"prepack"/d' package.json
   '';
 
   npmPackFlags = [ "--ignore-scripts" ];
+  passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
     changelog = "https://github.com/ansible/ansible-language-server/releases/tag/v${version}";

From 781c993a8ae7a813e88e1ff5a510d9fd2716d8ff Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 9 Dec 2022 23:38:51 +0100
Subject: [PATCH 194/953] python310Packages.boto3: 1.24.75 -> 1.26.38

---
 .../python-modules/boto3/default.nix          | 57 +++++++++++--------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 698f252909ef..b9aafb7621c2 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -1,50 +1,57 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , botocore
 , jmespath
 , s3transfer
-, futures ? null
-, docutils
-, nose
-, mock
-, isPy3k
+, setuptools
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "boto3";
-  version = "1.24.75"; # N.B: if you change this, change botocore and awscli to a matching version
+  version = "1.26.38"; # N.B: if you change this, change botocore and awscli to a matching version
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-e/oiQt+bH6c+F/TX959rIlYPVdXaLifleOWF725LFKc=";
+  src = fetchFromGitHub {
+    owner = "boto";
+    repo = pname;
+    rev = version;
+    hash = "sha256-/QkR6gL0XkXofnFDcKa7J0ZbZbgT0IKnqtq2wcilbEs=";
   };
 
-  propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
-  checkInputs = [ docutils nose mock ];
+  propagatedBuildInputs = [
+    botocore
+    jmespath
+    s3transfer
+    setuptools
+  ];
 
-  checkPhase = ''
-    runHook preCheck
-    # This method is not in mock. It might have appeared in some versions.
-    sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \
-      tests/unit/resources/test_factory.py
-    nosetests -d tests/unit --verbose
-    runHook postCheck
-  '';
+  doCheck = true;
 
-  # Network access
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  pythonImportsCheck = [ "boto3" ];
+  pythonImportsCheck = [
+    "boto3"
+  ];
 
-  meta = {
+  disabledTestPaths = [
+    # Integration tests require networking
+    "tests/integration"
+  ];
+
+  meta = with lib; {
     homepage = "https://github.com/boto/boto3";
-    license = lib.licenses.asl20;
+    changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst";
+    license = licenses.asl20;
     description = "AWS SDK for Python";
     longDescription = ''
       Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
       Python, which allows Python developers to write software that makes use of
       services like Amazon S3 and Amazon EC2.
     '';
+    maintainers = with maintainers; [ anthonyroussel ];
   };
 }

From 9a0aed0dc19b8fc31dd00183216c2fc29830c013 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 9 Dec 2022 23:39:14 +0100
Subject: [PATCH 195/953] python310Packages.botocore: 1.27.75 -> 1.29.38

---
 .../python-modules/botocore/default.nix       | 34 ++++++++++++-------
 .../tools/virtualization/awsebcli/default.nix |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index c6905d2de667..1d101b368f93 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -4,43 +4,51 @@
 , python-dateutil
 , jmespath
 , docutils
-, simplejson
-, mock
-, nose
 , urllib3
+, pytestCheckHook
+, jsonschema
 }:
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.27.75"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.29.38"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+LHaK0HojFjbUdsMbv9spWQliUjOSlrH6WrDWkabDU8=";
+    hash = "sha256-K5jH2oZozcAitNila1BoZFTQoQwRUYcC/eQYgdIGGLY=";
   };
 
   propagatedBuildInputs = [
     python-dateutil
     jmespath
     docutils
-    simplejson
     urllib3
   ];
 
-  checkInputs = [ mock nose ];
+  checkInputs = [
+    pytestCheckHook
+    jsonschema
+  ];
 
-  checkPhase = ''
-    nosetests -v
-  '';
+  doCheck = true;
 
-  # Network access
-  doCheck = false;
+  disabledTestPaths = [
+    # Integration tests require networking
+    "tests/integration"
 
-  pythonImportsCheck = [ "botocore" ];
+    # Disable slow tests (only run unit tests)
+    "tests/functional"
+  ];
+
+  pythonImportsCheck = [
+    "botocore"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/boto/botocore";
+    changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst";
     license = licenses.asl20;
     description = "A low-level interface to a growing number of Amazon Web Services";
+    maintainers = with maintainers; [ anthonyroussel ];
   };
 }
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index e9c4a6e40ebb..df6e76d63b8b 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -49,7 +49,7 @@ 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 "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.76" \
+      --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \
       --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \
       --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \
       --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0"

From 4e2ee61dfd04d98be1a9cae62391cc80ace112c5 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 9 Dec 2022 23:39:27 +0100
Subject: [PATCH 196/953] awscli: 1.25.76 -> 1.27.38

---
 pkgs/tools/admin/awscli/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 34fd3e45906f..3438580c7f22 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli";
-  version = "1.25.76"; # N.B: if you change this, change botocore and boto3 to a matching version too
+  version = "1.27.38"; # N.B: if you change this, change botocore and boto3 to a matching version too
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PSr0zZEGXFxcFSN7QQ5Ux0Z4aCwwm9na+2hIv/gR6+s=";
+    hash = "sha256-SjeFBWwfd+9sXcZL9NdqFyuBIQtql3KB3lnygeVVHU0=";
   };
 
   # https://github.com/aws/aws-cli/issues/4837
@@ -82,6 +82,7 @@ with py.pkgs; buildPythonApplication rec {
 
   meta = with lib; {
     homepage = "https://aws.amazon.com/cli/";
+    changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";
     description = "Unified tool to manage your AWS services";
     license = licenses.asl20;
     mainProgram = "aws";

From b1d1ff029af05d15838b273c299d5231c7b42095 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 11 Dec 2022 20:25:23 +0100
Subject: [PATCH 197/953] python310Packages.moto: 4.0.3 -> 4.0.12

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

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index ad8b8c13a692..6de072579772 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -20,7 +20,6 @@
 , openapi-spec-validator
 , python-dateutil
 , python-jose
-, pytz
 , pyyaml
 , requests
 , responses
@@ -37,21 +36,16 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "4.0.3";
+  version = "4.0.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-iutWdX5oavPkpj+Qr7yXPLIxrarYfFzonmiTbBCbC+k=";
+    hash = "sha256-MPjzFljxjNsV62JsjLOgdSDw2MIZMib7yzMmrhL7okY=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "werkzeug>=0.5,<2.2.0" "werkzeug>=0.5"
-  '';
-
   propagatedBuildInputs = [
     aws-xray-sdk
     boto3
@@ -68,7 +62,6 @@ buildPythonPackage rec {
     openapi-spec-validator
     python-dateutil
     python-jose
-    pytz
     pyyaml
     requests
     responses
@@ -139,6 +132,8 @@ buildPythonPackage rec {
     "tests/test_awslambda/test_lambda_eventsourcemapping.py"
     "tests/test_awslambda/test_lambda_invoke.py"
     "tests/test_batch/test_batch_jobs.py"
+    "tests/test_kinesis/test_kinesis.py"
+    "tests/test_kinesis/test_kinesis_stream_consumers.py"
   ];
 
   disabledTests = [

From 021eed6b752f466e7931fc1e63071a7a0ebe85d5 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 28 Dec 2022 21:33:16 +0200
Subject: [PATCH 198/953] opencv: 4.6.0 -> 4.7.0

https://github.com/opencv/opencv/releases/tag/4.7.0
---
 pkgs/development/libraries/opencv/4.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 664f39c0c6cd..55889ccab07b 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -76,20 +76,20 @@
 }:
 
 let
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "opencv";
     repo = "opencv";
     rev = version;
-    sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg=";
+    sha256 = "sha256-jUeGsu8+jzzCnIFbVMCW8DcUeGv/t1yCY/WXyW+uGDI=";
   };
 
   contribSrc = fetchFromGitHub {
     owner = "opencv";
     repo = "opencv_contrib";
     rev = version;
-    sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE=";
+    sha256 = "sha256-meya0J3RdOIeMM46e/6IOVwrKn3t/c0rhwP2WQaybkE=";
   };
 
   # Contrib must be built in order to enable Tesseract support:

From 50adabdd60d590c951824974356a9ccb9bb73ffc Mon Sep 17 00:00:00 2001
From: Markus Napierkowski <markus.napierkowski@cyberus-technology.de>
Date: Wed, 21 Dec 2022 10:31:59 +0100
Subject: [PATCH 199/953] readline: 8.1 -> 8.2

---
 .../libraries/readline/{8.1.nix => 8.2.nix}         | 12 ++++++------
 .../libraries/readline/no-arch_only-8.2.patch       | 13 +++++++++++++
 .../libraries/readline/readline-8.1-patches.nix     |  6 ------
 .../libraries/readline/readline-8.2-patches.nix     |  5 +++++
 pkgs/top-level/all-packages.nix                     | 12 ++++--------
 5 files changed, 28 insertions(+), 20 deletions(-)
 rename pkgs/development/libraries/readline/{8.1.nix => 8.2.nix} (85%)
 create mode 100644 pkgs/development/libraries/readline/no-arch_only-8.2.patch
 delete mode 100644 pkgs/development/libraries/readline/readline-8.1-patches.nix
 create mode 100644 pkgs/development/libraries/readline/readline-8.2-patches.nix

diff --git a/pkgs/development/libraries/readline/8.1.nix b/pkgs/development/libraries/readline/8.2.nix
similarity index 85%
rename from pkgs/development/libraries/readline/8.1.nix
rename to pkgs/development/libraries/readline/8.2.nix
index 35835c1a1436..0fedcdc9397f 100644
--- a/pkgs/development/libraries/readline/8.1.nix
+++ b/pkgs/development/libraries/readline/8.2.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "readline";
-  version = "8.1p${toString (builtins.length upstreamPatches)}";
+  version = "8.2p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
     url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz";
-    sha256 = "00ibp0n9crbwx15k9vvckq5wsipw98b1px8pd8i34chy2gpb9kpq";
+    sha256 = "sha256-P+txcfFqhO6CyhijbXub4QmlLAT0kqBTMx19EJUAfDU=";
   };
 
   outputs = [ "out" "dev" "man" "doc" "info" ];
@@ -20,15 +20,15 @@ stdenv.mkDerivation rec {
     (let
        patch = nr: sha256:
          fetchurl {
-           url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline81-${nr}";
+           url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline82-${nr}";
            inherit sha256;
          };
      in
-       import ./readline-8.1-patches.nix patch);
+       import ./readline-8.2-patches.nix patch);
 
   patches =
     [ ./link-against-ncurses.patch
-      ./no-arch_only-6.3.patch
+      ./no-arch_only-8.2.patch
     ]
     ++ upstreamPatches;
 
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ dtzWill ];
 
     platforms = platforms.unix;
-    branch = "8.1";
+    branch = "8.2";
   };
 }
diff --git a/pkgs/development/libraries/readline/no-arch_only-8.2.patch b/pkgs/development/libraries/readline/no-arch_only-8.2.patch
new file mode 100644
index 000000000000..06f01ec0891f
--- /dev/null
+++ b/pkgs/development/libraries/readline/no-arch_only-8.2.patch
@@ -0,0 +1,13 @@
+diff -ru -x '*~' readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf
+--- support/shobj-conf	2014-02-24 03:06:29.000000000 +0100
++++ support/shobj-conf	2014-07-22 11:18:52.000000000 +0200
+@@ -159,9 +159,6 @@
+ 	# Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
+ 	*)
+ 		case "${host_os}" in
+-		darwin[89]*|darwin1[012]*)
+-			SHOBJ_ARCHFLAGS=
+-			;;
+ 		 *) 	# Mac OS X 10.9 (Mavericks) and later
+ 			SHOBJ_ARCHFLAGS=
+ 			# for 32 and 64bit universal library
diff --git a/pkgs/development/libraries/readline/readline-8.1-patches.nix b/pkgs/development/libraries/readline/readline-8.1-patches.nix
deleted file mode 100644
index b2aaadf0e9b5..000000000000
--- a/pkgs/development/libraries/readline/readline-8.1-patches.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-# Automatically generated by `update-patch-set.sh'; do not edit.
-
-patch: [
-(patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8")
-(patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5")
-]
diff --git a/pkgs/development/libraries/readline/readline-8.2-patches.nix b/pkgs/development/libraries/readline/readline-8.2-patches.nix
new file mode 100644
index 000000000000..48d2bd14badb
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline-8.2-patches.nix
@@ -0,0 +1,5 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv")
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e54165e6954a..2c4807866049 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1915,9 +1915,7 @@ with pkgs;
 
   thicket = callPackage ../applications/version-management/thicket { };
 
-  tig = callPackage ../applications/version-management/tig {
-    readline = readline81;
-  };
+  tig = callPackage ../applications/version-management/tig { };
 
   top-git = callPackage ../applications/version-management/topgit { };
 
@@ -22536,14 +22534,14 @@ with pkgs;
 
   raylib = callPackage ../development/libraries/raylib { };
 
-  readline = readline81;
+  readline = readline82;
   readline6 = readline63;
 
   readline63 = callPackage ../development/libraries/readline/6.3.nix { };
 
   readline70 = callPackage ../development/libraries/readline/7.0.nix { };
 
-  readline81 = callPackage ../development/libraries/readline/8.1.nix { };
+  readline82 = callPackage ../development/libraries/readline/8.2.nix { };
 
   readosm = callPackage ../development/libraries/readosm { };
 
@@ -25337,9 +25335,7 @@ with pkgs;
 
   drbd = callPackage ../os-specific/linux/drbd { };
 
-  dropwatch = callPackage ../os-specific/linux/dropwatch {
-    readline = readline81;
-  };
+  dropwatch = callPackage ../os-specific/linux/dropwatch { };
 
   dsd = callPackage ../applications/radio/dsd { };
 

From aae36e6869162e97b6ff02b6bdfdeb23e55f3c5d Mon Sep 17 00:00:00 2001
From: Markus Napierkowski <markus.napierkowski@cyberus-technology.de>
Date: Tue, 20 Dec 2022 17:29:59 +0100
Subject: [PATCH 200/953] bash: 5.1 -> 5.2

---
 pkgs/shells/bash/{5.1.nix => 5.nix}   | 21 +++++++++++----------
 pkgs/shells/bash/bash-5.1-patches.nix | 20 --------------------
 pkgs/shells/bash/bash-5.2-patches.nix | 19 +++++++++++++++++++
 pkgs/shells/bash/pgrp-pipe-5.1.patch  | 16 ----------------
 pkgs/shells/bash/pgrp-pipe-5.patch    | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix       |  6 +++---
 6 files changed, 48 insertions(+), 49 deletions(-)
 rename pkgs/shells/bash/{5.1.nix => 5.nix} (85%)
 delete mode 100644 pkgs/shells/bash/bash-5.1-patches.nix
 create mode 100644 pkgs/shells/bash/bash-5.2-patches.nix
 delete mode 100644 pkgs/shells/bash/pgrp-pipe-5.1.patch
 create mode 100644 pkgs/shells/bash/pgrp-pipe-5.patch

diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.nix
similarity index 85%
rename from pkgs/shells/bash/5.1.nix
rename to pkgs/shells/bash/5.nix
index 458210873a68..6e16c083bc7c 100644
--- a/pkgs/shells/bash/5.1.nix
+++ b/pkgs/shells/bash/5.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , buildPackages
 , fetchurl
 , binutils
@@ -14,25 +15,25 @@
 }:
 
 let
-  upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl {
-    url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}";
+  upstreamPatches = import ./bash-5.2-patches.nix (nr: sha256: fetchurl {
+    url = "mirror://gnu/bash/bash-5.2-patches/bash52-${nr}";
     inherit sha256;
   });
 in
 stdenv.mkDerivation rec {
   name = "bash-${lib.optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchurl {
     url = "mirror://gnu/bash/bash-${version}.tar.gz";
-    sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc";
+    sha256 = "sha256-oTnBZt9/9EccXgczBRZC7lVWwcyKSnjxRVg8XIGrMvs=";
   };
 
   hardeningDisable = [ "format" ]
-  # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment:
-  # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
-  # or you can check libc/include/sys/cdefs.h in bionic source code
-  ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify";
+    # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment:
+    # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
+    # or you can check libc/include/sys/cdefs.h in bionic source code
+    ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify";
 
   outputs = [ "out" "dev" "man" "doc" "info" ];
 
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
   patchFlags = [ "-p0" ];
 
   patches = upstreamPatches
-    ++ [ ./pgrp-pipe-5.1.patch ];
+    ++ [ ./pgrp-pipe-5.patch ];
 
   configureFlags = [
     (if interactive then "--with-installed-readline" else "--disable-readline")
diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix
deleted file mode 100644
index 41eb92710588..000000000000
--- a/pkgs/shells/bash/bash-5.1-patches.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# Automatically generated by `update-patch-set.sh'; do not edit.
-
-patch: [
-(patch "001" "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b")
-(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm")
-(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2")
-(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls")
-(patch "005" "19bdyigdr81824nxvqr6a7k0cax60wq7376j6b91afbnwvlvbjyc")
-(patch "006" "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm")
-(patch "007" "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c")
-(patch "008" "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j")
-(patch "009" "1vn36dzd9g4y1h3jiss6418crla0rbcd0d6wwsyv9d5l7aaxlp74")
-(patch "010" "0amfmvbzsand7bdypylkjdpcp88fa3cplfshn7vyzv2ff2rdgj52")
-(patch "011" "0yq24abb4fzfxqnwl20b330sxl9lr9ds0nc4yi30f81l94b1y6aq")
-(patch "012" "165bff97ffih49vfs4mkr5w3z5gn1w6zfyrf773iajkw6v48kw8h")
-(patch "013" "1bfmgv3lagbk3aq9a831d29xv7jz4sjq7jhn9hq89limyinvdb67")
-(patch "014" "1l43dw4kpddn7l41i8wmj406z9abxky1wb3rk8krcys33g4f0kka")
-(patch "015" "1w40vzadzx019v0zhs4q6yqycrk04x1k8xs6qb73vk7ny4p6jdqv")
-(patch "016" "0krqqljz4bkp9wrdnwfx51bxkb8rkwf8ivc93as1znx5fr7i96c8")
-]
diff --git a/pkgs/shells/bash/bash-5.2-patches.nix b/pkgs/shells/bash/bash-5.2-patches.nix
new file mode 100644
index 000000000000..e118f03e0300
--- /dev/null
+++ b/pkgs/shells/bash/bash-5.2-patches.nix
@@ -0,0 +1,19 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "02iibpd3jq8p1bhdzgik8ps6gi1145vr463a82gj1hivjbp2ybzl")
+(patch "002" "1f6p1z85qh1lavdp3xikgp0bfv0vqhvgpgwmdzlywl35hwdmxk25")
+(patch "003" "1zxsi869jd90hksx3nyypgyqwrxhw2ws3r6hmk76yc1lsgdhq2ba")
+(patch "004" "04i5liw5cg6dqkdxfgazqc2jrw40bmclx3dx45bwy259pcj7g0iq")
+(patch "005" "0mykflv9qnbx3jz71l4f7isadiw9knm4qimqkwsv9cv88dafpq7c")
+(patch "006" "13265akl8w6zyrg0l7f0x6arjgqjhllcwl6lk46rl53x4mm5dq6i")
+(patch "007" "146lrwkn5wgxzs6vx34wl47g69zsxdy032k40qzi626b47ya6015")
+(patch "008" "1s5i8hcayrv25lc8fxcr431v634yx5sii53b8fmip789s0pxjjvb")
+(patch "009" "1kfk25151ka9wkmk1myf12irgcmvhsd8b0nfifvhrszah9w82npr")
+(patch "010" "1kf1jrwm30js0v3d1r2rk4x09s1pyjp70wnd1qqhf9bmkw15ww67")
+(patch "011" "1x5nkvbj6hci7gx42q7qa72hg2a9wwxh85dk79gn521ypwjmy6w3")
+(patch "012" "0b6lcwzm7v5bzjiwaz2c8n5aj77w8ckhp2vwk4v3zsdq3z70gc9g")
+(patch "013" "1rkwpibd6j2ghppfhqsva2jm4kdni6b7jpdsxdps52643gc4yjq9")
+(patch "014" "09766vqqw4ffnmysm725v35qkhp1g9j4qgqag941xvq655pj9y9y")
+(patch "015" "12im449abnq5gaqjmdxr5i38kmp02fa8l8wffad3jryvd58r0wzg")
+]
diff --git a/pkgs/shells/bash/pgrp-pipe-5.1.patch b/pkgs/shells/bash/pgrp-pipe-5.1.patch
deleted file mode 100644
index 478327cafc45..000000000000
--- a/pkgs/shells/bash/pgrp-pipe-5.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -u ./configure ../bash-5.0-fixed/configure
---- ./configure	2019-01-02 15:43:31.000000000 +0100
-+++ ../bash-5.0-fixed/configure	2020-01-08 14:18:21.017296179 +0100
-@@ -16312,11 +16312,7 @@
- solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
- lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
- linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
--		case "`uname -r`" in
--		1.*|2.[0123]*)	: ;;
--		*)	$as_echo "#define PGRP_PIPE 1" >>confdefs.h
-- ;;
--		esac ;;
-+		$as_echo "#define PGRP_PIPE 1" >>confdefs.h ;;
- netbsd*|openbsd*)	LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
- *qnx[67]*)	LOCAL_LIBS="-lncurses" ;;
- *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
diff --git a/pkgs/shells/bash/pgrp-pipe-5.patch b/pkgs/shells/bash/pgrp-pipe-5.patch
new file mode 100644
index 000000000000..71b397901cb0
--- /dev/null
+++ b/pkgs/shells/bash/pgrp-pipe-5.patch
@@ -0,0 +1,15 @@
+--- ./configure	2022-12-20 17:13:17.804045620 +0100
++++ ./configure-fixed	2022-12-20 17:16:00.444114824 +0100
+@@ -21723,11 +21723,7 @@
+ solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
+ lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
+-		case "`uname -r`" in
+-		1.*|2.[0123]*)	: ;;
+-		*)	printf "%s\n" "#define PGRP_PIPE 1" >>confdefs.h
+- ;;
+-		esac ;;
++		printf "%s\n" "#define PGRP_PIPE 1" >>confdefs.h ;;
+ netbsd*|openbsd*)	LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
+ freebsd*|midnightbsd*)	LOCAL_CFLAGS='-DHEREDOC_PIPESIZE=4096' ;;
+ *qnx[67]*)	LOCAL_LIBS="-lncurses" ;;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c4807866049..899560269b96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13558,16 +13558,16 @@ with pkgs;
 
   any-nix-shell = callPackage ../shells/any-nix-shell { };
 
-  bash = lowPrio (callPackage ../shells/bash/5.1.nix {
+  bash = lowPrio (callPackage ../shells/bash/5.nix {
     binutils = stdenv.cc.bintools;
   });
   # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
-  bashInteractive = callPackage ../shells/bash/5.1.nix {
+  bashInteractive = callPackage ../shells/bash/5.nix {
     binutils = stdenv.cc.bintools;
     interactive = true;
     withDocs = true;
   };
-  bashInteractiveFHS = callPackage ../shells/bash/5.1.nix {
+  bashInteractiveFHS = callPackage ../shells/bash/5.nix {
     binutils = stdenv.cc.bintools;
     interactive = true;
     withDocs = true;

From e9f67d5ae55e2107ef0ece3a537b29375a1e9b00 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 28 Dec 2022 22:26:07 +0200
Subject: [PATCH 201/953] gst_all_1.gst-plugins-bad: bump opencv version range

---
 pkgs/development/libraries/gstreamer/bad/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index e9f324b24533..1d2ae340a806 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -323,6 +323,11 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs \
       scripts/extract-release-date-from-doap-file.py
+
+    # upstream bumps this version check one minor version at a time
+    # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/subprojects/gst-plugins-bad/ext/opencv/meson.build#L74
+    substituteInPlace ext/opencv/meson.build \
+      --replace '< 4.7.0' '< 5.0.0'
   '';
 
   # This package has some `_("string literal")` string formats

From e30a8ca06cadad2e5aaa9ce25dbf10c2fac55c4c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Dec 2022 22:08:05 +0100
Subject: [PATCH 202/953] python3Packages.sqlalchemy: 1.4.41 -> 1.4.45

https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_42
https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_43
https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_44
https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_45
---
 pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 7c842352eb02..989d0380f7a4 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.4.41"; # TODO: check python3Packages.fastapi when updating to >= 1.4.42
+  version = "1.4.45"; # TODO: check python3Packages.fastapi when updating to >= 1.4.42
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ApL3DReX48VOhi5vMK5HQBRki8nHI+FKL9pzCtsKl5E=";
+    hash = "sha256-/WmFCGAJOj9p/v4KtW0EHt/f4YUQtT2aLq7LovFfp5U=";
   };
 
   nativeBuildInputs = lib.optionals (!isPyPy) [

From c1bd736beed16f5bc7e0827d4d40ea255d15b973 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Dec 2022 22:09:20 +0100
Subject: [PATCH 203/953] python3Packages.databases: 0.6.2 -> 0.7.0

Diff: https://github.com/encode/databases/compare/refs/tags/0.6.2...0.7.0

Changelog: https://github.com/encode/databases/releases/tag/0.7.0
---
 pkgs/development/python-modules/databases/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix
index f5edffd3e442..78311fb6e30f 100644
--- a/pkgs/development/python-modules/databases/default.nix
+++ b/pkgs/development/python-modules/databases/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "databases";
-  version = "0.6.2";
+  version = "0.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-3zgHfYGiO2xWualLa4h8A85qjC32ILadw/47Ul1GTmM=";
+    hash = "sha256-3RRHXkM8/GoIcO6Y1EZGbnp/X5gzYkW/PV4bzGay6ZI=";
   };
 
   propagatedBuildInputs = [

From 0201a0546956c4d55600ddd70481af6f85c4ce4b Mon Sep 17 00:00:00 2001
From: Maxine Aubrey <maxeaubrey@gmail.com>
Date: Thu, 29 Dec 2022 00:16:01 +0100
Subject: [PATCH 204/953] iwd: 2.0 -> 2.1

---
 pkgs/os-specific/linux/iwd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index b3895c286c56..54a9a53a0367 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = version;
-    sha256 = "sha256-9eQ2fW3ha69ngugYonbYdqrpERqt8aM0Ed4HM0CrmUU=";
+    sha256 = "sha256-Aq038SG8vuxCA6mYOP5I6VWCUty5vgdbpAa9J+bIfZM=";
   };
 
   outputs = [ "out" "man" "doc" ]

From fa3feb9f655e7f417bdd2fc83f5bf43085a64597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 29 May 2022 03:35:59 +0000
Subject: [PATCH 205/953] python3Packages.pythonImportsCheck: set $PYTHONPATH

Don't rely on the installPhase doing so.
---
 pkgs/development/interpreters/python/hooks/default.nix          | 2 +-
 .../interpreters/python/hooks/python-imports-check-hook.sh      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index d30876aa9fde..08dc3ea61ab7 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -93,7 +93,7 @@ in {
     makePythonHook {
       name = "python-imports-check-hook.sh";
       substitutions = {
-        inherit pythonCheckInterpreter;
+        inherit pythonCheckInterpreter pythonSitePackages;
       };
     } ./python-imports-check-hook.sh) {};
 
diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
index f8ca84cd573a..7172ac498545 100644
--- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
@@ -6,6 +6,7 @@ pythonImportsCheckPhase () {
 
     if [ -n "$pythonImportsCheck" ]; then
         echo "Check whether the following modules can be imported: $pythonImportsCheck"
+        export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"
         ( cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" )
     fi
 }

From 72c7d7c27ea766ebe2ba6447ea9686c73169b6b8 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 29 Dec 2022 15:26:58 +0200
Subject: [PATCH 206/953] opencv4: add reverse deps to tests

---
 pkgs/development/libraries/opencv/4.x.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 55889ccab07b..2c676e008f00 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -14,6 +14,7 @@
 , config
 , ocl-icd
 , buildPackages
+, qimgv
 
 , enableJPEG ? true
 , libjpeg
@@ -365,7 +366,12 @@ stdenv.mkDerivation {
     popd
   '';
 
-  passthru = lib.optionalAttrs enablePython { pythonPath = [ ]; };
+  passthru = {
+    tests = {
+      inherit qimgv;
+      inherit (gst_all_1) gst-plugins-bad;
+    } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; };
+  } // lib.optionalAttrs enablePython { pythonPath = [ ]; };
 
   meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";

From c2eda91e012577ef86faa358ad0940111357c1a0 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Thu, 29 Dec 2022 23:48:40 +0100
Subject: [PATCH 207/953] libpng: 1.6.37 -> 1.6.39

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 2293dfc00a0c..b757d20b71d5 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,20 +3,20 @@
 assert zlib != null;
 
 let
-  patchVersion = "1.6.37";
+  patchVersion = "1.6.39";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
-    sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2";
+    hash = "sha256-SsS26roAzeISxI22XLlCkQc/68oixcef2ocJFQLoDP0=";
   };
   whenPatched = lib.optionalString apngSupport;
 
 in stdenv.mkDerivation rec {
   pname = "libpng" + whenPatched "-apng";
-  version = "1.6.37";
+  version = "1.6.39";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
-    sha256 = "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh";
+    hash = "sha256-H0aWznC07l+F8eFiPcEimyEAKfpLeu5XPfPiunsDaTc=";
   };
   postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
 
@@ -32,8 +32,9 @@ in stdenv.mkDerivation rec {
   meta = with lib; {
     description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
     homepage = "http://www.libpng.org/pub/png/libpng.html";
+    changelog = "https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES";
     license = licenses.libpng2;
     platforms = platforms.all;
-    maintainers = [ maintainers.vcunat ];
+    maintainers = with maintainers; [ vcunat ];
   };
 }

From 3f5d99e914f7878c124aa97bf2fe6bda27fbe802 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 30 Dec 2022 00:49:33 +0000
Subject: [PATCH 208/953] gdb: backport readline-8.2 fix

Without the change gdb fails build on `readline-8.2` as:

    ../../gdb/completer.c: In function 'char* gdb_completion_word_break_characters_throw()':
    ../../gdb/completer.c:2014:10: error: invalid conversion from 'const char*' to 'char*' [-fpermissive]
     2014 |   return rl_completer_word_break_characters;
          |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          |          |
          |          const char*
---
 pkgs/development/tools/misc/gdb/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 4486636a9f50..53b02cc16ea8 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, targetPackages
 
 # Build time
-, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
+, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
 
 # Run time
 , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight
@@ -47,6 +47,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./debug-info-from-env.patch
+    # backport readline=8.2 support
+    (fetchpatch {
+      name = "readline-8.2.patch";
+      url = "https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=1add37b567a7dee39d99f37b37802034c3fce9c4";
+      hash = "sha256-KmQXylPAWNGXF8wtXCCArhUzHi+GUY8ii2Xpx8R08jE=";
+    })
   ] ++ lib.optionals stdenv.isDarwin [
     ./darwin-target-match.patch
   # Does not nave to be conditional. We apply it conditionally

From 90af686ddb32dd565244ef53ce3a8d5e5cbae1be Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 30 Dec 2022 06:40:28 +0100
Subject: [PATCH 209/953] xorgcffiles: add aarch64-darwin support

---
 pkgs/servers/x11/xorg/overrides.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ddd5acad7a1a..b6ad8670ec6c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1067,6 +1067,13 @@ self: super:
   });
 
   xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: {
+    patches = [
+      (fetchpatch {
+        name = "add-aarch64-darwin-support.patch";
+        url = "https://gitlab.freedesktop.org/xorg/util/cf/-/commit/8d88c559b177e832b581c8ac0aa383b6cf79e0d0.patch";
+        sha256 = "sha256-wCijdmlUtVgOh9Rp/LJrg1ObYm4OPTke5Xwu0xC0ap4=";
+      })
+    ];
     postInstall = lib.optionalString stdenv.isDarwin ''
       substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
     '';

From 34878aa66d8346b5e84c6904a0445d44bb75ea79 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:54:55 +0100
Subject: [PATCH 210/953] oneko: unbreak on aarch64-darwin

---
 pkgs/applications/misc/oneko/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index e0af54b1e4e6..17a94511e3fc 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -35,7 +35,5 @@ stdenv.mkDerivation rec {
     license = with licenses; [ publicDomain ];
     maintainers = with maintainers; [ xaverdh irenes ];
     platforms = platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From e70ea256f42f71f9ca7e5376024e80eb469ad6c3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:01 +0100
Subject: [PATCH 211/953] xearth: unbreak on aarch64-darwin

---
 pkgs/applications/science/astronomy/xearth/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index abcedf7ee7b9..bd92ae01ebb1 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.mafo ];
     license = "xearth";
     platforms=platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 
 }

From 42e4d047d12f09bb6249b0385825a7e91f6b08ec Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:07 +0100
Subject: [PATCH 212/953] xskat: unbreak on aarch64-darwin

---
 pkgs/games/xskat/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix
index f8c5f539f7d2..74c2be586ceb 100644
--- a/pkgs/games/xskat/default.nix
+++ b/pkgs/games/xskat/default.nix
@@ -26,7 +26,5 @@ stdenv.mkDerivation rec {
     license = licenses.free;
     longDescription = "Play the german card game Skat against the AI or over IRC.";
     homepage = "http://www.xskat.de/";
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From bdaff9db296aac8dc70448b921873ce2f2bf82e4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:14 +0100
Subject: [PATCH 213/953] xsok: unbreak on aarch64-darwin

---
 pkgs/games/xsok/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
index 80de216e8639..bb749b57d01e 100644
--- a/pkgs/games/xsok/default.nix
+++ b/pkgs/games/xsok/default.nix
@@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
     homepage = "https://tracker.debian.org/pkg/xsok";
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From 064207b723a0f0e2ccb2fb89a4326e672133905f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:29 +0100
Subject: [PATCH 214/953] x11_ssh_askpass: unbreak on aarch64-darwin

---
 pkgs/tools/networking/x11-ssh-askpass/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix
index 2dc17936abc1..049154d64413 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix
@@ -30,7 +30,5 @@ stdenv.mkDerivation rec {
     description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
     license = licenses.mit;
     platforms = platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From c730732bdafbfc931bfbf6a8cf4cdd5ea9d8dd45 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 29 Dec 2022 08:52:16 +1000
Subject: [PATCH 215/953] sqlite: 3.40.0 -> 3.40.1

https://www.sqlite.org/releaselog/3_40_1.html
---
 .../3.39.4-autoconf-CVE-2022-46908.patch      | 25 -------------------
 pkgs/development/libraries/sqlite/default.nix |  8 ++----
 pkgs/development/libraries/sqlite/tools.nix   |  4 +--
 3 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch

diff --git a/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch b/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch
deleted file mode 100644
index 27ab2af2014a..000000000000
--- a/pkgs/development/libraries/sqlite/3.39.4-autoconf-CVE-2022-46908.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-adapted for preprocessed source files from upstream
-https://sqlite.org/src/vpatch?from=a60e56627fc0ef88&to=cefc032473ac5ad2
-
-diff --git a/shell.c b/shell.c
-index e66ae08..d423278 100644
---- a/shell.c
-+++ b/shell.c
-@@ -12921,7 +12921,7 @@ static int safeModeAuth(
-     "zipfile",
-     "zipfile_cds",
-   };
--  UNUSED_PARAMETER(zA2);
-+  UNUSED_PARAMETER(zA1);
-   UNUSED_PARAMETER(zA3);
-   UNUSED_PARAMETER(zA4);
-   switch( op ){
-@@ -12936,7 +12936,7 @@ static int safeModeAuth(
-     case SQLITE_FUNCTION: {
-       int i;
-       for(i=0; i<ArraySize(azProhibitedFunctions); i++){
--        if( sqlite3_stricmp(zA1, azProhibitedFunctions[i])==0 ){
-+        if( sqlite3_stricmp(zA2, azProhibitedFunctions[i])==0 ){
-           failIfSafeMode(p, "cannot use the %s() function in safe mode",
-                          azProhibitedFunctions[i]);
-         }
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 3f4081acc044..eb27c8c8b9eb 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -17,19 +17,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite${optionalString interactive "-interactive"}";
-  version = "3.40.0";
+  version = "3.40.1";
 
   # nixpkgs-update: no auto update
   # NB! Make sure to update ./tools.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "sha256-AzNVIHbScAx1NSJW6Rx4v1zWJJFYm6DGmu0KgYaJgOc=";
+    sha256 = "sha256-LF3qIH+lCNdlrx72ILY33LBlcq+m8B8IFb1bv4ZLM9k=";
   };
 
-  patches = [
-    ./3.39.4-autoconf-CVE-2022-46908.patch
-  ];
-
   outputs = [ "bin" "dev" "out" ];
   separateDebugInfo = stdenv.isLinux;
 
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index 1b7fca210faf..bb0a1a7d7393 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -4,12 +4,12 @@ let
   archiveVersion = import ./archive-version.nix lib;
   mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec {
     inherit pname;
-    version = "3.40.0";
+    version = "3.40.1";
 
     # nixpkgs-update: no auto update
     src = assert version == sqlite.version; fetchurl {
       url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip";
-      sha256 = "sha256-SFUIKBQgUSk+F5/8aoUg9vv9guHNyni5N5L3ZsyJuOI=";
+      sha256 = "sha256-UGQSaqUNsgw1V4thK1bDEpQlwFBu1NFhDvpKDwG9+NA=";
     };
 
     nativeBuildInputs = [ unzip ];

From 05c8b62e27509f4808036ac8552e83869affc0de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Dec 2022 12:14:27 +0000
Subject: [PATCH 216/953] orc: 0.4.32 -> 0.4.33

---
 pkgs/development/compilers/orc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 5ea72781e41f..a752c994bbf5 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -5,11 +5,11 @@
   inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "orc";
-  version = "0.4.32";
+  version = "0.4.33";
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz";
-    sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6";
+    sha256 = "sha256-hE5tfbgIb3k/V2GNPUto0p2ZsWA05xQw3zwhz9PDVCo=";
   };
 
   postPatch = lib.optionalString stdenv.isAarch32 ''

From 1e1b7c77654d7b907000b7bb73ad3e674aaa0539 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 1 Jan 2023 14:01:53 +0000
Subject: [PATCH 217/953] orc: add some key reverse-dependencies to
 passthru.tests

---
 pkgs/development/compilers/orc/default.nix | 23 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index a752c994bbf5..771830d8b6ac 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,6 +1,19 @@
-{ lib, stdenv, fetchurl, meson, ninja
-, gtk-doc ? null, file, docbook_xsl
+{ lib
+, stdenv
+, fetchurl
+, meson
+, ninja
+, file
+, docbook_xsl
+, gtk-doc ? null
 , buildDevDoc ? gtk-doc != null
+
+# for passthru.tests
+, gnuradio
+, gst_all_1
+, qt6
+, vips
+
 }: let
   inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
@@ -35,6 +48,12 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru.tests = {
+    inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly;
+    inherit gnuradio vips;
+    qt6-qtmultimedia = qt6.qtmultimedia;
+  };
+
   meta = with lib; {
     description = "The Oil Runtime Compiler";
     homepage = "https://gstreamer.freedesktop.org/projects/orc.html";

From 3cd6cd412043a513c04259d32468259332ff95d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 1 Jan 2023 17:08:31 +0100
Subject: [PATCH 218/953] mesa: 22.3.1 -> 22.3.2

https://docs.mesa3d.org/relnotes/22.3.2.html
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index ab9153f8af15..ea290ed03317 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -41,7 +41,7 @@ with lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "22.3.1";
+  version = "22.3.2";
   branch  = versions.major version;
 
   withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm;
@@ -64,7 +64,7 @@ self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "sha256-PJzWEcCFnTB6ugZZgzOGq9ykyGFi08J1ulvmLRbPMes=";
+    sha256 = "c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b";
   };
 
   # TODO:

From 624a0bc4cd19722f947a0ada959655fa0463ffaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 1 Jan 2023 22:40:07 +0100
Subject: [PATCH 219/953] python3Packages.psutil: disable a problematic test

Example: https://hydra.nixos.org/build/203686536
Also we encountered it on 22.11 recently: b12350f5007
---
 pkgs/development/python-modules/psutil/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 01f48e627bd2..b0be35e0c7ba 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -52,6 +52,7 @@ buildPythonPackage rec {
     "disk_io_counters"
     "sensors_battery"
     "user"
+    "test_disk_partitions" # problematic on Hydra's Linux builders, apparently
   ];
 
   pythonImportsCheck = [

From 4d4af86db63955be68118f1507ce51e576b88016 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 30 Dec 2022 22:12:44 +0100
Subject: [PATCH 220/953] libtiff: 4.4 -> 4.5

---
 .../development/libraries/libtiff/default.nix | 55 ++++++-------------
 .../libraries/libtiff/headers.patch           |  7 ++-
 .../libraries/libtiff/rename-version.patch    | 12 ++--
 3 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index ffed49235286..ac52349a3f13 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv
-, fetchurl
-, fetchpatch
+, fetchFromGitLab
+, nix-update-script
 
 , autoreconfHook
 , pkg-config
+, sphinx
 
 , libdeflate
 , libjpeg
@@ -23,11 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libtiff";
-  version = "4.4.0";
+  version = "4.5.0";
 
-  src = fetchurl {
-    url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
-    sha256 = "1vdbk3sc497c58kxmp02irl6nqkfm9rjs3br7g59m59qfnrj6wli";
+  src = fetchFromGitLab {
+    owner = "libtiff";
+    repo = "libtiff";
+    rev = "v${version}";
+    hash = "sha256-KG6rB940JMjFUTAgtkzg+Zh75gylPY6Q7/4gEbL0Hcs=";
   };
 
   patches = [
@@ -36,32 +39,6 @@ stdenv.mkDerivation rec {
     # libc++abi 11 has an `#include <version>`, this picks up files name
     # `version` in the project's include paths
     ./rename-version.patch
-    (fetchpatch {
-      name = "CVE-2022-34526.patch";
-      url = "https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990.patch";
-      sha256 = "sha256-faKsdJjvQwNdkAKjYm4vubvZvnULt9zz4l53zBFr67s=";
-    })
-    (fetchpatch {
-      name = "CVE-2022-2953.patch";
-      url = "https://gitlab.com/libtiff/libtiff/-/commit/48d6ece8389b01129e7d357f0985c8f938ce3da3.patch";
-      sha256 = "sha256-h9hulV+dnsUt/2Rsk4C1AKdULkvweM2ypIJXYQ3BqQU=";
-    })
-    (fetchpatch {
-      name = "CVE-2022-3626.CVE-2022-3627.CVE-2022-3597.patch";
-      url = "https://gitlab.com/libtiff/libtiff/-/commit/236b7191f04c60d09ee836ae13b50f812c841047.patch";
-      excludes = [ "doc/tools/tiffcrop.rst" ];
-      sha256 = "sha256-L2EMmmfMM4oEYeLapO93wvNS+HlO0yXsKxijXH+Wuas=";
-    })
-    (fetchpatch {
-      name = "CVE-2022-3598.CVE-2022-3570.patch";
-      url = "https://gitlab.com/libtiff/libtiff/-/commit/cfbb883bf6ea7bedcb04177cc4e52d304522fdff.patch";
-      sha256 = "sha256-SLq2+JaDEUOPZ5mY4GPB6uwhQOG5cD4qyL5o9i8CVVs=";
-    })
-    (fetchpatch {
-      name = "CVE-2022-3970.patch";
-      url = "https://gitlab.com/libtiff/libtiff/-/commit/227500897dfb07fb7d27f7aa570050e62617e3be.patch";
-      sha256 = "sha256-pgItgS+UhMjoSjkDJH5y7iGFZ+yxWKqlL7BdT2mFcH0=";
-    })
   ];
 
   postPatch = ''
@@ -71,14 +48,15 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
 
   postFixup = ''
-    moveToOutput include/tif_dir.h $dev_private
     moveToOutput include/tif_config.h $dev_private
+    moveToOutput include/tif_dir.h $dev_private
+    moveToOutput include/tif_hash_set.h $dev_private
     moveToOutput include/tiffiop.h $dev_private
   '';
 
   # If you want to change to a different build system, please make
   # sure cross-compilation works first!
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  nativeBuildInputs = [ autoreconfHook pkg-config sphinx ];
 
   propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
 
@@ -88,9 +66,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  passthru.tests = {
-    inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib;
-    inherit (python3Packages) pillow imread;
+  passthru = {
+    tests = {
+      inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib;
+      inherit (python3Packages) pillow imread;
+    };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch
index e1c681502b33..e0ef9f3478a6 100644
--- a/pkgs/development/libraries/libtiff/headers.patch
+++ b/pkgs/development/libraries/libtiff/headers.patch
@@ -2,15 +2,16 @@ diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am
 index 44522b62..d66e5948 100644
 --- i/libtiff/Makefile.am
 +++ w/libtiff/Makefile.am
-@@ -36,8 +36,11 @@ EXTRA_DIST = \
+@@ -36,8 +36,12 @@ EXTRA_DIST = \
  	tiffconf.h.cmake.in
- 
+
  libtiffinclude_HEADERS = \
 +	tif_config.h \
 +	tif_dir.h \
++	tif_hash_set.h \
  	tiff.h \
  	tiffio.h \
 +	tiffiop.h \
  	tiffvers.h
- 
+
  if HAVE_CXX
diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch
index 30601c0f04ee..ddd33ad49045 100644
--- a/pkgs/development/libraries/libtiff/rename-version.patch
+++ b/pkgs/development/libraries/libtiff/rename-version.patch
@@ -6,15 +6,15 @@
  	TODO \
 -	VERSION
 +	VERSION.txt
- 
+
  EXTRA_DIST = \
  	cmake \
-@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test man html
- 
+@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc
+
  release:
- 	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
+	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
 -	(rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION)
 +	(rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt)
- 	(rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)
- 
+	(rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)
+
  pkgconfigdir = $(libdir)/pkgconfig

From e13ee020d26208f39d1eaead83c5de148e277c89 Mon Sep 17 00:00:00 2001
From: SnIcK <ido.samuelson@gmail.com>
Date: Thu, 29 Dec 2022 10:21:23 -0600
Subject: [PATCH 221/953] fxload: updated to newer version from libusb1

---
 pkgs/os-specific/linux/fxload/default.nix | 46 ++++++++++-------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix
index 8c1a778ec8bf..3c5443f3432f 100644
--- a/pkgs/os-specific/linux/fxload/default.nix
+++ b/pkgs/os-specific/linux/fxload/default.nix
@@ -1,37 +1,31 @@
-{lib, stdenv, fetchurl}:
+{ lib
+, stdenv
+, libusb1
+}:
 
 stdenv.mkDerivation rec {
   pname = "fxload";
-  version = "2002.04.11";
+  version = libusb1.version;
+  dontUnpack = true;
+  dontBuild = true;
+  dontConfigure = true;
+  dontInstall = true;
+  dontPatch = true;
+  dontPatchELF = true;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/linux-hotplug/fxload-${lib.replaceStrings ["."] ["_"] version}.tar.gz";
-    sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m";
-  };
-
-  patches = [
-    # Will be needed after linux-headers is updated to >= 2.6.21.
-    (fetchurl {
-      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.21.patch?rev=1.1";
-      sha256 = "0ij0c8nr1rbyl5wmyv1cklhkxglvsqz32h21cjw4bjm151kgmk7p";
-    })
-  ];
-
-  preBuild = ''
-    substituteInPlace Makefile --replace /usr /
-    makeFlagsArray=(INSTALL=install prefix=$out)
-  '';
-
-  preInstall = ''
+  # fxload binary exist inside the `examples/bin` directory of `libusb1`
+  postFixup = ''
     mkdir -p $out/sbin
-    mkdir -p $out/share/man/man8
-    mkdir -p $out/share/usb
+    ln -s ${passthru.libusb}/examples/bin/fxload $out/sbin/fxload
   '';
 
+  passthru.libusb = libusb1.override { withExamples = true; };
+
   meta = with lib; {
-    homepage = "http://linux-hotplug.sourceforge.net/?selected=usb";
-    description = "Tool to upload firmware to Cypress EZ-USB microcontrollers";
-    license = licenses.gpl2;
+    homepage = "https://github.com/libusb/libusb";
+    description = "Tool to upload firmware to into an21, fx, fx2, fx2lp and fx3 ez-usb devices";
+    license = licenses.gpl2Only;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ realsnick ];
   };
 }

From 277a523ddaedd38e0017754b8425e12ebbabc409 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 3 Jan 2023 18:26:48 +0200
Subject: [PATCH 222/953] xorg: add wrapWithXFileSearchPathHook

supersedes PR 70239

Description from that PR

Make xorg apps look as intended. Most notable change: xmag color picker is usable now.

Before this commit, only two apps had properly configured resource paths: bitmap and xcalc. This commit automates and generalizes it to the rest of xorg.* apps.

xorg.bitmap: bin/bitmap-color is no longer installed. If you would like bitmap to be viewable in color, please refer to man 1 bitmap, selection COLORS. The described method is also applied to some other affected apps.
---
 pkgs/servers/x11/xorg/default.nix             | 64 +++++++++----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  6 +-
 pkgs/servers/x11/xorg/overrides.nix           | 45 ++++++-------
 3 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 59d66abf994b..7cc5dfa6895d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -38,7 +38,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
+  bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "bitmap";
     version = "1.0.9";
     builder = ./builder.sh;
@@ -48,13 +48,13 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
+  editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "editres";
     version = "1.0.7";
     builder = ./builder.sh;
@@ -64,7 +64,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -1578,7 +1578,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation {
+  oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "oclock";
     version = "1.0.4";
     builder = ./builder.sh;
@@ -1588,7 +1588,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libxkbfile libX11 libXext libXmu libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -1690,7 +1690,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation {
+  viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "viewres";
     version = "1.0.5";
     builder = ./builder.sh;
@@ -1700,7 +1700,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libXaw libXmu libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -1770,7 +1770,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation {
+  xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xcalc";
     version = "1.1.0";
     builder = ./builder.sh;
@@ -1780,7 +1780,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw xorgproto libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -1914,7 +1914,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
+  xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xclock";
     version = "1.0.9";
     builder = ./builder.sh;
@@ -1924,7 +1924,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -1962,7 +1962,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
+  xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xconsole";
     version = "1.0.7";
     builder = ./builder.sh;
@@ -1972,7 +1972,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -2010,7 +2010,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
+  xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xdm";
     version = "1.1.12";
     builder = ./builder.sh;
@@ -2020,7 +2020,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -2906,7 +2906,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation {
+  xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xfd";
     version = "1.1.3";
     builder = ./builder.sh;
@@ -2916,13 +2916,13 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config gettext ];
+    nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ];
     buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
+  xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xfontsel";
     version = "1.0.6";
     builder = ./builder.sh;
@@ -2932,7 +2932,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw libXmu libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -2986,7 +2986,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
+  xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xgc";
     version = "1.0.5";
     builder = ./builder.sh;
@@ -2996,7 +2996,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libXaw libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -3146,7 +3146,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation {
+  xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xload";
     version = "1.1.3";
     builder = ./builder.sh;
@@ -3156,7 +3156,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config gettext ];
+    nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -3210,7 +3210,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
+  xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xmag";
     version = "1.0.6";
     builder = ./builder.sh;
@@ -3220,13 +3220,13 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libX11 libXaw libXmu libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
+  xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xmessage";
     version = "1.0.5";
     builder = ./builder.sh;
@@ -3236,7 +3236,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libXaw libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -3258,7 +3258,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
+  xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xmore";
     version = "1.0.3";
     builder = ./builder.sh;
@@ -3268,7 +3268,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libXaw libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
@@ -3466,7 +3466,7 @@ self: with self; {
   }) {};
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation {
+  xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation {
     pname = "xsm";
     version = "1.0.4";
     builder = ./builder.sh;
@@ -3476,7 +3476,7 @@ self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
-    nativeBuildInputs = [ pkg-config ];
+    nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
     buildInputs = [ libICE libSM libX11 libXaw libXt ];
     meta.platforms = lib.platforms.unix;
   }) {};
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 987895ab6e1d..a3751bf16f00 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -23,7 +23,7 @@ my %pcMap;
 my %extraAttrs;
 
 
-my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja" );
+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja", "wrapWithXFileSearchPathHook" );
 $pcMap{$_} = $_ foreach @missingPCs;
 $pcMap{"freetype2"} = "freetype";
 $pcMap{"libpng12"} = "libpng";
@@ -195,6 +195,10 @@ while (<>) {
         push @{$extraAttrs{$pkg}}, "postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`\$PKG_CONFIG' '';";
     }
 
+    if (@@ = glob("$tmpDir/*/app-defaults/")) {
+        push @nativeRequires, "wrapWithXFileSearchPathHook";
+    }
+
     sub process {
         my $requires = shift;
         my $s = shift;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8b3129f5ae21..c86cbc137dd1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,4 +1,5 @@
 { abiCompat ? null,
+  callPackage,
   lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
   automake, autoconf, gettext, libiconv, libtool, intltool,
   freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
@@ -22,25 +23,28 @@ let
 in
 self: super:
 {
+  wrapWithXFileSearchPathHook = callPackage ({ makeBinaryWrapper, makeSetupHook, writeScript }: makeSetupHook {
+      name = "wrapWithXFileSearchPathHook";
+      deps = [ makeBinaryWrapper ];
+    } (writeScript "wrapWithXFileSearchPathHook.sh" ''
+      wrapWithXFileSearchPath() {
+        paths=(
+          "$out/share/X11/%T/%N"
+          "$out/include/X11/%T/%N"
+          "${xorg.xbitmaps}/include/X11/%T/%N"
+        )
+        for exe in $out/bin/*; do
+          wrapProgram "$exe" \
+            --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
+        done
+      }
+      postInstallHooks+=(wrapWithXFileSearchPath)
+  '')) {};
+
   bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
     buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
   });
 
-  bitmap = super.bitmap.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
-    postInstall = ''
-      paths=(
-        "$out/share/X11/%T/%N"
-        "$out/include/X11/%T/%N"
-        "${xorg.xbitmaps}/include/X11/%T/%N"
-      )
-      wrapProgram "$out/bin/bitmap" \
-        --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
-      makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \
-        --suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color"
-    '';
-  });
-
   editres = super.editres.overrideAttrs (attrs: {
     hardeningDisable = [ "format" ];
   });
@@ -1091,17 +1095,6 @@ self: super:
     '';
   });
 
-  xcalc = super.xcalc.overrideAttrs (attrs: {
-    configureFlags = attrs.configureFlags or [] ++ [
-      "--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
-    ];
-    nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ];
-    postInstall = ''
-      wrapProgram $out/bin/xcalc \
-        --set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults
-    '';
-  });
-
   # convert Type1 vector fonts to OpenType fonts
   fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: {
     nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ];

From 659574008e1f07330b8f055927c2b538e2a9b383 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 3 Jan 2023 19:09:51 +0200
Subject: [PATCH 223/953] xorg.{libFS,libWindowsWM}: fix cross

---
 pkgs/servers/x11/xorg/overrides.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c86cbc137dd1..6e9dd733e1b0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -144,6 +144,14 @@ self: super:
     configureFlags = attrs.configureFlags or []
       ++ malloc0ReturnsNullCrossFlag;
   });
+  libFS = super.libFS.overrideAttrs (attrs: {
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
+  });
+  libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
+  });
   xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or []
       ++ malloc0ReturnsNullCrossFlag;

From 68ed486d30487599d7ef85feec2c838036ce77cc Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 3 Jan 2023 19:31:00 +0200
Subject: [PATCH 224/953] xorg: remove unnecessary overrides

---
 pkgs/servers/x11/xorg/overrides.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 6e9dd733e1b0..c8bd8f55428c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,7 +1,7 @@
 { abiCompat ? null,
   callPackage,
   lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
-  automake, autoconf, gettext, libiconv, libtool, intltool,
+  automake, autoconf, libiconv, libtool, intltool,
   freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
   libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
   mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
@@ -324,11 +324,6 @@ self: super:
   });
 
   libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
-    name = "libxshmfence-1.3";
-    src = fetchurl {
-      url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2";
-      sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q";
-    };
     outputs = [ "out" "dev" ]; # mainly to avoid propagation
   });
 
@@ -717,10 +712,6 @@ self: super:
       postPatch   = with lib; concatStrings (mapAttrsToList patchIn layouts);
     });
 
-  xload = super.xload.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ gettext ];
-  });
-
   xlsfonts = super.xlsfonts.overrideAttrs (attrs: {
     meta = attrs.meta // { license = lib.licenses.mit; };
   });
@@ -1035,7 +1026,7 @@ self: super:
       rev = "31486f40f8e8f8923ca0799aea84b58799754564";
       sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM=";
     };
-    buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXfixes xorg.libXv xorg.pixman xorg.utilmacros ];
+    buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXv xorg.pixman xorg.utilmacros ];
     nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ];
     configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
 

From 050a94b3df68f29ef6fc48706b7796e45bab5c30 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 27 Dec 2022 21:14:09 +0000
Subject: [PATCH 225/953] xorg.xauth: 1.1.0 -> 1.1.2

Changes:
- 1.1.1: https://lists.x.org/archives/xorg-announce/2021-November/003118.html
- 1.1.2: https://lists.x.org/archives/xorg-announce/2022-April/003158.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7cc5dfa6895d..c9ad8d95da5f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1724,11 +1724,11 @@ self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation {
     pname = "xauth";
-    version = "1.1";
+    version = "1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2";
-      sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd";
+      url = "mirror://xorg/individual/app/xauth-1.1.2.tar.xz";
+      sha256 = "0072ivzn4z59ysanz838nh8s4mcmdsx6q9xkvlfysv2k37ynmfkq";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e6a9a3168897..0264f7185956 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -24,7 +24,7 @@ mirror://xorg/individual/app/transset-1.0.2.tar.bz2
 mirror://xorg/individual/app/twm-1.0.10.tar.bz2
 mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
-mirror://xorg/individual/app/xauth-1.1.tar.bz2
+mirror://xorg/individual/app/xauth-1.1.2.tar.xz
 mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2
 mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
 mirror://xorg/individual/app/xclock-1.0.9.tar.bz2

From e349e79866e9d32091e0f2e03ac8f0b01fbb656a Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 3 Jan 2023 19:53:08 +0200
Subject: [PATCH 226/953] xorg.xf86videomga: 2.0.0 -> 2.0.1

includes a cross fix

https://lists.x.org/archives/xorg-announce/2022-July/003184.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c9ad8d95da5f..0dc9e3c801ee 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2460,11 +2460,11 @@ self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
     pname = "xf86-video-mga";
-    version = "2.0.0";
+    version = "2.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2";
-      sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296";
+      url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz";
+      sha256 = "1aq3aqh2yg09gy864kkshfx5pjl5w05jdz97bx5bnrbrhdq3p8r7";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 0264f7185956..c1b545e35b6b 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -101,7 +101,7 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
 https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2

From c42e7b71d294000d0c5d84a83a09590dc5410823 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 3 Jan 2023 19:58:22 +0200
Subject: [PATCH 227/953] xorg.xf86videor128: 6.11.0 -> 6.12.1

includes a cross fix

- 6.12.0: https://lists.x.org/archives/xorg-announce/2018-July/002909.html
- 6.12.1: https://lists.x.org/archives/xorg-announce/2022-December/003275.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0dc9e3c801ee..ed9efb690fa8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2588,11 +2588,11 @@ self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
     pname = "xf86-video-r128";
-    version = "6.11.0";
+    version = "6.12.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2";
-      sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav";
+      url = "mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz";
+      sha256 = "0hf7h54wxgs8njavp0kgadjq1787fhbd588j7pj685hz2wmkq0kx";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c1b545e35b6b..608b66b093ea 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -109,7 +109,7 @@ mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2
 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2

From 82ae2e8f068ee5b336c108816c5ace316b295ae0 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <serenity@kaction.cc>
Date: Tue, 3 Jan 2023 20:23:31 -0500
Subject: [PATCH 228/953] python3.pkgs.sphinxHook: fix co-installability of
 generated documentation

Include full $name of the derivation into docdir, so documentation for
python package "foo" is installed into $out/share/doc/python3.10-foo-1.2.3
instead of just $out/share/doc/foo, where it may conflict with some
other package named "foo" and not-coinstallable with different
versions of the same python package.

Change from $name to $pname was introduced in [1ee5fca], probably as
unindented side-effect of adding support for formats other than html.
---
 pkgs/development/interpreters/python/hooks/sphinx-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh
index ae386ca859f4..ca67fa9beabf 100644
--- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh
@@ -57,7 +57,7 @@ installSphinxPhase() {
 
         else
             # shellcheck disable=2154
-            docdir="${doc:-$out}/share/doc/${pname}"
+            docdir="${doc:-$out}/share/doc/${name}"
 
             mkdir -p "$docdir"
 

From b066191d42b1a4313c34ee4d52e7916b98c6482d Mon Sep 17 00:00:00 2001
From: Marco Rebhan <me@dblsaiko.net>
Date: Tue, 20 Dec 2022 21:33:15 +0100
Subject: [PATCH 229/953] harfbuzz: 5.3.1 -> 6.0.0

https://github.com/harfbuzz/harfbuzz/releases/tag/6.0.0
---
 pkgs/development/libraries/harfbuzz/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 977d39ba3568..9da8e8837bc1 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -32,23 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "5.3.1";
+  version = "6.0.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz";
-    sha256 = "sha256-Smzgl7dagSH6zEuoO1sIO/7GV/RbADzVo0JPKua0Q00=";
+    sha256 = "HRAQoXUdB21SkeQzwThQKnlNZ5p0mNEmjuIeLUoUDrQ=";
   };
 
-  patches = [
-    # Pick upstream patch for exported symbol test failing on darwin
-    # https://github.com/harfbuzz/harfbuzz/issues/3850
-    (fetchpatch {
-      name = "harfbuzz-fix-check-symbol-tests-lto-and-darwin.patch";
-      url = "https://github.com/harfbuzz/harfbuzz/commit/b0b7a65388da25ae3fa01e969ad6abc67eed4f49.patch";
-      sha256 = "0my064r88pikw6q70hbgf6hwfkw544b9f5ai73qhn2a3c83jqn06";
-    })
-  ];
-
   postPatch = ''
     patchShebangs src/*.py test
   '' + lib.optionalString stdenv.isDarwin ''

From 4835c7a74c1419837263c6c78fca10bb52138929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 4 Jan 2023 17:50:06 +0100
Subject: [PATCH 230/953] glibc, python3Packages.twisted: resolve temporary
 workaround

It certainly seems better to patch the twisted test than glibc.
---
 pkgs/development/libraries/glibc/common.nix   |  3 -
 .../libraries/glibc/revert-mktime.patch       | 73 -------------------
 .../python-modules/twisted/default.nix        |  7 ++
 3 files changed, 7 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/revert-mktime.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 889ca7bf48fd..c9bc557eec19 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -69,9 +69,6 @@ stdenv.mkDerivation ({
        */
       ./2.35-master.patch.gz
 
-      /* Revert this patch contained in the previous bundle.  For now, until we know more. */
-      ./revert-mktime.patch
-
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch
 
diff --git a/pkgs/development/libraries/glibc/revert-mktime.patch b/pkgs/development/libraries/glibc/revert-mktime.patch
deleted file mode 100644
index d691213e8657..000000000000
--- a/pkgs/development/libraries/glibc/revert-mktime.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit f6d4c1ac648c4ff8baad94500df0bb13108a4f79
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Thu Sep 8 20:08:32 2022 -0500
-
-    REVERT: mktime: improve heuristic for ca-1986 Indiana DST
-    
-    This patch syncs mktime.c from Gnulib, fixing a
-    problem reported by Mark Krenz <https://bugs.gnu.org/48085>,
-    and it should fix BZ#29035 too.
-    * time/mktime.c (__mktime_internal): Be more generous about
-    accepting arguments with the wrong value of tm_isdst, by falling
-    back to a one-hour DST difference if we find no nearby DST that is
-    unusual.  This fixes a problem where "1986-04-28 00:00 EDT" was
-    rejected when TZ="America/Indianapolis" because the nearest DST
-    timestamp occurred in 1970, a temporal distance too great for the
-    old heuristic.  This also also narrows the search a bit, which
-    is a minor performance win.
-    
-    (cherry picked from commit 83859e1115269cf56d21669361d4ddbe2687831c)
-
-diff --git b/time/mktime.c a/time/mktime.c
-index e9a6006710..494c89bf54 100644
---- b/time/mktime.c
-+++ a/time/mktime.c
-@@ -429,13 +429,8 @@ __mktime_internal (struct tm *tp,
- 	 time with the right value, and use its UTC offset.
- 
- 	 Heuristic: probe the adjacent timestamps in both directions,
--	 looking for the desired isdst.  If none is found within a
--	 reasonable duration bound, assume a one-hour DST difference.
--	 This should work for all real time zone histories in the tz
--	 database.  */
--
--      /* +1 if we wanted standard time but got DST, -1 if the reverse.  */
--      int dst_difference = (isdst == 0) - (tm.tm_isdst == 0);
-+	 looking for the desired isdst.  This should work for all real
-+	 time zone histories in the tz database.  */
- 
-       /* Distance between probes when looking for a DST boundary.  In
- 	 tzdata2003a, the shortest period of DST is 601200 seconds
-@@ -446,14 +441,12 @@ __mktime_internal (struct tm *tp,
- 	 periods when probing.  */
-       int stride = 601200;
- 
--      /* In TZDB 2021e, the longest period of DST (or of non-DST), in
--	 which the DST (or adjacent DST) difference is not one hour,
--	 is 457243209 seconds: e.g., America/Cambridge_Bay with leap
--	 seconds, starting 1965-10-31 00:00 in a switch from
--	 double-daylight time (-05) to standard time (-07), and
--	 continuing to 1980-04-27 02:00 in a switch from standard time
--	 (-07) to daylight time (-06).  */
--      int duration_max = 457243209;
-+      /* The longest period of DST in tzdata2003a is 536454000 seconds
-+	 (e.g., America/Jujuy starting 1946-10-01 01:00).  The longest
-+	 period of non-DST is much longer, but it makes no real sense
-+	 to search for more than a year of non-DST, so use the DST
-+	 max.  */
-+      int duration_max = 536454000;
- 
-       /* Search in both directions, so the maximum distance is half
- 	 the duration; add the stride to avoid off-by-1 problems.  */
-@@ -490,11 +483,6 @@ __mktime_internal (struct tm *tp,
- 	      }
- 	  }
- 
--      /* No unusual DST offset was found nearby.  Assume one-hour DST.  */
--      t += 60 * 60 * dst_difference;
--      if (mktime_min <= t && t <= mktime_max && convert_time (convert, t, &tm))
--	goto offset_found;
--
-       __set_errno (EOVERFLOW);
-       return -1;
-     }
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 03a6045372bb..f90cdeec51cb 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -57,6 +57,13 @@ buildPythonPackage rec {
     hash = "sha256-Mqy9QKlPX0bntCwQm/riswIlCUVWF4Oot6BZBI8tTTE=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/twisted/twisted/pull/11787.diff";
+      hash = "sha256-bQgUmbvDa61Vg8p/o/ivfkOAHyj1lTgHkrRVEGLM9aU=";
+    })
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   propagatedBuildInputs = [

From ccb3146bf27b954399648f7d12c3af8efeab1f13 Mon Sep 17 00:00:00 2001
From: clerie <clerie@users.noreply.github.com>
Date: Wed, 4 Jan 2023 21:50:22 +0100
Subject: [PATCH 231/953] iproute2: 6.0.0 -> 6.1.0 (#206932)

"Nothing major; lots of usual set of small fixes."

Changes: https://marc.info/?l=linux-netdev&m=167103481006660
---
 pkgs/os-specific/linux/iproute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 89c191cb7f35..9a63a28a7a96 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "UjE56ecq7JljdPot50vkxT0t0FWJSIk00h/5e64ZWAo=";
+    sha256 = "sha256-XOEqD+xrIScl7yGHNZQbLat2JE235yZGp2AhsFN7Q6s=";
   };
 
   patches = [

From 8442601c6445894b350e8b2b10717c1f609bedaf Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Wed, 4 Jan 2023 18:15:20 -0500
Subject: [PATCH 232/953] rust: fix on aarch64-linux by using GCC 11 and
 passing `-lgcc`

This change switches to using GCC 11 by default on aarch64-linux, as well as passing `-lgcc` to the linker, per #201485.

See #201254 and #208412 for wider context on the issue.
---
 pkgs/build-support/rust/hooks/cargo-setup-hook.sh | 2 ++
 pkgs/build-support/rust/hooks/default.nix         | 3 +++
 pkgs/development/compilers/rust/rustc.nix         | 4 +++-
 pkgs/top-level/all-packages.nix                   | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
index aeddeef29d92..8146573e79db 100644
--- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
@@ -1,6 +1,8 @@
 cargoSetupPostUnpackHook() {
     echo "Executing cargoSetupPostUnpackHook"
 
+    export NIX_LDFLAGS+=" @aarch64LinuxGccWorkaround@"
+
     # Some cargo builds include build hooks that modify their own vendor
     # dependencies. This copies the vendor directory into the build tree and makes
     # it writable. If we're using a tarball, the unpackFile hook already handles
diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
index b9bbac371985..9989e582d2e9 100644
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@@ -108,6 +108,9 @@ in {
           host-config = true
           target-applies-to-host = true
         '';
+
+        # https://github.com/NixOS/nixpkgs/issues/201254
+        aarch64LinuxGccWorkaround = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
       };
     } ./cargo-setup-hook.sh) {};
 
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 43d603923c97..64254d502529 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -52,7 +52,9 @@ in stdenv.mkDerivation rec {
        # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
        optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
     ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
-    ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib");
+    ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"
+       # https://github.com/NixOS/nixpkgs/issues/201254
+    ++ optional (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc");
 
   # Increase codegen units to introduce parallelism within the compiler.
   RUSTFLAGS = "-Ccodegen-units=10";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db73d888e315..460abc4491a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15386,6 +15386,8 @@ with pkgs;
   rust_1_66 = callPackage ../development/compilers/rust/1_66.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_14 = llvmPackages_14.libllvm;
+    # https://github.com/NixOS/nixpkgs/issues/201254
+    stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
   };
   rust = rust_1_66;
 

From b4cf86d7e045730c716472b927798c9489c0509f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 01:04:21 +0100
Subject: [PATCH 233/953] python39Packages: Stop recursing into package set

For NixOS 23.05 we are shifting support away from 3.9 and towards 3.10
and 3.11.
---
 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 4141a3096e44..473493c722a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16313,7 +16313,7 @@ with pkgs;
   python27Packages = python27.pkgs;
   python37Packages = python37.pkgs;
   python38Packages = python38.pkgs;
-  python39Packages = recurseIntoAttrs python39.pkgs;
+  python39Packages = python39.pkgs;
   python310Packages = recurseIntoAttrs python310.pkgs;
   python311Packages = python311.pkgs;
   python312Packages = python312.pkgs;

From 755532262d295682fe2adcd4aa8a19c8585da2c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 01:05:19 +0100
Subject: [PATCH 234/953] python311Packages: Recurse into package set

Python 3.11 is the latest stable release that we are going to support,
together with 3.10, in NixOS 23.05. The default python version will
remain at 3.10, but 3.11 packages will be built on Hydra and provided
from the binary cache.
---
 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 473493c722a4..b15f4a7b84a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16315,7 +16315,7 @@ with pkgs;
   python38Packages = python38.pkgs;
   python39Packages = python39.pkgs;
   python310Packages = recurseIntoAttrs python310.pkgs;
-  python311Packages = python311.pkgs;
+  python311Packages = recurseIntoAttrs python311.pkgs;
   python312Packages = python312.pkgs;
   pypyPackages = pypy.pkgs;
   pypy2Packages = pypy2.pkgs;

From bdc18031e57f663d2db63ef96ed013bf853e5a40 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 01:37:38 +0100
Subject: [PATCH 235/953] python311Packages.tensorflow-bin: Disable

The upstream does not support 3.11 yet and as such has not provided any
compatible wheels.
---
 pkgs/development/python-modules/tensorflow/bin.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 96f54632069e..7a2d29b75c7c 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -49,6 +49,9 @@ in buildPythonPackage {
   inherit (packages) version;
   format = "wheel";
 
+  # Python 3.11 still unsupported
+  disabled = pythonAtLeast "3.11";
+
   src = let
     pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
     platform = if stdenv.isDarwin then "mac" else "linux";

From b511bf59bd6754ad49c637f390dbb6bc1acea000 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 02:02:06 +0100
Subject: [PATCH 236/953] python3Packages.setuptools: 65.3.0 -> 65.6.3

https://setuptools.pypa.io/en/stable/history.html#v65-6-3
---
 pkgs/development/python-modules/setuptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 9fab8747b67f..993850922f5c 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "setuptools";
-  version = "65.3.0";
+  version = "65.6.3";
 
   # Create an sdist of setuptools
   sdist = stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ let
       owner = "pypa";
       repo = pname;
       rev = "refs/tags/v${version}";
-      hash = "sha256-LPguGVWvwEMZpJFuXWLVFzIlzw+/QSMjVi2oYh0cI0s=";
+      hash = "sha256-B/1MhH0RDW7/pUam2FHnIcUPN6NpvQYBjRyHIm+E9rI=";
       name = "${pname}-${version}-source";
     };
 

From 272a94a6c578da23760a79b509cab0f60aeac731 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 02:08:55 +0100
Subject: [PATCH 237/953] python3Packages.pip: 22.2.2 -> 22.3.1

https://pip.pypa.io/en/stable/news/#v22-3-1
---
 pkgs/development/python-modules/pip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 5c24679a9cb3..09787ab32b49 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.2.2";
+  version = "22.3.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-SLjmxFUFmvgy8E8kxfc6lxxCRo+GN4L77pqkWkRR8aE=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-mrfd3VWqb4SgSjBJAxBhYegABdJa7pVXL7wA5uZtF/A=";
     name = "${pname}-${version}-source";
   };
 

From ea04a1f38a7e49e66606666738a82c53943661b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 12:15:06 +0100
Subject: [PATCH 238/953] python3Packages.hypothesis: 6.54.5 -> 6.61.0

https://hypothesis.readthedocs.io/en/latest/changes.html#v6-61-0
---
 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 59c758b25aa6..dd6784335f29 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.54.5";
+  version = "6.61.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "hypothesis-python-${version}";
-    hash = "sha256-mr8ctmAzRgWNVpW+PZlOhaQ0l28P0U8PxvjoVjfHX78=";
+    hash = "sha256-gTcdJaOgP8Nc4fN8UH6+sLedivq5ZNxMRULajFOVnSo=";
   };
 
   postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";

From de08f0ba6decb6387fc54304eb0ebd5d53c71371 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 12:40:34 +0100
Subject: [PATCH 239/953] python3Packages.flit-scm: Trim dependencies and
 refactor

---
 .../python-modules/flit-scm/default.nix       | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix
index 494df272445f..2a209f2b7cd8 100644
--- a/pkgs/development/python-modules/flit-scm/default.nix
+++ b/pkgs/development/python-modules/flit-scm/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchFromGitLab
 , pythonOlder
-, git
 , flit-core
 , setuptools-scm
 , tomli
@@ -11,19 +10,37 @@
 buildPythonPackage rec {
   pname = "flit-scm";
   version = "1.7.0";
-
   format = "pyproject";
 
   src = fetchFromGitLab {
     owner = "WillDaSilva";
     repo = "flit_scm";
-    rev = version;
-    sha256 = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg=";
-    leaveDotGit = true;
+    rev = "refs/tags/${version}";
+    hash = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg=";
   };
 
-  nativeBuildInputs = [ flit-core setuptools-scm tomli git ];
-  propagatedBuildInputs = [ flit-core setuptools-scm ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    flit-core
+    setuptools-scm
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
+
+  propagatedBuildInputs = [
+    flit-core
+    setuptools-scm
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
+
+  pythonImportsCheck = [
+    "flit_scm"
+  ];
+
+
+  doCheck = false; # no tests
 
   meta = with lib; {
     description = "A PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit to build the package.";

From 39f4004b0ea3c750b264bbf4f183eb7c542e610e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 12:41:57 +0100
Subject: [PATCH 240/953] python3Packages.exceptiongroup: Disable tests on
 python310

Since pytest now requires exceptiongroup we can't use it to test the
package, because it causes an infinite recursion.
---
 pkgs/development/python-modules/exceptiongroup/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index 865e14f8e506..54139f48a669 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -4,6 +4,7 @@
 , flit-scm
 , pytestCheckHook
 , pythonOlder
+, pythonAtLeast
 }:
 
 buildPythonPackage rec {
@@ -26,6 +27,8 @@ buildPythonPackage rec {
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
+  doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest
+
   checkInputs = [
     pytestCheckHook
   ];

From 6d9c72445899838d00828e85b2c5057b99ccc8b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 12:44:20 +0100
Subject: [PATCH 241/953] python3Packages.pytest: 7.1.3 -> 7.2.0

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

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 7690b84fd3fa..b329fee256ff 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -11,6 +11,7 @@
 
 # propagates
 , attrs
+, exceptiongroup
 , iniconfig
 , packaging
 , pluggy
@@ -20,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "7.1.3";
+  version = "7.2.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-TzZf7C3/nBFi+DTZ8YrxuhMGLbDHCL97lG+KXHYYDDk=";
+    hash = "sha256-xAFOtA4Q8R81WtTjwvssbG0ZGcc/O1pDPeRwggLK3lk=";
   };
 
   outputs = [
@@ -44,6 +45,8 @@ buildPythonPackage rec {
     pluggy
     py
     tomli
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
   ];
 
   postInstall = ''
@@ -69,7 +72,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.3/src/_pytest/assertion/rewrite.py#L51-L53
+        #    https://github.com/pytest-dev/pytest/blob/7.2.0/src/_pytest/assertion/rewrite.py#L51-L53
         find $out -name "*-pytest-*.py[co]" -delete
     }
     preDistPhases+=" pytestRemoveBytecodePhase"

From 44f365a9310d4b38e5bd984e5c7a229e96472297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 10 Nov 2022 12:05:18 -0800
Subject: [PATCH 242/953] python310Packages.pytest-xdist: 2.5.0 -> 3.1.0

https://github.com/pytest-dev/pytest-xdist/blob/v3.1.0/CHANGELOG.rst
---
 .../python-modules/pytest-xdist/default.nix   | 31 ++++++++++++++-----
 .../python-modules/pytest-xdist/setup-hook.sh |  9 ------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index b17b6f2f763a..9efbd95cff83 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -7,32 +7,47 @@
 , filelock
 , execnet
 , pytest
-, pytest-forked
 , psutil
-, pexpect
+, setproctitle
 }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "2.5.0";
+  version = "3.1.0";
   disabled = pythonOlder "3.6";
 
+  format = "pyproject";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RYDeyj/wTdsqxT66Oddstd1e3qwFDLb7x2iw3XErTt8=";
+    hash = "sha256-QP2481RJIcXfzUhqwIDOIocOcdgs7W0uePqXwq3dSAw=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   buildInputs = [
     pytest
   ];
-  checkInputs = [ pytestCheckHook filelock pexpect ];
-  propagatedBuildInputs = [ execnet pytest-forked psutil ];
+
+  propagatedBuildInputs = [
+    execnet
+  ];
+
+  checkInputs = [
+    filelock
+    pytestCheckHook
+  ];
+
+  passthru.optional-dependencies = {
+    psutil = [ psutil ];
+    setproctitle = [ setproctitle ];
+  };
 
   pytestFlagsArray = [
     # pytest can already use xdist at this point
     "--numprocesses=$NIX_BUILD_CORES"
-    "--forked"
   ];
 
   # access file system
diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh
index 61d0f64d1a4d..4c6473cea64d 100644
--- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh
+++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh
@@ -1,16 +1,7 @@
 pytestXdistHook() {
     pytestFlagsArray+=(
         "--numprocesses=$NIX_BUILD_CORES"
-        "--forked"
     )
-
-    # Using --forked on darwin leads to crashes when fork safety is
-    # enabled. This often happens when urllib tries to request proxy
-    # settings on MacOS through `urllib.request.getproxies()`
-    # - https://github.com/python/cpython/issues/77906
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
-    fi
 }
 
 # the flags should be added before pytestCheckHook runs so

From f6bd32f9f87b060785c06b9326d1d985f65567fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Dec 2022 22:44:34 -0800
Subject: [PATCH 243/953] python310Packages.pytest-forked: add setup hook

---
 .../python-modules/pytest-forked/default.nix  |  2 ++
 .../pytest-forked/setup-hook.sh               | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-forked/setup-hook.sh

diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index 594a5efaa894..b5aff78fa170 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -31,6 +31,8 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     description = "Run tests in isolated forked subprocesses";
     homepage = "https://github.com/pytest-dev/pytest-forked";
diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh
new file mode 100644
index 000000000000..e613feadf834
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh
@@ -0,0 +1,25 @@
+pytestForkedHook() {
+    pytestFlagsArray+=(
+        "--forked"
+    )
+
+    # Using --forked on darwin leads to crashes when fork safety is
+    # enabled. This often happens when urllib tries to request proxy
+    # settings on MacOS through `urllib.request.getproxies()`
+    # - https://github.com/python/cpython/issues/77906
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
+    fi
+}
+
+# the flags should be added before pytestCheckHook runs so
+# until we have dependency mechanism in generic builder, we need to use this ugly hack.
+
+if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then
+    if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then
+        preDistPhases+=" "
+        preDistPhases="${preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }"
+    else
+        preDistPhases+=" pytestForkedHook"
+    fi
+fi

From 621f845e8040f6ad8bf72b1c609746a74c308267 Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Sat, 19 Nov 2022 09:55:49 +0100
Subject: [PATCH 244/953] python3Packages.typing-extensions: 4.3.0 -> 4.4.0

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

diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
index 36464204e75d..01ef53e479ad 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "typing-extensions";
-  version = "4.3.0";
+  version = "4.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "typing_extensions";
     inherit version;
-    hash = "sha256-5tJnejL0f8frJ5XbHdFcHzTv9ha8ryz7Xpl/hU+hxKY=";
+    hash = "sha256-FRFDS7kr+N0ZjBKxzIEugA1Bgc/LhnZ04PgnnMkwh6o=";
   };
 
   nativeBuildInputs = [

From b9b53676235f78cce2939913bd16480173ed6479 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 14:43:17 +0100
Subject: [PATCH 245/953] python3Packages.pytest-mock: 3.8.2 -> 3.10.0

https://github.com/pytest-dev/pytest-mock/releases/tag/v3.10.0
https://github.com/pytest-dev/pytest-mock/releases/tag/v3.9.0
---
 .../python-modules/pytest-mock/default.nix          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index ed25a10d3a4e..3e35bcba1bb4 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
+, fetchpatch
 , pytest
 , pytest-asyncio
 , pytestCheckHook
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-mock";
-  version = "3.8.2";
+  version = "3.10.0";
 
   disabled = pythonOlder "3.7";
 
@@ -18,9 +19,17 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d/A/RVQ5JVhwApXgWu0LEJaiDUpgpPPdzeWLDDHI/KI=";
+    hash = "sha256-+72whe98JSoyb9jNysCqOxMz2IEfExvcxwEALhvn7U8=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Remove unnecessary py.code import
+      url = "https://github.com/pytest-dev/pytest-mock/pull/328/commits/e2016928db1147a2a46de6ee9fa878ca0e9d8fc8.patch";
+      hash = "sha256-5Gpzi7h7Io1CMykmBCZR/upM8E9isc3jEItYgwjEOWA=";
+    })
+  ];
+
   nativeBuildInputs = [ setuptools-scm ];
 
   buildInputs = [

From af8b9c216bad5380ba0d912f5f8e9d3f99f8abd4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 15:12:14 +0100
Subject: [PATCH 246/953] python3Packages.cffi: Apply patches for pytest 7.2.0
 compat

---
 .../python-modules/cffi/default.nix            | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index fb08761a5284..266c3deb5642 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/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

From a8a664f206ce7ac14b1fb830c3d38a6654cd655e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 15:15:26 +0100
Subject: [PATCH 247/953] python3Packages.pytest-xprocess: 0.20.0 -> 0.21.0

https://github.com/pytest-dev/pytest-xprocess/blob/0.21.0/CHANGELOG.rst
---
 .../pytest-xprocess/default.nix               | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix
index c6262b7f1e0e..bed564319450 100644
--- a/pkgs/development/python-modules/pytest-xprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-xprocess/default.nix
@@ -1,30 +1,41 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib
+, buildPythonPackage
+, fetchPypi
 , psutil
+, py
 , pytest
 , setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "pytest-xprocess";
-  version = "0.20.0";
+  version = "0.21.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-AhZ1IsTcdZ+RxKsZhUY5zR6fbgq/ynXhGWgrVB0b1j8=";
+    sha256 = "sha256-+UcL/PiE9ymetrgqQ9KYwxi45T7DFO5iTJh+DofBtEk=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-
-  buildInputs = [ pytest ];
-
-  propagatedBuildInputs = [ psutil ];
-
-  # Remove test QoL package from install_requires
   postPatch = ''
+    # Remove test QoL package from install_requires
     substituteInPlace setup.py \
       --replace "'pytest-cache', " ""
   '';
 
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  propagatedBuildInputs = [
+    psutil
+    py
+  ];
+
   # There's no tests in repo
   doCheck = false;
 

From 31aa25d9c910bd9d8fa1f3cb71bdf684b752d9e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 16:29:22 +0100
Subject: [PATCH 248/953] python3Packages.execnet: Fix compat with pytest 7.2.0

---
 .../python-modules/execnet/default.nix        | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 0c75727e7445..db6e9489683e 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -2,23 +2,30 @@
 , buildPythonPackage
 , isPyPy
 , fetchPypi
+, fetchpatch
 , pytestCheckHook
 , setuptools-scm
 , apipkg
+, py
 }:
 
 buildPythonPackage rec {
   pname = "execnet";
   version = "1.9.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5";
   };
 
-  checkInputs = [ pytestCheckHook ];
-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ apipkg ];
+  patches = [
+    (fetchpatch {
+      # Fix test compat with pytest 7.2.0
+      url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch";
+      hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0=";
+    })
+  ];
 
   # remove vbox tests
   postPatch = ''
@@ -29,14 +36,30 @@ buildPythonPackage rec {
     ${lib.optionalString isPyPy "rm -v testing/test_multi.py"}
   '';
 
-  pythonImportsCheck = [ "execnet" ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    apipkg
+  ];
+
+  checkInputs = [
+    py
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "execnet"
+  ];
 
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
+    changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst";
     description = "Distributed Python deployment and communication";
-    license = licenses.mit;
     homepage = "https://execnet.readthedocs.io/";
+    license = licenses.mit;
     maintainers = with maintainers; [ ];
   };
 

From cbe9daf4d52064c54d6a050a5a275147c88f7fca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 16:33:23 +0100
Subject: [PATCH 249/953] python3Packages.flit: 3.7.1 -> 3.8.0

https://flit.pypa.io/en/stable/history.html#version-3-8
---
 pkgs/development/python-modules/flit/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index 598905d97ffa..436b65c633c1 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -7,7 +7,6 @@
 , testpath
 , responses
 , flit-core
-, tomli
 , tomli-w
 }:
 
@@ -18,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "flit";
-  version = "3.7.1";
+  version = "3.8.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "takluyver";
     repo = "flit";
     rev = version;
-    sha256 = "sha256-zKgaeK3fskz2TuHvIWlxBrdZIWfIJHhaqopZ3+V36wY=";
+    hash = "sha256-iXf9K/xI4u+dDV0Zf6S08nbws4NqycrTEW0B8/qCjQc=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +35,6 @@ buildPythonPackage rec {
     docutils
     requests
     flit-core
-    tomli
     tomli-w
   ];
 

From f019f1ede8b33a359ddeb7389bef8de431216f3f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 21:34:52 +0100
Subject: [PATCH 250/953] python3Packages.pytest-forked: fix tests

---
 .../python-modules/pytest-forked/default.nix   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index b5aff78fa170..2feb14f01248 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
+, fetchpatch
 , setuptools-scm
 , py
 , pytest
@@ -19,6 +20,18 @@ buildPythonPackage rec {
     sha256 = "sha256-i2dYfI+Yy7rf3YBFOe1UVbbtA4AiA0hd0vU8FCLXRA4=";
   };
 
+  patches = [
+    # pytest 7.2.0 compat, remove after 1.4.0
+    (fetchpatch {
+      url = "https://github.com/pytest-dev/pytest-forked/commit/c3c753e96916a4bc5a8a37699e75c6cbbd653fa2.patch";
+      hash = "sha256-QPgxBeMQ0eKJyHXYZyBicVbE+JyKPV/Kbjsb8gNJBGA=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pytest-dev/pytest-forked/commit/de584eda15df6db7912ab6197cfb9ff23024ef23.patch";
+      hash = "sha256-VLE32xZRwFK0nEgCWuSoMW/yyFHEURtNFU9Aa9haLhk=";
+    })
+  ];
+
   nativeBuildInputs = [ setuptools-scm ];
 
   buildInputs = [
@@ -29,7 +42,10 @@ buildPythonPackage rec {
     py
   ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    py
+    pytestCheckHook
+  ];
 
   setupHook = ./setup-hook.sh;
 

From 98e3547b3509a37bca2aba063e7145f721341ccd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 02:27:12 +0100
Subject: [PATCH 251/953] python3Packages.filelock: 3.8.0 -> 3.9.0

https://github.com/tox-dev/py-filelock/releases/tag/3.9.0
---
 pkgs/development/python-modules/filelock/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 7afb72545147..5aee39a459bd 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -1,25 +1,27 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, hatch-vcs
+, hatchling
 , pytestCheckHook
 , pythonOlder
-, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.8.0";
+  version = "3.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VUR8qmZvIZjFtrE6JtIITSb6WxFcANBlZkshJGgMTtw=";
+    hash = "sha256-ezGfJDQLUfVaK/ehKsB1WpsD5xgxHaxWeg9Pf6vS9d4=";
   };
 
   nativeBuildInputs = [
-    setuptools-scm
+    hatch-vcs
+    hatchling
   ];
 
   checkInputs = [
@@ -27,6 +29,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/tox-dev/py-filelock/releases/tag/${version}";
     description = "A platform independent file lock for Python";
     homepage = "https://github.com/benediktschmitt/py-filelock";
     license = licenses.unlicense;

From 0b8bc5359dd9516b8d77ac64fac4e45c63554926 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Fri, 23 Dec 2022 14:23:08 -0500
Subject: [PATCH 252/953] python310Packages.attrs: 22.1.0 -> 22.2.0

---
 pkgs/development/python-modules/attrs/default.nix | 14 ++++++++++----
 pkgs/development/python-modules/attrs/tests.nix   |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index 44b61fcba725..855b4bf86982 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/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 = [
diff --git a/pkgs/development/python-modules/attrs/tests.nix b/pkgs/development/python-modules/attrs/tests.nix
index c9fae9e0228c..fddf467665c5 100644
--- a/pkgs/development/python-modules/attrs/tests.nix
+++ b/pkgs/development/python-modules/attrs/tests.nix
@@ -7,6 +7,7 @@
 buildPythonPackage {
   pname = "attrs-tests";
   inherit (attrs) version;
+  format = "other";
 
   srcs = attrs.testout;
 

From f2d8a76868a4ab4b8236ccc89ba6bfd1eb0e82ea Mon Sep 17 00:00:00 2001
From: Luiz Irber <contact+github@luizirber.org>
Date: Thu, 29 Dec 2022 11:28:09 -0800
Subject: [PATCH 253/953] python3Packages.packaging: 21.3 -> 22.0

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

diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index c7587cb5c5dc..2673d42a6708 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -1,28 +1,28 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, flit-core
 , pyparsing
 , pytestCheckHook
 , pythonOlder
 , pretend
-, setuptools
 }:
 
 let
   packaging = buildPythonPackage rec {
     pname = "packaging";
-    version = "21.3";
+    version = "22.0";
     format = "pyproject";
 
     disabled = pythonOlder "3.6";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s=";
+      sha256 = "sha256-IZjsIL1MAXuPlxfgDwyHFAdvwv2TgWdQq0jixB3iz9M=";
     };
 
     nativeBuildInputs = [
-      setuptools
+      flit-core
     ];
 
     propagatedBuildInputs = [ pyparsing ];

From c8ff23158ecd1b0bfafab7dc4a0daaf82fda06fb Mon Sep 17 00:00:00 2001
From: Luiz Irber <contact+github@luizirber.org>
Date: Thu, 29 Dec 2022 11:27:40 -0800
Subject: [PATCH 254/953] python3Packages.pyproject-api: init at 1.2.1

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 .../python-modules/pyproject-api/default.nix  | 89 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 91 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyproject-api/default.nix

diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix
new file mode 100644
index 000000000000..6e719ea6f417
--- /dev/null
+++ b/pkgs/development/python-modules/pyproject-api/default.nix
@@ -0,0 +1,89 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+
+# build time
+, hatchling
+, hatch-vcs
+, setuptools-scm
+
+# runtime
+, packaging
+, toml
+, tomli
+
+# docs
+, sphinxHook
+, furo
+, sphinx-autodoc-typehints
+
+# tests
+, pytest-mock
+, pytestCheckHook
+, virtualenv
+, wheel
+}:
+
+buildPythonPackage rec {
+  pname = "pyproject-api";
+  version = "1.2.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "tox-dev";
+    repo = "pyproject-api";
+    rev = "refs/tags/${version}";
+    hash = "sha256-IRNg0/lTWoS8znsbipZNoeun+uOpZtCApL4HkF2lwhU=";
+  };
+
+  outputs = [
+    "out"
+    "doc"
+  ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    hatchling
+    hatch-vcs
+    setuptools-scm
+
+    # docs
+    sphinxHook
+    furo
+    sphinx-autodoc-typehints
+  ];
+
+  propagatedBuildInputs = [
+    packaging
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
+
+  checkInputs = [
+    pytest-mock
+    pytestCheckHook
+    virtualenv
+    wheel
+  ];
+
+  disabledTests = [
+    # requires eol python2 interpreter
+    "test_can_build_on_python_2"
+  ];
+
+  pythonImportsCheck = [
+    "pyproject_api"
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/tox-dev/pyproject-api/releases/tag/${version}";
+    description = "API to interact with the python pyproject.toml based projects";
+    homepage = "https://github.com/tox-dev/pyproject-api";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9726609c6673..ae7c2d07a500 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6953,6 +6953,8 @@ self: super: with self; {
 
   pyprecice = callPackage ../development/python-modules/pyprecice { };
 
+  pyproject-api = callPackage ../development/python-modules/pyproject-api { };
+
   pypsrp = callPackage ../development/python-modules/pypsrp { };
 
   phpserialize = callPackage ../development/python-modules/phpserialize { };

From 7f5e062065bf568322f94ba8b6e7abc0f464cbed Mon Sep 17 00:00:00 2001
From: Luiz Irber <contact+github@luizirber.org>
Date: Fri, 30 Dec 2022 02:48:43 +0100
Subject: [PATCH 255/953] python3Packages.chardet: 5.0.0 -> 5.1.0

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 pkgs/development/python-modules/chardet/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix
index b5cca5110e7c..07a0cbccf258 100644
--- a/pkgs/development/python-modules/chardet/default.nix
+++ b/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;

From 66de0472ab71a4d8d8fee40fc11873a64748ae88 Mon Sep 17 00:00:00 2001
From: Luiz Irber <contact+github@luizirber.org>
Date: Thu, 29 Dec 2022 11:28:52 -0800
Subject: [PATCH 256/953] python3Packages.virtualenv: 20.16.5 -> 20.17.1

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

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index f0b365761f6c..e86ec5fa7da7 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -23,11 +23,12 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.16.5";
+  version = "20.17.1";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-In6huZlP3F6jGXe6M4PvKW10cuqFvp1nMuQqkcBOgNo=";
+    hash = "sha256-+LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg=";
   };
 
   nativeBuildInputs = [

From bd4e0b28f937d8e44a98eee61237ac4856de2887 Mon Sep 17 00:00:00 2001
From: Luiz Irber <contact+github@luizirber.org>
Date: Thu, 29 Dec 2022 11:29:20 -0800
Subject: [PATCH 257/953] python3Packages.tox: 3.27.1 -> 4.0.16

---
 .../python-modules/tox/default.nix            | 67 +++++++++++++++----
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 9c167a7614c8..c60691c0674b 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pythonOlder
 , packaging
 , pluggy
 , py
@@ -10,27 +11,69 @@
 , toml
 , tomli
 , filelock
-, pythonOlder
+, hatchling
+, hatch-vcs
+, platformdirs
+, pyproject-api
+, colorama
+, chardet
+, cachetools
+, testers
+, tox
 }:
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "3.27.1";
+  version = "4.0.16";
+  format = "pyproject";
 
-  buildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ packaging pluggy py six virtualenv filelock ]
-                          ++ lib.optional (pythonOlder "3.11") tomli;
+  src = fetchFromGitHub {
+    owner = "tox-dev";
+    repo = "tox";
+    rev = "refs/tags/${version}";
+    hash = "sha256-D53koe8XJLhEmDqfFOs2quDNVsC0jvr3/VzNCH4h8DY=";
+  };
 
-  doCheck = false;
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "packaging>=22" "packaging"
+  '';
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-sqkg41pmjMBpQv/RzzpPsiGk2QnKchkftthLCxinvgQ=";
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    hatchling
+    hatch-vcs
+  ];
+
+  propagatedBuildInputs = [
+    cachetools
+    chardet
+    colorama
+    filelock
+    packaging
+    platformdirs
+    pluggy
+    py
+    pyproject-api
+    six
+    toml
+    virtualenv
+  ]  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
+
+  doCheck = false; # infinite recursion via devpi-client
+
+  passthru.tests = {
+    version = testers.testVersion { package = tox; };
   };
 
   meta = with lib; {
-    description = "Virtualenv-based automation of test activities";
-    homepage = "https://tox.readthedocs.io/";
+    changelog = "https://github.com/tox-dev/tox/releases/tag/${version}";
+    description = "A generic virtualenv management and test command line tool";
+    homepage = "https://github.com/tox-dev/tox";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

From b5901055ef7d478257dab994ae5b69b24e42c7e2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 14:43:43 +0100
Subject: [PATCH 258/953] Revert "python3Packages.packaging: 21.3 -> 22.0"

This reverts commit 31bae8490a334b1a70abed1df042cbe00bbc9d3f.

It is possibly too early to incur this breaking package.
---
 pkgs/development/python-modules/packaging/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index 2673d42a6708..c7587cb5c5dc 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -1,28 +1,28 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, flit-core
 , pyparsing
 , pytestCheckHook
 , pythonOlder
 , pretend
+, setuptools
 }:
 
 let
   packaging = buildPythonPackage rec {
     pname = "packaging";
-    version = "22.0";
+    version = "21.3";
     format = "pyproject";
 
     disabled = pythonOlder "3.6";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-IZjsIL1MAXuPlxfgDwyHFAdvwv2TgWdQq0jixB3iz9M=";
+      sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s=";
     };
 
     nativeBuildInputs = [
-      flit-core
+      setuptools
     ];
 
     propagatedBuildInputs = [ pyparsing ];

From cc00c2949b8196cdffa56b1cc3151e5b8eb5cb92 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 17:23:48 +0100
Subject: [PATCH 259/953] python3Packages.cryptography: Pass py into
 checkInputs

and set format.
---
 pkgs/development/python-modules/cryptography/default.nix | 3 +++
 pkgs/development/python-modules/cryptography/vectors.nix | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index d5e4af33f601..7f746655c766 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -18,6 +18,7 @@
 , pretend
 , libiconv
 , iso8601
+, py
 , pytz
 , hypothesis
 }:
@@ -28,6 +29,7 @@ in
 buildPythonPackage rec {
   pname = "cryptography";
   version = "38.0.4"; # Also update the hash in vectors.nix
+  format = "setuptools";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
@@ -63,6 +65,7 @@ buildPythonPackage rec {
     hypothesis
     iso8601
     pretend
+    py
     pytestCheckHook
     pytest-benchmark
     pytest-subtests
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 4de95b000263..31ace7c48ffd 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -4,6 +4,7 @@ buildPythonPackage rec {
   pname = "cryptography-vectors";
   # The test vectors must have the same version as the cryptography package
   inherit (cryptography) version;
+  format = "setuptools";
 
   src = fetchPypi {
     pname = "cryptography_vectors";

From 86a151563d166cf0c2e99bb00e15730dcc808638 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 17:24:26 +0100
Subject: [PATCH 260/953] python3Packages.devpi: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index 21bb275918dd..21beec5b440e 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -26,6 +26,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    py
     pytestCheckHook
   ];
 

From 57eb9f068120efc4a48eec5c4acc3deaf81f54fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 17:24:44 +0100
Subject: [PATCH 261/953] devpi-server: Pass py into checkInputs to fix tests

and set format.
---
 pkgs/development/tools/devpi-server/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index e774b554dc06..c6852ddf1cb1 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -11,6 +11,7 @@
 , passlib
 , platformdirs
 , pluggy
+, py
 , pyramid
 , pytestCheckHook
 , repoze_lru
@@ -24,6 +25,7 @@
 buildPythonApplication rec {
   pname = "devpi-server";
   version = "6.7.0";
+  format = "setuptools";
 
   disabled = isPy27;
 
@@ -62,6 +64,7 @@ buildPythonApplication rec {
   checkInputs = [
     beautifulsoup4
     nginx
+    py
     pytestCheckHook
     webtest
   ];

From 04af8bfa8a5d56bb35ce367d75847dc9a51ca4f6 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sun, 25 Dec 2022 16:10:47 -0500
Subject: [PATCH 262/953] python311Packages.jedi: disable some tests

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

diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 2235cb909c01..3c939195000d 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
+, pythonAtLeast
 , pythonOlder
 , fetchFromGitHub
 , attrs
@@ -37,14 +38,17 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
-    # Assertions mismatches with pytest>=6.0
-    "test_completion"
-
     # sensitive to platform, causes false negatives on darwin
     "test_import"
   ] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [
     # AssertionError: assert 'foo' in ['setup']
     "test_init_extension_module"
+  ] ++ lib.optionals (pythonAtLeast "3.11") [
+    # disabled until 3.11 is added to _SUPPORTED_PYTHONS in jedi/api/environment.py
+    "test_find_system_environments"
+
+    # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved
+    "test_interpreter"
   ];
 
   meta = with lib; {

From 8afcb44617eba8424b1e86d0ede855f108913ae4 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sat, 19 Nov 2022 12:35:19 +0100
Subject: [PATCH 263/953] python3Packages.pandas: 1.4.4 -> 1.5.2

---
 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 9125b96a014c..72e053c8a56a 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -28,13 +28,13 @@
 
 buildPythonPackage rec {
   pname = "pandas";
-  version = "1.4.4";
+  version = "1.5.2";
   format = "setuptools";
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-q2wNc4YXtnUYPl8o2zK1FItpStm7oKQMPqJtlrQx22c=";
+    hash = "sha256-IguY0VzuCyzYOaY1i9Hyc9A1a/lkwaGusy1H2wIVSIs=";
   };
 
   nativeBuildInputs = [ cython ];
@@ -96,6 +96,8 @@ buildPythonPackage rec {
     # than expected, e.g. on amd64 with FMA or on arm64
     # https://github.com/pandas-dev/pandas/issues/38921
     "test_rolling_var_numerical_issues"
+    # Requires mathplotlib
+    "test_subset_for_boolean_cols"
   ] ++ lib.optionals stdenv.isDarwin [
     "test_locale"
     "test_clipboard"

From bf6d21b7d4fc2e171d600d49ce9a2246f0f0dbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 11 Nov 2022 20:04:50 -0800
Subject: [PATCH 264/953] python310Packages.pytest-asyncio: 0.19.0 -> 0.20.3

https://github.com/pytest-dev/pytest-asyncio/blob/v0.20.3/CHANGELOG.rst
---
 pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 855b5f618f81..e13f67ec83b5 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "0.19.0";
+  version = "0.20.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "pytest-dev";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-A8ngASbSRwY4RjanalnWBGgskZMDO50ffOf6wMNqOvA=";
+    hash = "sha256-oq28wJ/Tq4yuQ/98tdzYKDyatpliS0Xcbc6T46ZTP7I=";
   };
 
   outputs = [

From 88fc8c7b0d512e173007e8470bb00cbcaf3c1551 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:51 +0100
Subject: [PATCH 265/953] python3Packages.aardwolf: 0.0.8 -> 0.2.1

---
 .../python-modules/aardwolf/default.nix       | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix
index 58d07696de20..9e4cac5855e6 100644
--- a/pkgs/development/python-modules/aardwolf/default.nix
+++ b/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

From ce24ef2a991594046d8f6ffdadfeac25ad5d9b79 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:51 +0100
Subject: [PATCH 266/953] python3Packages.absl-py: 1.2.0 -> 1.3.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 e2facc919347..8ce782aedc98 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.2.0";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc=";
+    sha256 = "sha256-Rjw4oI0uTO9sSYt2ulvUhY5MbvUdoaWh8nE5oCLiAkg=";
   };
 
   propagatedBuildInputs = [

From ed51b8f495ea096b63d7a5ec22b3bb22d6b75db5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:52 +0100
Subject: [PATCH 267/953] python3Packages.advantage-air: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/advantage-air/default.nix b/pkgs/development/python-modules/advantage-air/default.nix
index 90c8645547fe..205ea0c0e7f8 100644
--- a/pkgs/development/python-modules/advantage-air/default.nix
+++ b/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 = [

From 813f9c741bc81254da7478a48932e07420e4221a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:52 +0100
Subject: [PATCH 268/953] python3Packages.aeppl: 0.0.39 -> 0.0.50

---
 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 6d222dfe51cb..c8fe640760df 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.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 = [

From 3342fd0c2bbc509cf3b2269803771990d0da7ed4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:52 +0100
Subject: [PATCH 269/953] python3Packages.aiojobs: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix
index 0ae7c3e8a06c..937ff406ed74 100644
--- a/pkgs/development/python-modules/aiojobs/default.nix
+++ b/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 = [

From 24618632944a6eaac19971f6cd73a7236cf47465 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:52 +0100
Subject: [PATCH 270/953] python3Packages.aiolifx-themes: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix
index 8263104c3915..8a987027a02b 100644
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/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 = ''

From 377a28a6a8f2876e1be9ffcb6a1d45c1e239207a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:52 +0100
Subject: [PATCH 271/953] python3Packages.aiomysensors: 0.3.3 -> 0.3.5

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

diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix
index 23f26ca72b25..3110707ad7fc 100644
--- a/pkgs/development/python-modules/aiomysensors/default.nix
+++ b/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 = [

From 7b54bcfc2c4766d73d4e9725bfb781a1ed83360e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:52 +0100
Subject: [PATCH 272/953] python3Packages.aioresponses: 0.7.3 -> 0.7.4

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

diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 3c2a0e48d329..282870398209 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/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 = [

From a6f2dd1e2ae1e03857fc51296b63cee8389a8ee2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:53 +0100
Subject: [PATCH 273/953] python3Packages.aiosmtpd: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix
index 254f1bfa4fe3..b283267faee9 100644
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/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 = [

From 94ae566e12dfb8d78acf20c48f3df9d2afa80da5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:53 +0100
Subject: [PATCH 274/953] python3Packages.aiosqlite: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix
index 022e34e23c1b..2ad77ee673f1 100644
--- a/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/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

From 46a29d49cbc55257e8fd3bf4979ab3dc8de29d06 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:53 +0100
Subject: [PATCH 275/953] python3Packages.aiowatttime: 2021.10.0 -> 2022.10.0

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

diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix
index 67d21b7ebfab..42ede58440e7 100644
--- a/pkgs/development/python-modules/aiowatttime/default.nix
+++ b/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 = [

From 5fe2e97ab7510e11f2680cea3139cf97a436798d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:53 +0100
Subject: [PATCH 276/953] python3Packages.alembic: 1.8.1 -> 1.9.1

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

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index aefe80a3b0b3..3b13476f31a7 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/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 = [

From 41b94cb5e98744e314d6304490f58bac94772116 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:53 +0100
Subject: [PATCH 277/953] python3Packages.allure-behave: 2.10.0 -> 2.12.0

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

diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix
index 000c51359f54..4463be9997b3 100644
--- a/pkgs/development/python-modules/allure-behave/default.nix
+++ b/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 = [

From c995631e0d2b0c20194fe13571f72c19300f7b42 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:53 +0100
Subject: [PATCH 278/953] python3Packages.allure-pytest: 2.10.0 -> 2.12.0

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

diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix
index 273aa38b02a4..3df8d19dee15 100644
--- a/pkgs/development/python-modules/allure-pytest/default.nix
+++ b/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 = [

From e4d51fe165f00f58c7d99f2b0a7fd9b9a58d69ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:53 +0100
Subject: [PATCH 279/953] python3Packages.allure-python-commons: 2.10.0 ->
 2.12.0

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

diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix
index 052ef498b4a6..414271358545 100644
--- a/pkgs/development/python-modules/allure-python-commons/default.nix
+++ b/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 = [

From 108935657c2d6ad31805689b2e53aadc1359cc91 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:54 +0100
Subject: [PATCH 280/953] python3Packages.allure-python-commons-test: 2.11.0 ->
 2.12.0

---
 .../python-modules/allure-python-commons-test/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix
index fcdc76a0897a..a68cf5a90882 100644
--- a/pkgs/development/python-modules/allure-python-commons-test/default.nix
+++ b/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 = [

From a22f0ea99167ba948492f201d0a7ebbd5fb41f31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:54 +0100
Subject: [PATCH 281/953] python3Packages.amarna: 0.1.3 -> 0.1.5

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

diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix
index aadf4d2665e5..fb6ef7873824 100644
--- a/pkgs/development/python-modules/amarna/default.nix
+++ b/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 = [

From 1f6ff640b44ad1e5f3045ccdfb07d2919d8dbffc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:54 +0100
Subject: [PATCH 282/953] python3Packages.ansible: 6.6.0 -> 7.1.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 81839ecce007..74f24b2028eb 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.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 = ''

From 72e14f23c3e8759cd3f3f26fb9cb94ca3c0f072a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:54 +0100
Subject: [PATCH 283/953] python3Packages.anybadge: 1.11.1 -> 1.14.0

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

diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix
index 489e200afb04..3fc3ae316edb 100644
--- a/pkgs/development/python-modules/anybadge/default.nix
+++ b/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

From 3e1c8797cddcc16e8a3a1846b117de5274aabb60 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:54 +0100
Subject: [PATCH 284/953] python3Packages.apache-airflow: 2.4.3 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index cbedbeb70dca..68b2cf396de8 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/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.

From b744a3cd49cba33c622e22549270a4027f289c43 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:54 +0100
Subject: [PATCH 285/953] python3Packages.apache-beam: 2.40.0 -> 2.43.0

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

diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index 2d4adb5ddc5e..f9da71979496 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/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 = [

From 8b1f6ea6fd5d01f08de8d3b247cd23614420e197 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:54 +0100
Subject: [PATCH 286/953] python3Packages.apispec: 5.2.2 -> 6.0.2

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

diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index 9ad41715a231..b204e97af221 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/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 = [

From 7dffb34a83a173aa3b8e8a16e4356ad5cac03662 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 287/953] python3Packages.apscheduler: 3.9.1 -> 3.9.1.post1

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

diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index b6f79b6c5fc6..d9a222182ae7 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "apscheduler";
-  version = "3.9.1";
+  version = "3.9.1.post1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "APScheduler";
     inherit version;
-    hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM=";
+    hash = "sha256-sr6gMJVp2lOnJhv6DOGcZ92/4VG9p3amqQdXn9vT6yo=";
   };
 
   buildInputs = [

From b07a63d78c6fb65b3549c3778d128fc4dc64de31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 288/953] python3Packages.asf-search: 5.0.2 -> 6.0.2

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

diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix
index 6e857499f651..d7b15f939bb1 100644
--- a/pkgs/development/python-modules/asf-search/default.nix
+++ b/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 = [

From 58ba66ed8134a80267aa6c394674c5c73eb8c32a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 289/953] python3Packages.astral: 2.2 -> 3.2

https://github.com/sffjunkie/astral/blob/3.2/ChangeLog.md
---
 .../python-modules/astral/default.nix         | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 8c97ef6750f7..62d3cc94cbfd 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/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;

From b1db877742169b3b95d3d6d0863c4c6528c10624 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 290/953] python3Packages.astroid: 2.12.12 -> 2.12.13

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

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 9cacef4ac79a..313c3d5de94d 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/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 = [

From c7051552b9e5eaddfb63beb04a39434d55a37370 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 291/953] python3Packages.astropy: 5.1 -> 5.2

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

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index fbf40096daef..9b80f780b852 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/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;

From 45efd07b42950daa1f9f478cd20e545d9964bd2c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 292/953] python3Packages.asttokens: 2.1.0 -> 2.2.1

---
 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 f45c5e7aff33..51e8805465f5 100644
--- a/pkgs/development/python-modules/asttokens/default.nix
+++ b/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 = [

From 048bf8acc5129974e8466212df6dc1802bd70f16 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 293/953] python3Packages.asyncio-mqtt: 0.14.0 -> 0.16.1

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

diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix
index 41f2f2864d18..05225ef6ec73 100644
--- a/pkgs/development/python-modules/asyncio_mqtt/default.nix
+++ b/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; {

From 3396b16c4ed4cda1a03ad469053b1a464671f596 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:55 +0100
Subject: [PATCH 294/953] python3Packages.async-modbus: 0.2.0 -> 0.2.1

---
 .../python-modules/async-modbus/default.nix   | 13 +++-
 .../async-modbus/fix-tests.patch              | 73 +++++++++++++++++++
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/async-modbus/fix-tests.patch

diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix
index 84423c6afbbc..afeb78d413a7 100644
--- a/pkgs/development/python-modules/async-modbus/default.nix
+++ b/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",' "" \
diff --git a/pkgs/development/python-modules/async-modbus/fix-tests.patch b/pkgs/development/python-modules/async-modbus/fix-tests.patch
new file mode 100644
index 000000000000..1c9dd605f5b8
--- /dev/null
+++ b/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

From e04d194fc693f0fa5e92294e59df63d7d5f44f90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 295/953] python3Packages.atlassian-python-api: 3.28.1 ->
 3.32.0

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

diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index a0c006261629..fae7f6567037 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/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 = [

From 108d7e7a1104f2bb0ff2c4fd602b53c7835dae2f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 296/953] python3Packages.automat: 20.2.0 -> 22.10.0

---
 .../python-modules/automat/default.nix            | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
index 094015e56f5e..ba055025d698 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/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
   ];

From 5bfc071b3c47fb637151ae327b87edf5ed672ea5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 297/953] python3Packages.autopep8: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index a5c7cccffb3e..cc0423397d21 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/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 ];
   };

From 5338c67cc030652b3a12b7eb0e18c5f349021d13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 298/953] python3Packages.awkward-cpp: 2 -> 5

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

diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix
index 00c50e912016..05a5d4fd5d09 100644
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/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 = [

From 834f4dc87af6f3cbfc8ef4f3dcf53ffbcfc7de38 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 299/953] python3Packages.awkward: 2.0.0 -> 2.0.4

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index f15810ae8ab8..017144e42703 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/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 = [

From ce7ca24385a2d4b530fb7950b6bbf46a80b49c45 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 300/953] python3Packages.aws-sam-translator: 1.47.0 -> 1.55.0

---
 .../aws-sam-translator/default.nix            | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index edd0e9426506..215ce6152e90 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/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"
   ];

From df6708218124861c04dd4139cd627e1b71cf8918 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 301/953] python3Packages.aws-xray-sdk: 2.10.0 -> 2.11.0

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

diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index fd8ed21cd085..d851cd056066 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/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 = [

From a65d9faad78c930be4f4402aa8e5f98e13613c62 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:56 +0100
Subject: [PATCH 302/953] python3Packages.azure-core: 1.25.1 -> 1.26.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 4e9329f22603..f80ca9f17b8f 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/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 = [

From 46dd1df9f6307c8306904e8326a701f86a46bcc7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:57 +0100
Subject: [PATCH 303/953] python3Packages.azure-data-tables: 12.4.0 -> 12.4.1

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

diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix
index 7f2933e01a56..1d8ce8d5675a 100644
--- a/pkgs/development/python-modules/azure-data-tables/default.nix
+++ b/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 = [

From 2a803d2ba5646d0f85ca328d74815a8b1741907d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:57 +0100
Subject: [PATCH 304/953] python3Packages.azure-mgmt-batch: 16.2.0 -> 17.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 796c65bcd077..9d89eae3e07b 100644
--- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/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 = [

From 273ad9529ca3f5c3adc09b9237eabb0a3ba31c15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:57 +0100
Subject: [PATCH 305/953] python3Packages.azure-mgmt-cognitiveservices: 13.2.0
 -> 13.3.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index 312b317d6f62..a2d260339aca 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/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 = [

From 84751ddb56554074a1ebbe4c5aaf1adfa36104b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:57 +0100
Subject: [PATCH 306/953] python3Packages.azure-mgmt-compute: 27.2.0 -> 29.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 6c0f36d92eee..00245ed3ffc7 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/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 = [

From fd39cc5e1b0178cf2606e69b87cd03244ded40f9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:57 +0100
Subject: [PATCH 307/953] python3Packages.azure-mgmt-datafactory: 2.8.1 ->
 2.10.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 cadf74a5f653..3027d54531ac 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.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 = [

From 0a0d0ffadd7f09d21c4118edc48a4de39835f824 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:57 +0100
Subject: [PATCH 308/953] python3Packages.azure-multiapi-storage: 0.10.0 ->
 1.0.0

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

diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 442315d0566b..331c0e1e2e95 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/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 = [

From 4544f40a2315c0946ccd7074dcc6debed06b9770 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:57 +0100
Subject: [PATCH 309/953] python3Packages.azure-servicebus: 7.8.0 -> 7.8.1

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

diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index 47849c9c6f1a..9c7a57adc08d 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/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 = [

From cae4698b9d08af3b72c27cbbdac75d5183545642 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:58 +0100
Subject: [PATCH 310/953] python3Packages.azure-synapse-artifacts: 0.13.0 ->
 0.14.0

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

diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index de0909fa0c02..6a84941a5e8f 100644
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/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 = [

From 031f92461919ac17adbd0a115757ef6f12621fab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:58 +0100
Subject: [PATCH 311/953] python3Packages.backoff: 2.1.2 -> 2.2.1

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

diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix
index e62533f491cb..fb71d65d5bb4 100644
--- a/pkgs/development/python-modules/backoff/default.nix
+++ b/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 = [

From c52f23e4df4248e46ae80b40762d4921541704d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:58 +0100
Subject: [PATCH 312/953] python3Packages.bids-validator: 1.9.8 -> 1.9.9

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

diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
index 69c0d605c59a..c22c0c9657f1 100644
--- a/pkgs/development/python-modules/bids-validator/default.nix
+++ b/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

From 4380cb7c55bd0356f81ec41b34d194a1330b5af6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:58 +0100
Subject: [PATCH 313/953] python3Packages.biliass: 1.3.5 -> 1.3.7

---
 .../python-modules/biliass/default.nix        | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix
index 617b87bc12f1..a14f973fccce 100644
--- a/pkgs/development/python-modules/biliass/default.nix
+++ b/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";

From 39e8f6dc0d6ab82f1a82e2d0f89015237bf13c5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:58 +0100
Subject: [PATCH 314/953] python3Packages.billiard: 4.0.0 -> 4.1.0

---
 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..511fbc5318c2 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.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k=";
+    sha256 = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU=";
   };
 
   checkInputs = [

From 03810781446d318598f2b05aaeb25a9c6c64acd3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:58 +0100
Subject: [PATCH 315/953] python3Packages.bimmer-connected: 0.10.4 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index 4af50c6fdb45..84e332974378 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/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 = [

From 725c51a670f223d1f0063bafcbed182874837c37 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:58 +0100
Subject: [PATCH 316/953] python3Packages.biopython: 1.79 -> 1.80

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

diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
index 002b3ce2e292..e0b419da2926 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/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;

From 7aa63d57e08672f6cd559b429f9cdfc398675610 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 317/953] python3Packages.bitarray: 2.6.0 -> 2.6.1

---
 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 f49c4c9de47d..a9bbef0e4325 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.6.0";
+  version = "2.6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0=";
+    hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA=";
   };
 
   checkPhase = ''

From d936589982002468f4cadd832f634163c11d153a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 318/953] python3Packages.bleak: 0.19.4 -> 0.19.5

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

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index c93bc83b8a0f..f0184dcdb06f 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/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 = [

From eca61ccf9a31cca9c7a1034d5bf55c186a1ace9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 23:04:06 +0100
Subject: [PATCH 319/953] python3Packages.xyzservices: init at 2022.9.0

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

diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix
new file mode 100644
index 000000000000..fc74c7c374b2
--- /dev/null
+++ b/pkgs/development/python-modules/xyzservices/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchPypi
+, mercantile
+, pytestCheckHook
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "xyzservices";
+  version = "2022.9.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VWUZYXCLmhSEmXizOd92AIyIbfeoMmMIpVSbrlUWJgw=";
+  };
+
+  pythonImportsCheck = [
+    "xyzservices.providers"
+  ];
+
+  checkInputs = [
+    mercantile
+    pytestCheckHook
+    requests
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/geopandas/xyzservices/releases/tag/${version}";
+    description = "Source of XYZ tiles providers";
+    homepage = "https://github.com/geopandas/xyzservices";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae7c2d07a500..53e16c92e15f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12263,6 +12263,8 @@ self: super: with self; {
 
   xxhash = callPackage ../development/python-modules/xxhash { };
 
+  xyzservices = callPackage ../development/python-modules/xyzservices { };
+
   yabadaba = callPackage ../development/python-modules/yabadaba { };
 
   yahooweather = callPackage ../development/python-modules/yahooweather { };

From 1ac65c004e1954799f54900135a2d89557b77757 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 320/953] python3Packages.bokeh: 2.4.3 -> 3.0.3

---
 pkgs/development/python-modules/bokeh/default.nix  | 11 ++++++++---
 .../bokeh/hardcode-nodejs-npmjs-paths.patch        | 14 +++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 75ca944830f1..c323713c7dc5 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/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
diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
index f8f33c0021f2..fffdea592b73 100644
--- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
+++ b/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

From 664abe1d30f9fa80d386d9175233f20bbd152a3a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 321/953] python3Packages.botocore: 1.29.38 -> 1.29.40

---
 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 1d101b368f93..3a8d90de84c1 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/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 = [

From f8e87178be4da8aa22c59a67edf5b9f50bc88ac5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 322/953] python3Packages.branca: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index e82c5ce78379..bb5b59509801 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/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 ];

From 29bfdbc7af232b9bddaf9a01b0f51ff8546e6c8d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 323/953] python3Packages.browser-cookie3: 0.16.2 -> 0.16.3

---
 .../python-modules/browser-cookie3/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index b072c5576d1f..b3abb49c01cc 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/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

From 5d5c0abf058e4ed2b0fddb635cca0cdbd8281a88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 324/953] python3Packages.bthome-ble: 2.3.1 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 5831ea18ee33..8e25f403a5e8 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/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 = [

From 791de49240f8bff95814de484138882f258a9c67 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:12:59 +0100
Subject: [PATCH 325/953] python3Packages.btrees: 4.11.0 -> 4.11.3

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

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 9f91541599c9..46adf39b502e 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/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 = [

From 50c0b78421a5e5b5bfe5b4530f8a5786d1ea8e85 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 326/953] python3Packages.bytecode: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix
index 648ec29520bf..a9cf3049d72e 100644
--- a/pkgs/development/python-modules/bytecode/default.nix
+++ b/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
   ];

From 72b7f21a1c9bba961954e8863f6881532ff2597a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 327/953] python3Packages.catboost: 1.0.5 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix
index 2c4d3bb23516..0dfc302a49a5 100644
--- a/pkgs/development/python-modules/catboost/default.nix
+++ b/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 ];

From 5632fa15f05d3f673697ff2f0d5293c21af21dac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 328/953] python3Packages.cbor2: 5.4.3 -> 5.4.6

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

diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index 7fd5baf57618..19bc40a1e42d 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/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 = [

From b23069550f4d30c45ae0221e34b0c59dbab339b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 329/953] python3Packages.cepa: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix
index f198d8b058dd..a278d446fce9 100644
--- a/pkgs/development/python-modules/cepa/default.nix
+++ b/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 = ''

From d251aafb314fa14fa681a99eadb0c1c370a3e74c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 330/953] python3Packages.certbot: 1.31.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index c2f3c1f7915f..e66435d8cc33 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/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}";

From 68eff1c4d2de0a806027ce22e76cde5dc1020012 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 331/953] python3Packages.cfn-lint: 0.61.2 -> 0.72.5

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

diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 238f5e83630e..e9aafacec9e9 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/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 = ''

From 9f368220da6066db35480efba0b3c3a9cd92e847 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 332/953] python3Packages.charset-normalizer: 2.1.0 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix
index 9661700a2858..67d6b713c192 100644
--- a/pkgs/development/python-modules/charset-normalizer/default.nix
+++ b/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 = [

From 36bd7d20af4df905333ccf20d8e49b87e289d74c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 333/953] python3Packages.chart-studio: 5.10.0 -> 5.11.0

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

diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
index 3ddcf9599659..a191435331bc 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/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";

From 52f00b87dcea78f6b912957b3de0e81539f3ed6d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:00 +0100
Subject: [PATCH 334/953] python3Packages.cheroot: 8.6.0 -> 9.0.0

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

diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index da5870f7d500..3e80423c4255 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/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 = [

From 9ad4234dea6a6c36483c7ba80176d48a6677f25c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 335/953] python3Packages.chiapos: 1.0.10 -> 1.0.11

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

diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix
index 11452dee2ea5..f8f19e142fbd 100644
--- a/pkgs/development/python-modules/chiapos/default.nix
+++ b/pkgs/development/python-modules/chiapos/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "chiapos";
-  version = "1.0.10";
+  version = "1.0.11";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-2SqWdGzSXs53PafXnCvTGQXNJqD+5gdJnaYi2O2ABLg=";
+    sha256 = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo=";
   };
 
   patches = [

From 1ff8ddb86222cf377433384460a1d91ce8455d50 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 336/953] python3Packages.chia-rs: 0.1.5 -> 0.1.16

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

diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix
index 2df9c16f2a30..0e52842dce9e 100644
--- a/pkgs/development/python-modules/chia-rs/default.nix
+++ b/pkgs/development/python-modules/chia-rs/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "chia-rs";
-  version = "0.1.5";
+  version = "0.1.16";
 
   src = fetchFromGitHub {
     owner = "chia-network";
     repo = "chia_rs";
-    rev = version;
-    sha256 = "sha256-4TIRj7FMIArI/EvDARReC4MqDG44zjn/MKoUHAVqq5s=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {

From ddce16c924b2ed0a6924af17403fdd35ea18b181 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 337/953] python3Packages.chiavdf: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix
index 525bd1748846..4f6c43a9235a 100644
--- a/pkgs/development/python-modules/chiavdf/default.nix
+++ b/pkgs/development/python-modules/chiavdf/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "chiavdf";
-  version = "1.0.7";
+  version = "1.0.8";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-956517eGqRSLg+Y4ybmASiZoypgpYn/D9lbPA4Rcfts=";
+    hash = "sha256-ilT7tCdX8ak3qmpXJ0LITf0ZGAdFSN4tm6GKw06A/m8=";
   };
 
   patches = [

From 6efba12c3a0a9aaf418e6bc2e02d1e6be7529681 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 338/953] python3Packages.cinemagoer: 2022.2.11 -> 2022.12.27

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

diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix
index 8b62a57b306f..b33725d54594 100644
--- a/pkgs/development/python-modules/cinemagoer/default.nix
+++ b/pkgs/development/python-modules/cinemagoer/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "cinemagoer";
-  version = "2022.2.11";
+  version = "2022.12.27";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8efe29dab44a7d275702f3160746015bd55c87b2eed85991dd57dda42594e6c6";
+    sha256 = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo=";
   };
 
   propagatedBuildInputs = [

From 6fbffa480f976977ad3bd2b803cf3ba97cc040e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 339/953] python3Packages.ciso8601: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix
index 0c9a08d33a4f..315fe69b69ad 100644
--- a/pkgs/development/python-modules/ciso8601/default.nix
+++ b/pkgs/development/python-modules/ciso8601/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ciso8601";
-  version = "2.2.0";
+  version = "2.3.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "closeio";
     repo = "ciso8601";
-    rev = "v${version}";
-    sha256 = "sha256-TqB1tQDgCkXu+QuzP6yBEH/xHxhhD/kGR2S0I8Osc5E=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-qTpt91Wf3L6Jl7FU8sn9PvGMRd/cjhQ1mQvUaQeLFQU=";
   };
 
   nativeBuildInputs = [

From c2ea958f132bd9791e7437d904641ea730fed4b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 340/953] python3Packages.clickgen: 1.2.0 -> 2.1.3

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

diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix
index d0f81a20c6d3..5b8d7728c84f 100644
--- a/pkgs/development/python-modules/clickgen/default.nix
+++ b/pkgs/development/python-modules/clickgen/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "clickgen";
-  version = "1.2.0";
+  version = "2.1.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ful1e5";
     repo = "clickgen";
-    rev = "v${version}";
-    sha256 = "sha256-01c8SVy+J004dq5KCUe62w7i/xUTxTfl/IpvUtGQgw0=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw=";
   };
 
   buildInputs = [ libXcursor libX11 libpng ];

From f11dcdc933ad0c50897c201d0175218376d28f31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 341/953] python3Packages.cliff: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix
index d8ff545c848e..34c02b3da389 100644
--- a/pkgs/development/python-modules/cliff/default.nix
+++ b/pkgs/development/python-modules/cliff/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "cliff";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Ow0w56z1DjwhSjnuPmaqLytZV+Kh3jc+F7uo6Yx1AaU=";
+    sha256 = "sha256-u+6CEnMIRyoxI+0QtSiWFsssQ1B0ZW3QcuVTYwU9CRw=";
   };
 
   postPatch = ''

From e44d56c9570110ee8183ed879c4a5a07fa1b2686 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:01 +0100
Subject: [PATCH 342/953] python3Packages.cloudflare: 2.10.1 -> 2.11.1

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

diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index 8e62a08ebf94..5e52ab7c1769 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "cloudflare";
-  version = "2.10.1";
+  version = "2.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wLgb7HnDSX3OVCVNlBd97iIg+g0ngaDWk7Jcs5fKc7k=";
+    hash = "sha256-VAEgrM9F9M/HjL726RzofJT/Sc8R6WIF/D/gZH5ncBs=";
   };
 
   propagatedBuildInputs = [

From 9e84f53110148a8351e85a3c4b0c945bf2ea9d97 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 343/953] python3Packages.cloudsmith-api: 1.142.3 -> 2.0.0

---
 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 ffb9d35d2308..e83e3464ad5d 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.142.3";
+  version = "2.0.0";
 
   format = "wheel";
 
   src = fetchPypi {
     pname = "cloudsmith_api";
     inherit format version;
-    sha256 = "sha256-Cdnsath9p+LPKKzV4cmoOtl4doahi86l1NIgUwliZRU=";
+    sha256 = "sha256-Mcdpmrjg5hX4BTlBgt2+jQaoCqWjNIqkBykl1iT7McA=";
   };
 
   propagatedBuildInputs = [

From 5f58c9f641f355257d1c6851ba75c2dbb404f5c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 344/953] python3Packages.cloup: 1.0.1 -> 2.0.0.post1

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

diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix
index 1ccae736bddb..702a9906868c 100644
--- a/pkgs/development/python-modules/cloup/default.nix
+++ b/pkgs/development/python-modules/cloup/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "cloup";
-  version = "1.0.1";
+  version = "2.0.0.post1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-iQfpz2rl7Y3PJIG2aO+Cu1khx2g68XfOwhkRoENqsTg=";
+    sha256 = "sha256-FDDJB1Bi4Jy2TNhKt6/l1azSit9WHWqzEJ6xl1u9e2s=";
   };
 
   nativeBuildInputs = [

From befddc3068337fbca7cff4634263e624bc2b5c43 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 345/953] python3Packages.ClusterShell: 1.8.4 -> 1.9

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

diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix
index 890c20b0d25a..760971957ed7 100644
--- a/pkgs/development/python-modules/clustershell/default.nix
+++ b/pkgs/development/python-modules/clustershell/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "ClusterShell";
-  version = "1.8.4";
+  version = "1.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081";
+    sha256 = "sha256-A0arNKF9jPRj3GnnOBHG8xDD2YEPpMrPRbZEaKg8FHQ=";
   };
 
   postPatch = ''

From 709107879cd8728ee4aca5bb1c063356a5226f27 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 346/953] python3Packages.cmarkgfm: 0.8.0 -> 2022.10.27

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

diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix
index d609508822e4..3d88048ebdc5 100644
--- a/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "cmarkgfm";
-  version = "0.8.0";
+  version = "2022.10.27";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s=";
+    sha256 = "sha256-k9msdxbqkBygv9GK47aPH2v1HeCDDD8jPvc0/NUqB5k=";
   };
 
   propagatedNativeBuildInputs = [

From 4bb78a9ef55540a1165377428088efdcc9b73e20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 347/953] python3Packages.cmsis-pack-manager: 0.4.0 -> 0.5.1

---
 .../python-modules/cmsis-pack-manager/default.nix          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
index 8c5c8c7afed1..76d7249ca880 100644
--- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix
+++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
@@ -16,11 +16,12 @@
 }:
 let
   pname = "cmsis-pack-manager";
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-NeUG6PFI2eTwq5SNtAB6ZMA1M3z1JmMND29V9/O5sgw=";
+    pname = "cmsis_pack_manager";
+    inherit version;
+    sha256 = "sha256-2pKGJlPubR+C4UhdCuMDR9GG2wQOaP6YkMXxeAcaRkk=";
   };
 
   native = rustPlatform.buildRustPackage {

From 3528b5f5f763635978d463035a983f1239263a54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 348/953] python3Packages.coconut: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix
index 848fb80ff093..2628c19cb46a 100644
--- a/pkgs/development/python-modules/coconut/default.nix
+++ b/pkgs/development/python-modules/coconut/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "coconut";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "evhub";
     repo = "coconut";
-    rev = "v${version}";
-    sha256 = "sha256-TkMwOE/Jug1zKjR1048o/Jmn8o9/oQPNqzwXYakwpgs=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-zDMcQPAYlxid3fcMT8kRzE+LN1dxUVWjkg8pdVtmwZg=";
   };
 
   propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ];

From 2cee609768c8e36619c5ee664a44248ac3c7c432 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 349/953] python3Packages.cocotb: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index 688fc7c367bc..9c06cd2f8b7f 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.7.1";
+  version = "1.7.2";
 
   # pypi source doesn't include tests
   src = fetchFromGitHub {
     owner = "cocotb";
     repo = "cocotb";
-    rev = "v${version}";
-    sha256 = "sha256-wACgT5r0YmSYvLhTsuFhTcJqeCtGGLifOmr7/Lz2Vug=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 44925be96f6918c24f9d93f7473254df1e5010e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 350/953] python3Packages.coincurve: 17.0.0 -> 18.0.0

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

diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix
index 5d259f250b5f..9ffe55d15fd0 100644
--- a/pkgs/development/python-modules/coincurve/default.nix
+++ b/pkgs/development/python-modules/coincurve/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "coincurve";
-  version = "17.0.0";
+  version = "18.0.0";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ofek";
     repo = "coincurve";
-    rev = "v${version}";
-    sha256 = "sha256-7H4/TDxteuMTrj1PdfpA5rc7CegJAOjqn1PteImfGiQ=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-Z5g6ten8wNICoFu7+aZc6r8ET+RDmFeb93ONjsTzcbw=";
   };
 
   postPatch = ''

From 0696f995ae509848a45922c9ee782157093f8d5b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:02 +0100
Subject: [PATCH 351/953] python3Packages.colorcet: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index 33e7942dfc89..dd675373efa6 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "colorcet";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db";
+    sha256 = "sha256-UUVaIDU9EvrJH5U3cthAnyR05qDbGvP6T3AF9AWiSAs=";
   };
 
   propagatedBuildInputs = [

From 7f80647bb138299c143f152f700a2fc5c6b4c558 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 352/953] python3Packages.coverage: 6.4.4 -> 7.0.1

---
 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 b96929640806..7c4b4525c8a1 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.4";
+  version = "7.0.1";
   # uses f strings
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4WxFtyast4Dh5viLKG08ELORSrA0OPMhF8SqUtfzDVg=";
+    sha256 = "sha256-pKV0oZ7rZ1daUyildgu7tzf6poVhZYap+dpCgflAEJw=";
   };
 
   # No tests in archive

From 504f11676d85b1db74b4d4beed9ea4e349f4ca22 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 353/953] python3Packages.crate: 0.28.0 -> 0.29.0

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

diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix
index 228f3bfd63cd..c81f2c733a9f 100644
--- a/pkgs/development/python-modules/crate/default.nix
+++ b/pkgs/development/python-modules/crate/default.nix
@@ -6,17 +6,18 @@
 , isPy3k
 , sqlalchemy
 , pytestCheckHook
+, pytz
 , stdenv
 }:
 
 buildPythonPackage rec {
   pname = "crate";
-  version = "0.28.0";
+  version = "0.29.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-lEELJKIjm4509x9d6n9ee4k81gGmLhy7vliAbZykIpA=";
+    sha256 = "sha256-SywW/b4DnVeSzzRiHbDaKTjcuwDnkwrK6vFfaQVIZhQ=";
   };
 
   propagatedBuildInputs = [
@@ -27,6 +28,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     pytestCheckHook
+    pytz
   ];
 
   disabledTests = [

From 0aeb39115ff074c013947acd1433be4eb5f4fb99 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 354/953] python3Packages.crccheck: 1.1 -> 1.3.0

---
 .../python-modules/crccheck/default.nix       | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix
index a75a0c9611b4..0b2f51c551af 100644
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/pkgs/development/python-modules/crccheck/default.nix
@@ -1,25 +1,34 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
-, nose }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, unittestCheckHook
+}:
 
 let
   pname = "crccheck";
-  version = "1.1";
+  version = "1.3.0";
 in buildPythonPackage {
   inherit pname version;
-
-  checkInputs = [ nose ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96";
-  };
+  format = "setuptools";
 
   disabled = !isPy3k;
 
+  src = fetchFromGitHub {
+    owner = "MartinScharrer";
+    repo = "crccheck";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k=";
+  };
+
+  checkInputs = [
+    unittestCheckHook
+  ];
+
   meta = with lib; {
     description = "Python library for CRCs and checksums";
-    homepage = "https://sourceforge.net/projects/crccheck/";
-    license = licenses.gpl3Plus;
+    homepage = "https://github.com/MartinScharrer/crccheck";
+    license = licenses.mit;
     maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };

From 3f4351acca24301016a72f73a4349abb91ed4fd3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 355/953] python3Packages.croniter: 1.3.7 -> 1.3.8

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

diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 559af64fe83e..6b38e0c02dc7 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "croniter";
-  version = "1.3.7";
+  version = "1.3.8";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cu940PgzfrNTk7iJPr+/vrNA8tKuR+DS14Ew40sN2Lk=";
+    hash = "sha256-MqXsBOl+wIN7zfATdnq9LnHM7u/TwuFMgECYzlGtbNk=";
   };
 
   propagatedBuildInputs = [

From bc31c7fd049af3c9c38e86101864cb258135b33c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 356/953] python3Packages.cssselect2: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix
index 5904f80ac2a2..bb9c16ae744d 100644
--- a/pkgs/development/python-modules/cssselect2/default.nix
+++ b/pkgs/development/python-modules/cssselect2/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "cssselect2";
-  version = "0.6.0";
+  version = "0.7.0";
   format = "pyproject";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-W11t6oGl6wyco58RbIV43UE3eAYMlMH1EZY3FhiQkyU=";
+    sha256 = "sha256-HM2YTauJ/GiVUEOspOGwPgzynK2YgPbijjunp0sUqlo=";
   };
 
   postPatch = ''

From 889618204d89c690906b82e105278323512da345 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 357/953] python3Packages.cupy: 11.2.0 -> 11.4.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 9bc7efafff54..5af0f0813043 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 = "11.2.0";
+  version = "11.4.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wzNh8RejR6Y/aZbql0RtF/HAOPGh9TPlAkZCNQdpI+I=";
+    sha256 = "sha256-A9UrJibgKjorRtcUwc0D5wLI/jORX8ym7Y3lxTmWT0k=";
   };
 
   # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both

From ebbaab656c96aad2f8358655ef1e6fd236949395 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 358/953] python3Packages.cvxpy: 1.2.1 -> 1.2.3

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

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index da5f16d7f32d..89b66127636d 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -17,16 +17,21 @@
 
 buildPythonPackage rec {
   pname = "cvxpy";
-  version = "1.2.1";
+  version = "1.2.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bWdkJkPR3bLyr1m0Zrh9QsSi42eDGte0PDO1nu+ltQ4=";
+    hash = "sha256-IaeUtv0vdgqddm1o++SUZTT2Xom3Pom4icVQOYVVi4Y=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "setuptools <= 64.0.2" "setuptools"
+  '';
+
   propagatedBuildInputs = [
     cvxopt
     ecos

From 5c1ebe5499391cdaca9b4d8f326decc734cc8a8d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 359/953] python3Packages.cwcwidth: 0.1.7 -> 0.1.8

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

diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index fc57df26230a..99be1ee674c1 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "cwcwidth";
-  version = "0.1.7";
+  version = "0.1.8";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wNZH4S46SxWogeHYT3lpN1FmSEieARJXI33CF51rGVE=";
+    sha256 = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y=";
   };
 
   nativeBuildInputs = [ cython setuptools ];

From 611dd9d7e90b013ac42f4db4668fd2b617df8167 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:03 +0100
Subject: [PATCH 360/953] python3Packages.cx-freeze: 6.11.1 -> 6.13.1

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

diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index cb4f7e074ffa..c039222925e4 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "cx-freeze";
-  version = "6.11.1";
+  version = "6.13.1";
 
   src = fetchPypi {
     pname = "cx_Freeze";
     inherit version;
-    sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw=";
+    sha256 = "sha256-9pT1Ta8pLpc9krFN8KLp3b10IGyvMjiaU3Cn4eVAiaQ=";
   };
 
   disabled = pythonOlder "3.5";

From 11d47b76c237d5dc6a44bd295d421f889557912e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 361/953] python3Packages.cymem: 2.0.6 -> 2.0.7

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

diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
index f01011156273..6292bf259ef4 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -7,25 +7,34 @@
 
 buildPythonPackage rec {
   pname = "cymem";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "cymem";
-    rev = "v${version}";
-    sha256 = "sha256-o+44v6wvE9HxeQaDDQ0+gi7z1V7jtkZvWglY8UyVHLg=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck=";
   };
 
   propagatedBuildInputs = [
     cython
   ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   preCheck = ''
-    cd cymem
+    TEMPDIR=$(mktemp -d)
+    cp -R cymem/tests $TEMPDIR/
+    pushd $TEMPDIR
   '';
 
+  postCheck = ''
+    popd
+  '';
+
+
   meta = with lib; {
     description = "Cython memory pool for RAII-style memory management";
     homepage = "https://github.com/explosion/cymem";

From 14d2b144facda75ea7275d295ba618ed8707eefa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 362/953] python3Packages.cytoolz: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
index 42305b455799..85b8c7a11e07 100644
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "cytoolz";
-  version = "0.12.0";
+  version = "0.12.1";
   disabled = isPy27 || isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wQWwX4XgP7zWAkQ3WWjmLkT+eYwVo1Mcki1TEBjSJBI=";
+    sha256 = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4=";
   };
 
   nativeBuildInputs = [ cython ];

From 6ad9cb0b5f4645a45eee094721de30b547021218 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 363/953] python3Packages.dasbus: 1.6 -> 1.7

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

diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix
index 96a4eccbc582..14c2ef9223ec 100644
--- a/pkgs/development/python-modules/dasbus/default.nix
+++ b/pkgs/development/python-modules/dasbus/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "dasbus";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0=";
+    hash = "sha256-qIUNhBrf6O5fe7n4LPRJq5tJUNwGM4lwcXGODQA2tvY=";
   };
 
   propagatedBuildInputs = [ pygobject3 ];

From bd9eec19bb49959263bb414f3a1c3699a0e8095b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 364/953] python3Packages.dash: 2.6.2 -> 2.7.0

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

diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 232cfb0b7f7d..6933af850a54 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "dash";
-  version = "2.6.2";
+  version = "2.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "plotly";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-d2p3ahOqBA4n8XhMR6juluEGNM5EyT+GQFlDcuHZMqs=";
+    hash = "sha256-kxat6CjX4xPEtlhRiYJF5wN2Luds7DduZyiUA9/kKWY=";
   };
 
   propagatedBuildInputs = [

From 26fe500203e3c99fc54a4153bfa8d51ff6beada3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 365/953] python3Packages.databricks-connect: 10.4.12 ->
 10.4.18

---
 .../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 92bbb9f54db2..fa90f3d72fa1 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.12";
+  version = "10.4.18";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-T5KGJQryiE2+x9u+AcvTm6dLpU3kh20sCu0CTwpeJao=";
+    sha256 = "sha256-7lP9pn05EaGLZpaAp+oeed4yLhIjo6/wQg+lDpt1Hwg=";
   };
 
   sourceRoot = ".";

From 549c3904afc16ca351c0a721ff6f83e0d380a610 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 366/953] python3Packages.databricks-sql-connector: 2.0.5 ->
 2.2.1

---
 .../python-modules/databricks-sql-connector/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix
index b9f5561ebe60..d5a765da18bc 100644
--- a/pkgs/development/python-modules/databricks-sql-connector/default.nix
+++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "databricks-sql-connector";
-  version = "2.0.5";
+  version = "2.2.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sql-python";
-    rev = "v${version}";
-    sha256 = "sha256-Qpdyn6z1mbO4bzyUZ2eYdd9pfIkIP/Aj4YgNXaYwxpE=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-EMLUXGeVGIXFeaMvaJ+crivRZtOt7W/LCycIO2gwqXA=";
   };
 
   postPatch = ''

From a3f4dea6fab5e76bdfafa66c68ba37ea6ecef31e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 367/953] python3Packages.dateparser: 1.1.4 -> 1.1.5

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

diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index 950afaabb8dc..e43e8806d655 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "dateparser";
-  version = "1.1.4";
+  version = "1.1.5";
 
   disabled = pythonOlder "3.7";
 
@@ -30,8 +30,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scrapinghub";
     repo = "dateparser";
-    rev = "v${version}";
-    sha256 = "sha256-r13WNI+T2NtTwjnGOqX3ZOqPhvr8fBdXGULW7IXszlo=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-uA49pRlmSWWIOjXa1QDjjuTGMKi25GfokQo4VQsBMlc=";
   };
 
   propagatedBuildInputs = [

From a8c2c310749dfb00f23aad94c2993619b01724cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:04 +0100
Subject: [PATCH 368/953] python3Packages.dbf: 0.99.2 -> 0.99.3

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

diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 6c85d0def6e8..10cf43f4f648 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "dbf";
-  version = "0.99.2";
+  version = "0.99.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0=";
+    hash = "sha256-lAJypyrCfRah22mq/vggaEASzDVT/+mHXVzS46nLadw=";
   };
 
   propagatedBuildInputs = [

From c99d4562c87c80231aeabcb7a604a578208a2bcc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 369/953] python3Packages.dbus-fast: 1.82.0 -> 1.83.1

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

diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix
index f53a895141e1..5bb53995c0ff 100644
--- a/pkgs/development/python-modules/dbus-fast/default.nix
+++ b/pkgs/development/python-modules/dbus-fast/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dbus-fast";
-  version = "1.82.0";
+  version = "1.83.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-mJJElYWTN09zVkx36GqPoILdALAo+fO2JlX4n0dmQ5M=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hfO4dbMA6efQPwP0Bp/5IDb7mLHf1NuTuiJjhHivG6I=";
   };
 
   nativeBuildInputs = [

From 3f02987f098b132bcecadfd07afab29d0def2401 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 370/953] python3Packages.deepmerge: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix
index 148599fe1666..2c685abf8066 100644
--- a/pkgs/development/python-modules/deepmerge/default.nix
+++ b/pkgs/development/python-modules/deepmerge/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "deepmerge";
-  version = "1.0.1";
+  version = "1.1.0";
   disabled = isPy27;
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-S0R3ntPS+3kbsYH8JoNCNJb+pCirt683/rIyht5/Cho=";
+    sha256 = "sha256-TCeg213iheGnzqx9vBUx3qpVa2J96kkAyCRFgezf6i0=";
   };
 
   nativeBuildInputs = [

From c6842afc66569e04fe55b51fb285662b9cfc9349 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 371/953] python3Packages.devpi-common: 3.7.0 -> 3.7.1

---
 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 21beec5b440e..4f3cc587fdc5 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.7.0";
+  version = "3.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM=";
+    sha256 = "sha256-Y4LSWo6sbHn239qSdQjwfZO4cyNyoGFQVVGvZbRgYfQ=";
   };
 
   postPatch = ''

From 8eebf3de300c22f65c54760e917580fdf85677cc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 372/953] python3Packages.diagrams: 0.22.0 -> 0.23.1

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

diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix
index 49fd55545178..46c4a8928a54 100644
--- a/pkgs/development/python-modules/diagrams/default.nix
+++ b/pkgs/development/python-modules/diagrams/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "diagrams";
-  version = "0.22.0";
+  version = "0.23.1";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mingrammer";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-LUuClvBJeOxtrg+S+lYLpP7T1RXCy5dNjFYQO3H54QE=";
+    sha256 = "sha256-gVUlP3offTgHUBTTIzTBf7b2NpBjGlAHYQQxe6ks0v8=";
   };
 
   postPatch = ''

From 2173e845d1702b0a04fdbcd72d043c39a365ebc1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 373/953] python3Packages.dictpath: 0.1.3 -> 0.4.3

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

diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix
index 5a648f7898f5..d6effb6291d6 100644
--- a/pkgs/development/python-modules/dictpath/default.nix
+++ b/pkgs/development/python-modules/dictpath/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "dictpath";
-  version = "0.1.3";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "dictpath";
-    rev = version;
-    sha256 = "0314i8wky2z83a66zggc53m8qa1rjgkrznrl2ixsgiq0prcn6v16";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew=";
   };
 
   postPatch = ''

From b481c6cd13d4d677321d08de8149465bd0d7b056 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 374/953] python3Packages.dicttoxml: 1.7.4 -> 1.7.16

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

diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix
index 9e24784731cf..c4fd5880526a 100644
--- a/pkgs/development/python-modules/dicttoxml/default.nix
+++ b/pkgs/development/python-modules/dicttoxml/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dicttoxml";
-  version = "1.7.4";
+  version = "1.7.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45";
+    sha256 = "sha256-bzbOZEiB21zYlAvum3yz8/a3sye6imfYPT4sqgU4v50=";
   };
 
   # No tests in archive

From ff6f18ab0ced8d2d03e920d28cff790ed034a9e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 375/953] python3Packages.dirty-equals: 0.4 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix
index 0a448b8de7f8..b33591e8d0f9 100644
--- a/pkgs/development/python-modules/dirty-equals/default.nix
+++ b/pkgs/development/python-modules/dirty-equals/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, poetry-core
+, hatchling
 , pytestCheckHook
 , pythonOlder
 , pytz
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dirty-equals";
-  version = "0.4";
+  version = "0.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,17 +18,16 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-rh7N/VRx4sv/MhhGPkaYCn2d19Sv5er2CkG6/fJuXX4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yYptO6NPhQRlF0T2eXliw2WBms9uqTZVzdYzGj9pCug=";
   };
 
   nativeBuildInputs = [
-    poetry-core
+    hatchling
   ];
 
   propagatedBuildInputs = [
     pytz
-  ] ++ lib.optionals (pythonOlder "3.8") [
     typing-extensions
   ];
 

From b3f3622d95b38144e682f4eeb554c2f0459ac32d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 376/953] python3Packages.distributed: 2022.10.2 -> 2022.12.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 6b7f535e5152..ad069f589271 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.10.2";
+  version = "2022.12.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-U/Clv276uaWrM0XNkT9tPz1OpETuLtvqMxx/75b9Z9A=";
+    hash = "sha256-h/7c+/ISbRTDhlyORFxB7Mq9Kwfq/4dSivKv2eIM7Ww=";
   };
 
   postPatch = ''

From bd4551da8a0c937a3d63c5bab543fd8b63be026a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:05 +0100
Subject: [PATCH 377/953] python3Packages.distro: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index deee452ae1b4..73ded7625dca 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -1,14 +1,23 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "distro";
-  version = "1.7.0";
+  version = "1.8.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk=";
+    hash = "sha256-AuER0dxqUKu47ta/McPkjtiwgw0eoqG3jGF2XCUT/dg=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   # tests are very targeted at individual linux distributions
   doCheck = false;
 

From 94a430b4ab8e27862aaf10368dcc4ac18e3e44ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 378/953] python3Packages.django-anymail: 8.6 -> 9.0

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

diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix
index 7936df01bd01..aca3c6735c07 100644
--- a/pkgs/development/python-modules/django-anymail/default.nix
+++ b/pkgs/development/python-modules/django-anymail/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "django-anymail";
-  version = "8.6";
+  version = "9.0";
 
   src = fetchFromGitHub {
     owner = "anymail";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-hLNILUV7qzqHfh7l3SJAoFveUIRSCHTjEQ3ZC3PhZUY=";
+    sha256 = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc=";
   };
 
   propagatedBuildInputs = [

From 9e55d2e1d6e7951cd97fefb64951626f6402c044 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 379/953] python3Packages.django-debug-toolbar: 3.7 -> 3.8.1

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

diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix
index bc54eadde8f7..22b7c8caf752 100644
--- a/pkgs/development/python-modules/django-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix
@@ -3,6 +3,7 @@
 , pythonOlder
 , buildPythonPackage
 , python
+, hatchling
 , django
 , jinja2
 , sqlparse
@@ -11,8 +12,8 @@
 
 buildPythonPackage rec {
   pname = "django-debug-toolbar";
-  version = "3.7";
-  format = "setuptools";
+  version = "3.8.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -20,9 +21,13 @@ buildPythonPackage rec {
     owner = "jazzband";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-LGEx21m5TNotbwKHf5in+EDkYqqNOoF7mBstnfLYe9s=";
+    hash = "sha256-GlEw25wem8iwwm3rYLk6TFEAIzC1pYjpSHdAkHwtFcE=";
   };
 
+  nativeBuildInputs = [
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     django
     jinja2

From 93bc4d366a238eae1d4f60cf154651d5dd9ade55 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 380/953] python3Packages.django-health-check: 3.16.5 -> 3.17.0

---
 .../python-modules/django-health-check/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix
index 6f38ae77e16a..65fea1786943 100644
--- a/pkgs/development/python-modules/django-health-check/default.nix
+++ b/pkgs/development/python-modules/django-health-check/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "django-health-check";
-  version = "3.16.5";
+  version = "3.17.0";
 
   src = fetchFromGitHub {
     owner = "KristianOellegaard";
     repo = pname;
-    rev = version;
-    hash = "sha256-Jfzi+o4ja2sNCSPfX9eRq3WGid1gcfehhayAD1L4f2U=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-f87dgB2pDc+A0h41FX13qTj6Zzw5I4QwsDoC6yPkvAE=";
     leaveDotGit = true;
   };
 

From 7fe3c211e8eb6177fbc0582c1ea077fb71f1d199 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 381/953] python3Packages.django-mailman3: 1.3.7 -> 1.3.8

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

diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 9486764e2783..081b6bbbcb7e 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "django-mailman3";
-  version = "1.3.7";
+  version = "1.3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6ea8c24c13e7afe744f18e18e4d19d0e74223e0d9bd5d782deea85dcb865feb7";
+    sha256 = "sha256-C3ZyiQZ50JFg2e+HS0oIJFK+dV8TcDYehVh875zBRFU=";
   };
 
   propagatedBuildInputs = [

From 1104c3bda53e8753a6a6d9db5679d95e51233d2d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 382/953] python3Packages.django-maintenance-mode: 0.17.1 ->
 0.18.0

---
 .../python-modules/django-maintenance-mode/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix
index d22ae9025f8b..558f0c103388 100644
--- a/pkgs/development/python-modules/django-maintenance-mode/default.nix
+++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "django-maintenance-mode";
-  version = "0.17.1";
+  version = "0.18.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fabiocaccamo";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-/JMdElJsl7f6THUIvp28XcsoP/5Sa31XzGl3PZFPAH8=";
+    hash = "sha256-Mcj8O20hCINGf5T3PCG9jq0onSrm4R+Ke5CLMqMDmuU=";
   };
 
   propagatedBuildInputs = [

From 2d7acf7ea7c6b2f54a551b9137163d3767d01ab0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 383/953] python3Packages.djangorestframework-dataclasses:
 1.1.1 -> 1.2.0

---
 .../djangorestframework-dataclasses/default.nix      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
index c6b56651f927..4242c24c90bf 100644
--- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
@@ -2,19 +2,25 @@
 , buildPythonPackage
 , fetchFromGitHub
 , djangorestframework
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "djangorestframework-dataclasses";
-  version = "1.1.1";
+  version = "1.2.0";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "oxan";
     repo = "djangorestframework-dataclasses";
-    rev = "v${version}";
-    sha256 = "sha256-wXgA/4Dik6yG0nKl9GbrHgb2lhrPsgS23+cEyaD9MRY=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   postPatch = ''
     patchShebangs manage.py
   '';

From 23d19c155db102daae6b3586150739d1ecd220fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 384/953] python3Packages.django-rq: 2.5.1 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index ebdbd916ef1d..d0894177c3f9 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -10,15 +10,15 @@
 
 buildPythonPackage rec {
   pname = "django-rq";
-  version = "2.5.1";
+  version = "2.6.0";
   format = "setuptools";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-4oc3zco/j4lnAiooW87rU6xkzGSGCj3fIyikjiKQNZk=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-Na/GeQc74LCoi7Dp3HcSnmUaLi1EjyYYgZTcFyzqOQM=";
   };
 
   propagatedBuildInputs = [

From 7dc7b648b9dc22c3809e1f47d45ffd2c090a9856 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:06 +0100
Subject: [PATCH 385/953] python3Packages.django-stubs: 1.12.0 -> 1.13.1

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

diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix
index a03ed9aae01a..0ecb78f47546 100644
--- a/pkgs/development/python-modules/django-stubs/default.nix
+++ b/pkgs/development/python-modules/django-stubs/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "django-stubs";
-  version = "1.12.0";
+  version = "1.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6os10NpJ97LumaeRJfGUPgM0Md0RRybWZDzDXeYZIw4=";
+    sha256 = "sha256-vMYYujU9q8VA2YK52sHVoZIWUvj8KhNlPVRaV9XjzA8=";
   };
 
   propagatedBuildInputs = [

From 739f9ec459f46847096fbd9b9e437b325ac3d231 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 386/953] python3Packages.django-webpack-loader: 1.7.0 -> 1.8.0

---
 .../python-modules/django-webpack-loader/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index 67d6035696ed..7b5b6c67cff4 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "django-webpack-loader";
-  version = "1.7.0";
+  version = "1.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8=";
+    hash = "sha256-puZ5gF6WB7Bz7lJwLZtCa6waVGCdlmExqkNMeGAqwFA=";
   };
 
   propagatedBuildInputs = [

From 7dfcfa450083b8df50309b79ac7aaadc1b7456bf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 387/953] python3Packages.dm-env: 1.5 -> 1.6

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

diff --git a/pkgs/development/python-modules/dm-env/default.nix b/pkgs/development/python-modules/dm-env/default.nix
index 92c234c215c3..37e645c1ec35 100644
--- a/pkgs/development/python-modules/dm-env/default.nix
+++ b/pkgs/development/python-modules/dm-env/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "dm-env";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Pv2ZsGUlY1mVB8QV1ItRiWyIvi8BwrYlCvi6tRVx41M=";
+    sha256 = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94=";
   };
 
   buildInputs = [

From ecf75d8102b0235a4b66ec40e0b900fc1ea0936a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 388/953] python3Packages.dm-haiku: 0.0.7 -> 0.0.9

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

diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
index 87de983330c2..c756ff67a138 100644
--- a/pkgs/development/python-modules/dm-haiku/default.nix
+++ b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "dm-haiku";
-  version = "0.0.7";
+  version = "0.0.9";
 
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Qa3g3vOPZJt/wBjjuZHAcFUz/gwN/yvirV/8V9CnIko=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-d5THbfMRrbBL/2sQ99l2yeaTI9gT+bSkcxmVdRJT5bA=";
   };
 
   outputs = [

From 47842ee610638751854dabf2267809e8a383951a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 389/953] python3Packages.dm-tree: 0.1.7 -> 0.1.8

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

diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix
index 1b9437096648..837895dcd8ca 100644
--- a/pkgs/development/python-modules/dm-tree/default.nix
+++ b/pkgs/development/python-modules/dm-tree/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "dm-tree";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = "tree";
-    rev = version;
-    hash = "sha256-rg6dcGcbTGfK3h4WAyhwCjgM3o64Jj2SImxNsZXJHHM=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc=";
   };
 
   patches = [

From 0d884bf03f18c05c0f7e9eb01cd7b2b1fc1cbe31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 390/953] python3Packages.docplex: 2.23.222 -> 2.24.232

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

diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix
index 5f64ee3a6fe7..3a7c5f74a439 100644
--- a/pkgs/development/python-modules/docplex/default.nix
+++ b/pkgs/development/python-modules/docplex/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "docplex";
-  version = "2.23.222";
+  version = "2.24.232";
 
   # No source available from official repo
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4=";
+    sha256 = "sha256-Mo4Ih/2ltIonP37BDyCi0fY2bkPt2ij1F0A1Ws1sF1g=";
   };
 
   propagatedBuildInputs = [

From be4701a19789dfb2eb47f08cb85c2a2078c0f7d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 391/953] python3Packages.dpath: 2.0.6 -> 2.1.3

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

diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix
index b6f0176dd737..acc8d75e000e 100644
--- a/pkgs/development/python-modules/dpath/default.nix
+++ b/pkgs/development/python-modules/dpath/default.nix
@@ -4,26 +4,26 @@
 , hypothesis
 , isPy27
 , mock
-, nose
+, nose2
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "dpath";
-  version = "2.0.6";
+  version = "2.1.3";
 
   disabled = isPy27; # uses python3 imports
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Wh3a5SIz+8jvgbFfuFBzqBEmu0NpjT86G2qvVhpGzcA=";
+    sha256 = "sha256-0aeg5kJ9CkFWx5LILK8fAQlgP2is55LjbKRZb9LLjZ0=";
   };
 
   # use pytest as nosetests hangs
   checkInputs = [
     hypothesis
     mock
-    nose
+    nose2
     pytestCheckHook
   ];
 

From 700bba8df45012024bb8dcd4ff1cdaa53204623a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 392/953] python3Packages.drf-writable-nested: 0.6.4 -> 0.7.0

---
 .../python-modules/drf-writable-nested/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix
index 77ce7d37ff8d..eaf5aa1b9e1f 100644
--- a/pkgs/development/python-modules/drf-writable-nested/default.nix
+++ b/pkgs/development/python-modules/drf-writable-nested/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "drf-writable-nested";
-  version = "0.6.4";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "beda-software";
     repo = "drf-writable-nested";
-    rev = "v${version}";
-    sha256 = "sha256-RybtXZ5HipQHaA2RV6TOKIpl6aI9V49mqXDhCH6lg58=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk=";
   };
 
   propagatedBuildInputs = [

From a05f69498ff324feffb2b1b15999383113205f2a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 393/953] python3Packages.drms: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix
index a081a7445c4a..8595c8c1cadd 100644
--- a/pkgs/development/python-modules/drms/default.nix
+++ b/pkgs/development/python-modules/drms/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "drms";
-  version = "0.6.2";
+  version = "0.6.3";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o=";
+    sha256 = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw=";
   };
 
   nativeBuildInputs = [
@@ -38,6 +38,14 @@ buildPythonPackage rec {
     pytest-doctestplus
   ];
 
+  disabledTests = [
+    "test_query_hexadecimal_strings"
+  ];
+
+  disabledTestPaths = [
+    "docs/tutorial.rst"
+  ];
+
   pythonImportsCheck = [ "drms" ];
 
   meta = with lib; {

From 2b1ff45e540b178c6b3e6c9972ab6f0b1cb38e5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:07 +0100
Subject: [PATCH 394/953] python3Packages.dropbox: 11.35.0 -> 11.36.0

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

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 125e61a89d28..6355ed16b9bd 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "11.35.0";
+  version = "11.36.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "dropbox";
     repo = "dropbox-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vrOqsRe2sBsL5CIfGCmoO3geE9G0FJl88HRcP6FzZe0=";
+    hash = "sha256-J2AaGkD4TMDcVzTtdcNH0bgy6de+BRjYdtTaRL3lYrs=";
   };
 
   propagatedBuildInputs = [

From 646aab034012c2d9c0d19afb58fde3eeadc669da Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 395/953] python3Packages.dsmr-parser: 0.34 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index 883ea432cd22..16d85a93b0cb 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dsmr-parser";
-  version = "0.34";
+  version = "1.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ndokter";
     repo = "dsmr_parser";
-    rev = "v${version}";
-    sha256 = "sha256-GO+lSgTmFgi/ljt99mteoot+p5BJnGb6ZFky5I3I6Io=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-UjwrlNPnv/iBFiX65tcOZjkdC7gZsJzxxCtPdYTdl6Q=";
   };
 
   propagatedBuildInputs = [

From b5a492ed580aca15ef529cd57c3d5f238763e8ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 396/953] python3Packages.dunamai: 1.13.1 -> 1.15.0

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

diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix
index 65a9f4b0dcb0..e8866b7a1d73 100644
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@@ -7,11 +7,12 @@
 , packaging
 , pytestCheckHook
 , setuptools
+, git
 }:
 
 buildPythonPackage rec {
   pname = "dunamai";
-  version = "1.13.1";
+  version = "1.15.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +21,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = "dunamai";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-UoqVfRdwOgxNLY17+dPgYO1GIPw3ZUwE/tiVzHjBxcY=";
+    sha256 = "sha256-dqMI51UHbkyfkxAPojRlS6qew2Ob4LbUkYua6zmcQgc=";
   };
 
   nativeBuildInputs = [
@@ -36,9 +37,14 @@ buildPythonPackage rec {
   # needs to be able to run dunami from PATH
   preCheck = ''
     export PATH=$PATH:$out/bin
+    export HOME=$(mktemp -d)
+
+    git config --global user.email "nobody@example.com"
+    git config --global user.name "Nobody"
   '';
 
   checkInputs = [
+    git
     pytestCheckHook
     setuptools
   ];

From 5fe30da12b520ff7aa3390b1816a94823961475e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 397/953] python3Packages.dvc-data: 0.1.13 -> 0.28.4

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

diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index f5fc366c5f58..db7a8fe62fc1 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "0.1.13";
+  version = "0.28.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA=";
+    hash = "sha256-ocwOIhguH460+HJ0sE5Wj+KOiyG4NprJ+QaO+YtfTGU=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 777d2dd69b557b78a7411eb44b0b42429a4bd7c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 398/953] python3Packages.dvclive: 0.10.0 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 1507156112d1..ffa8d68e0bdd 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "0.10.0";
+  version = "1.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8=";
+    hash = "sha256-FAupTvaOLPp5EQ0vvE8tQCa8WnKW/qrQTc7i+6F7F1A=";
   };
 
   nativeBuildInputs = [

From 38b979a0feebf54b33ac8141e1a7ccd15c5ac5d6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 399/953] python3Packages.dvc-objects: 0.1.7 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix
index 7e6a37a12d90..ec02d79b3ab8 100644
--- a/pkgs/development/python-modules/dvc-objects/default.nix
+++ b/pkgs/development/python-modules/dvc-objects/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-objects";
-  version = "0.1.7";
+  version = "0.14.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE=";
+    hash = "sha256-Refpekyr114mIGvbaAynxldA+s83EtALeLoTQO73b/M=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 1a160a5bf815eef58fd71cc3124a0aad462ef071 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 400/953] python3Packages.dvc-render: 0.0.9 -> 0.0.17

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

diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix
index 3b85d63e8bba..d8996ef8a4cb 100644
--- a/pkgs/development/python-modules/dvc-render/default.nix
+++ b/pkgs/development/python-modules/dvc-render/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-render";
-  version = "0.0.9";
+  version = "0.0.17";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-ZUIyNg+PTj5CWC65RqB1whnB+pUp1yNJQj43iSBcyvU=";
+    hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 6d524287e8300a769b9aaf76f1e90fe0b7d5804f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 401/953] python3Packages.dvc-task: 0.1.2 -> 0.1.9

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

diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index 6c9eb60c6c54..18cf6e572f8c 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-task";
-  version = "0.1.2";
+  version = "0.1.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = pname;
-    rev = version;
-    hash = "sha256-LXjfFuLifgzU+3/EevycVCR7LhYBOoN6xg4YeNo5R4M=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-+v1M8bKcHWUTz4DJ85tB1qdFYKI0k8TS/Dvf166o920=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 8fd0f69906aa586f315cb2992b337172219d38e9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 402/953] python3Packages.edalize: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix
index 4e220ba64667..796213693286 100644
--- a/pkgs/development/python-modules/edalize/default.nix
+++ b/pkgs/development/python-modules/edalize/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "edalize";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "olofk";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-fpUNCxW7+uymodJ/yGME9VNcCEZdBROIdT1+blpgkzA=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-h6b0mdAUR4NsN2SpnLu5OgS9Fy9ZRitG+5Sbon1jlUM=";
   };
 
   postPatch = ''

From 19db939222513d55edd10e7572e5e8f356e71461 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:08 +0100
Subject: [PATCH 403/953] python3Packages.editdistance: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix
index 41d4a5003424..a01a505dde83 100644
--- a/pkgs/development/python-modules/editdistance/default.nix
+++ b/pkgs/development/python-modules/editdistance/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "editdistance";
-  version = "0.6.1";
+  version = "0.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "roy-ht";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-c0TdH1nJAKrepatCSCTLaKsDv9NKruMQadCjclKGxBw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-42PEK2KhR7rZLfNX9T45V6on+5CoINfKvntz/YQBJco=";
   };
 
   nativeBuildInputs = [

From cd3221b60d38beb5cabdb786a7ecfa1dc883ea73 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 404/953] python3Packages.einops: 0.4.1 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index 44b380e10328..0e7f83f92ead 100644
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "einops";
-  version = "0.4.1";
+  version = "0.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "arogozhnikov";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-n4R4lcRimuOncisCTs2zJWPlqZ+W2yPkvkWAnx4R91s=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw=";
   };
 
   checkInputs = [

From a5b9c971c9ed2b3824a165fc9427204ffc027d88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 405/953] python3Packages.elementpath: 2.5.3 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 95c201afc4cd..0aa5c6583784 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -6,7 +6,7 @@
 
 buildPythonPackage rec {
   pname = "elementpath";
-  version = "2.5.3";
+  version = "3.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+NCsWPt5yMXe+GR9nEBU7byYhKrH/6xghQioj9AOGm4=";
+    hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc=";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this

From a5d76185996358cf2c67c7aa94e0d2d095e3e15d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 406/953] python3Packages.email-validator: 1.2.1 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix
index cb553c4fd5f6..d94c9c7496bc 100644
--- a/pkgs/development/python-modules/email-validator/default.nix
+++ b/pkgs/development/python-modules/email-validator/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "email-validator";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "JoshData";
     repo = "python-${pname}";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-Avsqaev3LMoymU06y+u8MMv38ZI2cWk5tc/MkO+9oyA=";
+    sha256 = "sha256-mflUF2ZKYhCiQEoG+fKI+K266dukuSzG9cyg6gwBcTo=";
   };
 
   propagatedBuildInputs = [

From 556c1666d5edd37d26f11b559d9a4bc36e2f3f1b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 407/953] python3Packages.ephem: 4.1.3 -> 4.1.4

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

diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix
index a5a87f908d4f..d5eac46926ca 100644
--- a/pkgs/development/python-modules/ephem/default.nix
+++ b/pkgs/development/python-modules/ephem/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ephem";
-  version = "4.1.3";
+  version = "4.1.4";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-f6GGhZgbpSjt1QQFKp1SEqCapb8VwRpzTtxqhuiotWo=";
+    sha256 = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A=";
   };
 
   checkInputs = [

From 63d6b667e13fa2f5477015d9b8a720f06a14d9a9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 408/953] python3Packages.etils: 0.8.0 -> 0.9.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 d40bf842fdb5..10f9b3517215 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.8.0";
+  version = "0.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0dWve9nHhKJzxOHsz6qP6speBIGghxe1MT+iMdoiqQM=";
+    hash = "sha256-SJED6eSZpWZ2XGBFjuFdGFzwBl8gYKTRamj49Gli7Q0=";
   };
 
   nativeBuildInputs = [

From 5ccd2a636eadc0ad193264111c5f2a4a7e6a3952 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 409/953] python3Packages.etuples: 0.3.5 -> 0.3.8

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

diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix
index 5ad7696ae1cf..31a3c9198c7d 100644
--- a/pkgs/development/python-modules/etuples/default.nix
+++ b/pkgs/development/python-modules/etuples/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "etuples";
-  version = "0.3.5";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "etuples";
-    rev = "v${version}";
-    sha256 = "sha256-gJNxrO2d/eF4t3bBlz/BwF+9eT1nKrVrTP3F6/dEN00=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-wEgam2IoI3z75bN45/R9o+0JmL3g0YmtsuJ4TnZjhi8=";
   };
 
   propagatedBuildInputs = [

From 48e55693481f59d5f6bdca6409c4b0b87d13f49b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 410/953] python3Packages.faker: 14.2.0 -> 15.3.4

---
 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 9b8e6f7574a1..16ce62cde8b9 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 = "14.2.0";
+  version = "15.3.4";
 
   src = fetchPypi {
     pname = "Faker";
     inherit version;
-    hash = "sha256-bbVuLEOit0JQ0cMy7yX+99wH3LbF+rUynde0RnuO17k=";
+    hash = "sha256-LVRDck9kDOB2WMqMqLvUDSa1iRTmPuxlSXJ4aapn4sw=";
   };
 
   propagatedBuildInputs = [

From 1ef490720f127cb2569ccd3884ca551c2a328d74 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 411/953] python3Packages.fake-useragent: 0.1.11 -> 1.1.1

---
 .../python-modules/fake-useragent/default.nix | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix
index 9b207a81c3c7..5c3db0e4d1ba 100644
--- a/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/pkgs/development/python-modules/fake-useragent/default.nix
@@ -1,17 +1,43 @@
-{ lib, fetchPypi, buildPythonPackage, six, pytest }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, importlib-metadata
+, importlib-resources
+, setuptools
+, pythonOlder
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "fake-useragent";
-  version = "0.1.11";
+  version = "1.1.1";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161";
+  src = fetchFromGitHub {
+    owner = "fake-useragent";
+    repo = "fake-useragent";
+    rev = "refs/tags/${version}";
+    hash = "sha256-MKVJM8bduvA03xzL954huoCge7enG2BJtxZEAvo6HIY=";
   };
 
-  propagatedBuildInputs = [ six ];
+  postPatch = ''
+    sed -i '/addopts/d' pytest.ini
+  '';
 
-  checkInputs = [ pytest ];
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+  ] ++ lib.optionals (pythonOlder "3.10") [
+    importlib-resources
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Up to date simple useragent faker with real world database";

From a2b05741e7df90ebc82ba31ce56a81b1f602c6d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:09 +0100
Subject: [PATCH 412/953] python3Packages.falcon: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
index 89d047e968aa..0ade6a2718ca 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -28,15 +28,15 @@
 
 buildPythonPackage rec {
   pname = "falcon";
-  version = "3.1.0";
+  version = "3.1.1";
   format = "pyproject";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "falconry";
     repo = pname;
-    rev = version;
-    hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-5Lhz4qI/x7yK9tqQg4CvYNug+fp9l6ErNGH1pVybZ6c=";
   };
 
   nativeBuildInputs = [

From 2544c1dd6a8edc3ca07a667b0dd65a5750f83a9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:10 +0100
Subject: [PATCH 413/953] python3Packages.fastapi: 0.85.2 -> 0.88.0

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

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index f42188fb13ee..5cfdeb6f4e9a 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.85.2";
+  version = "0.88.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-j3Set+xWNcRqbn90DJOJQhMrJYI3msvWHlFvN1habP0=";
+    hash = "sha256-2rjKmQcehqkL5OnmtLRTvsyUSpK2aUgyE9VLvz+oWNw=";
   };
 
   nativeBuildInputs = [

From f62358c7469d28c4b41ae2035bee759d853bd024 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:10 +0100
Subject: [PATCH 414/953] python3Packages.ffmpeg-progress-yield: 0.3.0 -> 0.6.1

---
 .../ffmpeg-progress-yield/default.nix               | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
index b5880a21b70e..13e2055cd70d 100644
--- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
+++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
@@ -5,20 +5,27 @@
 , tqdm
 , pytestCheckHook
 , ffmpeg
+, procps
 }:
 
 buildPythonPackage rec {
   pname = "ffmpeg-progress-yield";
-  version = "0.3.0";
+  version = "0.6.1";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/FkVzssJZYafn3MlN8bODd7kA917x9oW0JivIOWxl+8=";
+    hash = "sha256-JLwvJcYcSe5Z7In34pQqHptd8TCrXJeJ6zPiGGv4T14=";
   };
 
   propagatedBuildInputs = [ colorama tqdm ];
 
-  checkInputs = [ pytestCheckHook ffmpeg ];
+  checkInputs = [ pytestCheckHook ffmpeg procps ];
+
+  disabledTests = [
+    "test_quit"
+    "test_quit_gracefully"
+  ];
 
   pytestFlagsArray = [ "test/test.py" ];
 

From bb90ae6dad80fcc9f9d93acee6df86c332c31857 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:10 +0100
Subject: [PATCH 415/953] python3Packages.flake8-future-import: 0.4.6 -> 0.4.7

---
 .../python-modules/flake8-future-import/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index 699d37770a36..91bab299743e 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
-  version = "0.4.6";
+  version = "0.4.7";
 
   # PyPI tarball doesn't include the test suite
   src = fetchFromGitHub {
     owner = "xZise";
     repo = "flake8-future-import";
-    rev = version;
-    sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0=";
   };
 
   patches = lib.optionals (pythonAtLeast "3.10") [

From 84aa32858fd8e4f3dfd1831df99bcb6f1000d8ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:10 +0100
Subject: [PATCH 416/953] python3Packages.flake8-length: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix
index 6f82b8dd50be..ab8b5e77fa39 100644
--- a/pkgs/development/python-modules/flake8-length/default.nix
+++ b/pkgs/development/python-modules/flake8-length/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "flake8-length";
-  version = "0.3.0";
+  version = "0.3.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6e3c068005b0b3b5c8345923fe3e9a107c980baa1354dd19d820018f87409427";
+    sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA=";
   };
 
   propagatedBuildInputs = [

From 46a2dfc094052eaec32f82b2eeea9bfc3f2fc2aa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:10 +0100
Subject: [PATCH 417/953] python3Packages.Flask-SQLAlchemy: 2.5.1 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index c7cc7351e66e..fac30ca41558 100644
--- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pdm-pep517
 , flask
 , mock
 , sqlalchemy
@@ -9,13 +10,18 @@
 
 buildPythonPackage rec {
   pname = "Flask-SQLAlchemy";
-  version = "2.5.1";
+  version = "3.0.2";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912";
+    hash = "sha256-FhmfWz3ftp4N8vUq5Mdq7b/sgjRiNJ2rshobLgorZek=";
   };
 
+  nativeBuildInputs = [
+    pdm-pep517
+  ];
+
   propagatedBuildInputs = [
     flask
     sqlalchemy

From fe0048c7f8d869993b486b243dec94204bcf0c08 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:10 +0100
Subject: [PATCH 418/953] python3Packages.flax: 0.6.1 -> 0.6.3

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

diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index d9171d14e41d..450f8066789e 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "flax";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A=";
+    sha256 = "sha256-4BYfrwEddA2LCMyDO6PBBYdMVTqqDxhzMCZ5JIIml3g=";
   };
 
   buildInputs = [ jaxlib ];

From b8e97ee5dbb2d9749abdf2a29024f05ecbcd3c00 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:10 +0100
Subject: [PATCH 419/953] python3Packages.folium: 0.12.1.post1 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index 9b8f3c080bae..5ad86c3ef8b5 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -17,15 +17,15 @@
 
 buildPythonPackage rec {
   pname = "folium";
-  version = "0.12.1.post1";
+  version = "0.14.0";
 
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "python-visualization";
     repo = "folium";
-    rev = "v${version}";
-    sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14=";
   };
 
   patches = [

From 0fd824805b521896b07fa80f30c37625c5a3aea1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:11 +0100
Subject: [PATCH 420/953] python3Packages.fontmake: 3.4.0 -> 3.5.1

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

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 87fc01f83df9..1d9c08a81c12 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "fontmake";
-  version = "3.4.0";
+  version = "3.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-g/JTmYE078qAFcTVCumVvGj65LbnDsCIUsFfqVlihTk=";
+    sha256 = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0=";
     extension = "zip";
   };
 

From 123abe7e207ed4535b2ebe43ad2d4f4738726ab5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:11 +0100
Subject: [PATCH 421/953] python3Packages.fontParts: 0.10.8 -> 0.11.0

---
 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 6a595e29079e..403039b5f63d 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.8";
+  version = "0.11.0";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LwEhvLqx3Vu1omc/QrGCptQD25Tbv9Ok5eTURL3hvEQ=";
+    sha256 = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg=";
     extension = "zip";
   };
 

From a80621064228f8a822b5bf7bea41054b9dee68dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:11 +0100
Subject: [PATCH 422/953] python3Packages.fonttools: 4.34.4 -> 4.38.0

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

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index cfcabbddc289..f67f7e2f3280 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "4.34.4";
+  version = "4.38.0";
 
   disabled = pythonOlder "3.7";
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner  = pname;
     repo   = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-GwbcrDsfxs5qRQJozhK/+n3W3NlO39g7pzxL9iIiDfU=";
+    sha256 = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From d0dbfc1c42891f5e7f007443ba658a445f52456c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:11 +0100
Subject: [PATCH 423/953] python3Packages.galois: 0.1.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix
index 3c0ba94d3ab4..f617078833c5 100644
--- a/pkgs/development/python-modules/galois/default.nix
+++ b/pkgs/development/python-modules/galois/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "galois";
-  version = "0.1.1";
+  version = "0.3.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mhostetter";
     repo = "galois";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-ekbebwsdGkINdOFI+LLdwTRBN6d8mlNmftkj5SNRKNI=";
+    sha256 = "sha256-8YxC0QYZqgUIKlYLXnm5+tfojQOmOX63dD7cxBO+0Gg=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 64fc420d491c006756b1ec0df7a07cc3ee9f016c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:11 +0100
Subject: [PATCH 424/953] python3Packages.gdown: 4.5.4 -> 4.6.0

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

diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix
index 09f7ca4c8560..c7ddc590d97d 100644
--- a/pkgs/development/python-modules/gdown/default.nix
+++ b/pkgs/development/python-modules/gdown/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "gdown";
-  version = "4.5.4";
+  version = "4.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-av9n0esi+zpa7StFY3lKo1Bsct8IP4ax7EkyUnCcpo8=";
+    hash = "sha256-XOPbCu2lT0bKrLLfhvMcPj7NF8NVaJ5kVthftSi6l0k=";
   };
 
   propagatedBuildInputs = [

From e1a63cb4ff5b9b4112387547375bc3485cefd9ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:11 +0100
Subject: [PATCH 425/953] python3Packages.gensim: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 3a6fc0d254a9..ca594e747fc7 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "gensim";
-  version = "4.2.0";
+  version = "4.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE=";
+    hash = "sha256-ZL1+ximQIVh4gi6LJWnRg1BU9WzfU2AN3+mSfjHztI0=";
   };
 
   nativeBuildInputs = [

From 5b203e9d1eb88b9c975a5b451a67263dc1580846 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:11 +0100
Subject: [PATCH 426/953] python3Packages.gevent: 21.12.0 -> 22.10.2

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

diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 28a089296481..690c0b73e6ea 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "21.12.0";
+  version = "22.10.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4=";
+    hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY=";
   };
 
   nativeBuildInputs = [

From 355d70c1f7e40bf7ae7808970619d4e41c14d179 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:12 +0100
Subject: [PATCH 427/953] python3Packages.gitdb: 4.0.9 -> 4.0.10

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

diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix
index 0895270d6c9c..3528bb2bcab6 100644
--- a/pkgs/development/python-modules/gitdb/default.nix
+++ b/pkgs/development/python-modules/gitdb/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "gitdb";
-  version = "4.0.9";
+  version = "4.0.10";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa";
+    sha256 = "sha256-brmQtp304VutiZ6oaNxGVyw/dTOXNWY7gd55sG8X65o=";
   };
 
   propagatedBuildInputs = [ smmap ];

From 5c8fa3c9b82599b4854394c4f0662116148cade7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:12 +0100
Subject: [PATCH 428/953] python3Packages.glean-parser: 6.2.0 -> 6.4.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 8164d6099a45..706ce1523fe5 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.2.0";
+  version = "6.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-PKUc1PYfM4MxDFErV4zYyHl/mkPQNvIcjNaDekenHc8=";
+    hash = "sha256-9+U9kRMkcQY0tjao6Pmi0STqh0xw0pFU0/xZXlawkKM=";
   };
 
   postPatch = ''

From c6819028898dff46016c7d40b2d86a6855598779 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:12 +0100
Subject: [PATCH 429/953] python3Packages.google-api-python-client: 2.61.0 ->
 2.70.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 73f8310cc0d8..ba4388c25699 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.61.0";
+  version = "2.70.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-3goMt7sY6/9c99x4K0ikiKFL12hLU4eZ8xvtq33iuD8=";
+    sha256 = "sha256-Ji3glNWjDTN/WeZlgQGf7UW2mMB4OXrEjdMjwJaCNuc=";
   };
 
   propagatedBuildInputs = [

From 1b9ee1965bcbc966efbc1acec74828864374a576 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:12 +0100
Subject: [PATCH 430/953] python3Packages.googleapis-common-protos: 1.56.4 ->
 1.57.0

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

diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix
index 2c35387b124d..7ac264a649c6 100644
--- a/pkgs/development/python-modules/googleapis-common-protos/default.nix
+++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
-  version = "1.56.4";
+  version = "1.57.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wlhzxHJ5OHz9y9r6NhSYh5AdNiAstkWg5PKWhr9uRBc=";
+    sha256 = "sha256-J6hJ1iBYOPtsw8HCHLmABwemYbshxs5/sT6Z6x+KDEY=";
   };
 
   propagatedBuildInputs = [ grpc protobuf ];

From 2ee57e76fddb3246380a8d6b2f65c41a11524101 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:12 +0100
Subject: [PATCH 431/953] python3Packages.google-auth-oauthlib: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 9f70702883a0..7fff0ba5b225 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-auth-oauthlib";
-  version = "0.7.0";
+  version = "0.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-2xG85LPv/Jm1GOwiopA0cOCFPAySvldpTjaE5zjSJRM=";
+    sha256 = "sha256-gQVqMQ+xxKPlp+GkQ+Hrllk8a7xVsmwCYeTTKV0+ZZM=";
   };
 
   propagatedBuildInputs = [

From 578ac814ce9893fafed73db9908d209dc5e030d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:13 +0100
Subject: [PATCH 432/953] python3Packages.google-cloud-automl: 2.8.3 -> 2.9.0

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

diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index c9f5c994aae4..51fb6d04dcf6 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-automl";
-  version = "2.8.3";
+  version = "2.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aMkYgmx4TDGSW2/0KB7FTNUHUxtTaVpmeDiIWq7Z5lc=";
+    hash = "sha256-8E+RvHHs4IK1RrbTtY8wwuBLNQKcDnb058vN6hKfy6Q=";
   };
 
   propagatedBuildInputs = [

From 53068b18bb1ef6e2203bdc67fbcc5d80556e27c5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:13 +0100
Subject: [PATCH 433/953] python3Packages.google-cloud-datastore: 2.9.0 ->
 2.11.0

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

diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 72b9d4efb80e..af1f15ffd076 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "2.9.0";
+  version = "2.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8/gmeLpdheW7M9nhM0uTlxrpeRcODSgLVOVKPj9O870=";
+    hash = "sha256-PSk6IYBfGL7g0FBCqUgT4T8k1IYprtLGQQQEybEO99o=";
   };
 
   propagatedBuildInputs = [

From 60134e8c01ad178a9653748763ad638a0903f133 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:16 +0100
Subject: [PATCH 434/953] python3Packages.govee-ble: 0.19.3 -> 0.21.0

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

diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix
index 7cee9b5713e7..abbac7610982 100644
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "govee-ble";
-  version = "0.19.3";
+  version = "0.21.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-HoEWFwpEzlTVlCD1sPOSKhvZleErxJdaqxKPv+1PcGo=";
+    hash = "sha256-BObJQTt1l+fFh02/zhcKRNRs0LQl+oJelMQq9EW2XuY=";
   };
 
   nativeBuildInputs = [

From 7015a5c503b34ac36f6e9779b07cec5b2ed9fc35 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:16 +0100
Subject: [PATCH 435/953] python3Packages.graspologic: 1.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix
index f16ba5fc4c77..c1dde12b3e0b 100644
--- a/pkgs/development/python-modules/graspologic/default.nix
+++ b/pkgs/development/python-modules/graspologic/default.nix
@@ -15,15 +15,15 @@
 
 buildPythonPackage rec {
   pname = "graspologic";
-  version = "1.0.0";
+  version = "2.0.1";
 
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "graspologic";
-    rev = "v${version}";
-    sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs=";
   };
 
   propagatedBuildInputs = [

From f275e309904c9d8081195c3c5783ccc4c1666f4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:16 +0100
Subject: [PATCH 436/953] python3Packages.greenlet: 1.1.3 -> 2.0.1

---
 .../python-modules/greenlet/default.nix         | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 12f3044f0680..129243b79186 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -2,23 +2,30 @@
 , buildPythonPackage
 , fetchPypi
 , isPyPy
-, unittestCheckHook
+, objgraph
+, psutil
+, pytestCheckHook
 }:
 
 
 buildPythonPackage rec {
   pname = "greenlet";
-  version = "1.1.3";
+  version = "2.0.1";
+  format = "setuptools";
   disabled = isPyPy; # builtin for pypy
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-vLbG3R1r5tONbbKDdH0H/aCJ/4xVmoNSNlYKRBA0BFU=";
+    hash = "sha256-QuYCVkRg2g6O5ny21yNjY+5eExqhWUO2Zw5E5cLtD2c=";
   };
 
-  checkInputs = [ unittestCheckHook ];
+  checkInputs = [
+    objgraph
+    psutil
+    pytestCheckHook
+  ];
 
-  unittestFlagsArray = [ "-v" "greenlet.tests" ];
+  doCheck = false; # installed tests need to be executed, not sure how to accomplish that
 
   meta = with lib; {
     homepage = "https://github.com/python-greenlet/greenlet";

From 0b03cdb848f5ded8d5fc2d790ff7fb58b5dfb125 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:16 +0100
Subject: [PATCH 437/953] python3Packages.gssapi: 1.7.3 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 16c6eb513c6d..eab119f39ade 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "gssapi";
-  version = "1.7.3";
+  version = "1.8.2";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "pythongssapi";
     repo = "python-${pname}";
-    rev = "v${version}";
-    sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI=";
   };
 
   # It's used to locate headers

From 4d2b2dbe0c439fb2cca256c48c78029edf63cc25 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:16 +0100
Subject: [PATCH 438/953] python3Packages.gtts: 2.2.4 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix
index 3e3fabddf319..3314b6114d71 100644
--- a/pkgs/development/python-modules/gtts/default.nix
+++ b/pkgs/development/python-modules/gtts/default.nix
@@ -15,13 +15,14 @@
 
 buildPythonPackage rec {
   pname = "gtts";
-  version = "2.2.4";
+  version = "2.3.0";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pndurette";
     repo = "gTTS";
-    rev = "v${version}";
-    sha256 = "sha256-hQnFHi85Rifco0afLF8kKNOy9oPxKoupfmdm+fht6Cg=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-dFNphsgf+0t3EPXO938TVncYcxL4EMOlznrfPR8SYhM=";
   };
 
   propagatedBuildInputs = [

From 8ebc38328d466874e45b5bbbd5a4843dcee99a03 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:17 +0100
Subject: [PATCH 439/953] python3Packages.guessit: 3.4.3 -> 3.5.0

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

diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index 8b85a488512a..eff3d54d7210 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -6,6 +6,7 @@
 , rebulk
 , pythonOlder
 , importlib-resources
+, py
 , pytestCheckHook
 , pytest-mock
 , pytest-benchmark
@@ -14,11 +15,12 @@
 
 buildPythonPackage rec {
   pname = "guessit";
-  version = "3.4.3";
+  version = "3.5.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "731e96e6a1f3b065d05accc8c19f35d4485d880b77ab8dc4b262cc353df294f7";
+    hash = "sha256-eiaeOlfMBz5htWJZiT6rPFwC0a2Ky8iuLnjF6DnxELw=";
   };
 
   propagatedBuildInputs = [
@@ -27,7 +29,7 @@ buildPythonPackage rec {
     python-dateutil
   ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
-  checkInputs = [ pytestCheckHook pytest-mock pytest-benchmark pyyaml ];
+  checkInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ];
 
   pytestFlagsArray = [ "--benchmark-disable" ];
 

From 31914b44a24e23fa92757b9b9f5997eccf165339 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:17 +0100
Subject: [PATCH 440/953] python3Packages.hacking: 4.1.0 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix
index faa967d0ce4f..050795185cfd 100644
--- a/pkgs/development/python-modules/hacking/default.nix
+++ b/pkgs/development/python-modules/hacking/default.nix
@@ -10,16 +10,15 @@
 
 buildPythonPackage rec {
   pname = "hacking";
-  version = "4.1.0";
+  version = "5.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m";
+    sha256 = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY=";
   };
 
   postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "flake8<3.9.0,>=3.8.0" "flake8"
+    sed -i 's/flake8.*/flake8/' requirements.txt
     substituteInPlace hacking/checks/python23.py \
       --replace 'H236: class Foo(object):\n    __metaclass__ = \' 'Okay: class Foo(object):\n    __metaclass__ = \'
     substituteInPlace hacking/checks/except_checks.py \

From 56281892c7a67ba5952242d1bfcfc1916ead915c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:17 +0100
Subject: [PATCH 441/953] python3Packages.hatch-nodejs-version: 0.3.0 -> 0.3.1

---
 .../python-modules/hatch-nodejs-version/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix
index 6095b696ad78..5c471111ab7e 100644
--- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix
+++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "hatch-nodejs-version";
-  version = "0.3.0";
+  version = "0.3.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "agoose77";
     repo = "hatch-nodejs-version";
-    rev = "v${version}";
-    sha256 = "sha256-TBvqXjka8poQ8xxQ/H1hFYRLqnP1024uan1d9b95ags=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4=";
   };
 
   propagatedBuildInputs = [

From cc5ec329ff861ae86f361ccf1d81f30ce7f60449 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:17 +0100
Subject: [PATCH 442/953] python3Packages.hatch-vcs: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix
index 4f5c1f9bf3e6..a8aaa70d63e4 100644
--- a/pkgs/development/python-modules/hatch-vcs/default.nix
+++ b/pkgs/development/python-modules/hatch-vcs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "hatch-vcs";
-  version = "0.2.0";
+  version = "0.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "hatch_vcs";
     inherit version;
-    sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8=";
+    sha256 = "sha256-zsUQfPzkgsZ/i8lvGLvDIMmqDQaBgOFK0xe77loVP+4=";
   };
 
   nativeBuildInputs = [

From 4ef8de9675adda62c238ff75450d4e698bd9aa1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:17 +0100
Subject: [PATCH 443/953] python3Packages.hepunits: 2.2.1 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix
index c1af541def94..5224c84ab5ce 100644
--- a/pkgs/development/python-modules/hepunits/default.nix
+++ b/pkgs/development/python-modules/hepunits/default.nix
@@ -1,20 +1,24 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, setuptools-scm
+, hatch-vcs
+, hatchling
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "hepunits";
-  version = "2.2.1";
+  version = "2.3.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-YJfmlUekg73Az+TRBuRHteuofFUBBg0xLNnWGqniJBQ=";
+    hash = "sha256-M7mumot7OvNVFBp0kBy1qlV9zi5MmZKgow7wRDobIgY=";
   };
+
   nativeBuildInputs = [
-    setuptools-scm
+    hatch-vcs
+    hatchling
   ];
 
   checkInputs = [

From 2bd9c1e736a4459f251b8da4d308cf978fa20ac2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:17 +0100
Subject: [PATCH 444/953] python3Packages.holoviews: 1.15.2 -> 1.15.3

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

diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index 6c5132027c5e..4f94ff771318 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "holoviews";
-  version = "1.15.2";
+  version = "1.15.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3sJBf2VACLHXtkWzHs9iHIvvkBaU5MTnJy7/0Yr6Nts=";
+    hash = "sha256-pFiRzSuPzUCHQs//81HJKPv0zx730fBEQsfYeG7o6ZQ=";
   };
 
   propagatedBuildInputs = [

From 72de3806733b3ca349592c330be8085d2751c6d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 445/953] python3Packages.httpcore: 0.16.2 -> 0.16.3

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

diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 61a3b8d73235..408bb8376559 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "httpcore";
-  version = "0.16.2";
+  version = "0.16.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
-    rev = version;
-    hash = "sha256-bwGZ/B0jlvc1BmXVTo7gMP6PJIQuCHclkHjKQCgMsyU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-3bC97CTZi6An+owjoJF7Irtr7ONbP8RtNdTIGJRy0Ng=";
   };
 
   propagatedBuildInputs = [

From 66abd792712a5938053cb416d34eec57d9ba8732 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 446/953] python3Packages.huggingface-hub: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 2e68555dc738..4d8f02020018 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.11.0";
+  version = "0.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "huggingface_hub";
     rev = "refs/tags/v${version}";
-    hash = "sha256-d+X4hGt4K6xmRFw8mevKpZ6RDv+U1PJ8WbmdKGDbVNs=";
+    hash = "sha256-sUo8B4IbFiIvqWx2UxT3TpHzi2Q2YNW1zrx1Squ2psQ=";
   };
 
   propagatedBuildInputs = [

From 7c337d6d8c2a7b01bae9f6f8f406183e5a166a00 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 447/953] python3Packages.hypothesmith: 0.2.0 -> 0.2.3

---
 .../python-modules/hypothesmith/default.nix   |  9 ++++++--
 .../hypothesmith/remove-black.patch           | 21 +++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix
index 4bac9c0bb022..76977b770027 100644
--- a/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/pkgs/development/python-modules/hypothesmith/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "hypothesmith";
-  version = "0.2.0";
+  version = "0.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922";
+    sha256 = "sha256-vc6EXsmE5uP+0h5l0ugrjrxt5cpeuTZJ39dgNMWQakY=";
   };
 
   patches = [
@@ -46,6 +46,11 @@ buildPythonPackage rec {
     "test_source_code_from_libcst_node_type"
   ];
 
+  disabledTestPaths = [
+    # missing blib2to3
+    "tests/test_syntactic.py"
+  ];
+
   pythonImportsCheck = [ "hypothesmith" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/hypothesmith/remove-black.patch b/pkgs/development/python-modules/hypothesmith/remove-black.patch
index 565f350b06b4..d37222ef4b2c 100644
--- a/pkgs/development/python-modules/hypothesmith/remove-black.patch
+++ b/pkgs/development/python-modules/hypothesmith/remove-black.patch
@@ -1,5 +1,5 @@
 diff --git a/tests/test_cst.py b/tests/test_cst.py
-index c436183..bdba2d7 100644
+index 8532240..bdba2d7 100644
 --- a/tests/test_cst.py
 +++ b/tests/test_cst.py
 @@ -3,7 +3,6 @@ import ast
@@ -15,11 +15,11 @@ index c436183..bdba2d7 100644
  
  
 -@pytest.mark.xfail
--@example("A\u2592", black.FileMode())
+-@example("A\u2592", black.Mode())
 -@given(
 -    source_code=hypothesmith.from_node(),
 -    mode=st.builds(
--        black.FileMode,
+-        black.Mode,
 -        line_length=st.just(88) | st.integers(0, 200),
 -        string_normalization=st.booleans(),
 -        is_pyi=st.booleans(),
@@ -39,28 +39,27 @@ index c436183..bdba2d7 100644
  def test_from_node_always_compilable(source_code):
      compile(source_code, "<string>", "exec")
 diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py
-index 7ea42e9..a77ac39 100644
+index 7fe9835..17c4f7c 100644
 --- a/tests/test_syntactic.py
 +++ b/tests/test_syntactic.py
-@@ -3,8 +3,6 @@ import ast
+@@ -3,7 +3,6 @@ import ast
  import io
  import tokenize
  
 -import black
--import blib2to3
+ import blib2to3
  import parso
  import pytest
- from hypothesis import example, given, reject, strategies as st
-@@ -58,34 +56,6 @@ def test_ast_unparse_from_grammar(source_code):
+@@ -58,34 +57,6 @@ def test_ast_unparse_from_grammar(source_code):
      assert ast.dump(first) == ast.dump(second)
  
  
--@example("\\", black.FileMode())
--@example("A#\r#", black.FileMode())
+-@example("\\", black.Mode())
+-@example("A#\r#", black.Mode())
 -@given(
 -    source_code=hypothesmith.from_grammar(),
 -    mode=st.builds(
--        black.FileMode,
+-        black.Mode,
 -        line_length=st.just(88) | st.integers(0, 200),
 -        string_normalization=st.booleans(),
 -        is_pyi=st.booleans(),

From d26402c2d9d623941cc6d294077de11d70ef21ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 448/953] python3Packages.icalendar: 4.1.0 -> 5.0.4

---
 .../python-modules/icalendar/default.nix      | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index 5ef8864417d4..cbf3b09a8cdc 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -1,26 +1,42 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, setuptools
+, fetchFromGitHub
+, pythonOlder
+, backports-zoneinfo
 , python-dateutil
 , pytz
+, hypothesis
+, pytest
 }:
 
 buildPythonPackage rec {
-  version = "4.1.0";
+  version = "5.0.4";
   pname = "icalendar";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U=";
+  src = fetchFromGitHub {
+    owner = "collective";
+    repo = "icalendar";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Ch0i6hxEnHV/Xu4PqpRVt30KLOHHgtCAI2W9UyXo15E=";
   };
 
-  buildInputs = [ setuptools ];
-  propagatedBuildInputs = [ python-dateutil pytz ];
+  propagatedBuildInputs = [
+    python-dateutil
+    pytz
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    backports-zoneinfo
+  ];
+
+  checkInputs = [
+    hypothesis
+    pytest
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst";
     description = "A parser/generator of iCalendar files";
-    homepage = "https://icalendar.readthedocs.org/";
+    homepage = "https://github.com/collective/icalendar";
     license = licenses.bsd2;
     maintainers = with maintainers; [ olcai ];
   };

From 6e67852e21c8a86cd61be7fbe23c00aecce8ee43 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 449/953] python3Packages.imbalanced-learn: 0.9.1 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index 8a53e856b330..f43908a61e0b 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "imbalanced-learn";
-  version = "0.9.1";
+  version = "0.10.1";
   disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ThT3rmB4tauEO3PDebKsULIHRGQV2cJDjIhdbLWv2WI=";
+    sha256 = "sha256-vHYJYZ7Dw4xEIpKSgjmtPRC13rCviinIOCK3tXsxn4s=";
   };
 
   propagatedBuildInputs = [ scikit-learn ];

From 8a2703f13ad40c3e78155cceee1e5f2faa98bf0f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 450/953] python3Packages.iminuit: 2.17.0 -> 2.18.0

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

diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
index 19c38ac3fbc8..5817b38ca0de 100644
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "iminuit";
-  version = "2.17.0";
+  version = "2.18.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dfSoorrSH9p7a9Qt98oEEg+yRjbr+bVm0lmybyBEsdA=";
+    hash = "sha256-fuLGoLzaxYGzj66NDzQ/3uVfkfH2psyWQ/z7zGwtw+Y=";
   };
 
   nativeBuildInputs = [

From fcc12cfc8703ad53f7d95d8789c01ecfc3e5fe5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 451/953] python3Packages.importlib-metadata: 4.12.0 -> 5.2.0

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

diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index 9e4176a5b1ba..d9f03c521aca 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "importlib-metadata";
-  version = "4.12.0";
+  version = "5.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "importlib_metadata";
     inherit version;
-    hash = "sha256-Y3JFuLqytlAvy8dSzEt6b2JDuwKzHFwmFWrRA9PUVnA=";
+    hash = "sha256-QE1I1iu6C3p3/51AXv2RUBvvLmf/Ss4L7UCgzyjDx80=";
   };
 
   nativeBuildInputs = [

From b3ab6bce236e6ba5f83588df7c1a0d7ea645a5da Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 452/953] python3Packages.importlib-resources: 5.9.0 -> 5.10.2

---
 .../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 124733568723..e8b6e0857e4c 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.9.0";
+  version = "5.10.2";
   format = "pyproject";
   disabled = isPy27;
 
   src = fetchPypi {
     pname = "importlib_resources";
     inherit version;
-    sha256 = "sha256-VIHpf7Ra+Nzy95iVJiVZHFj+WZ0HNdhrEPVN4IamFoE=";
+    sha256 = "sha256-5KlsjMAzlkf/ml4FUNnydvxaAf+idgErWOwQjP17hIQ=";
   };
 
   nativeBuildInputs = [

From d7eb51ce3735d578fa23d4de23bcb2ca8e50e728 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:18 +0100
Subject: [PATCH 453/953] python3Packages.inflect: 6.0.0 -> 6.0.2

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

diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 6e64c946b980..ec8179ae6ae4 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "inflect";
-  version = "6.0.0";
+  version = "6.0.2";
   disabled = isPy27;
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-C8FRbsJyXi2CIXB6YSJFCTy28c6iCc/Yy9T8Xpb6Y2U=";
+    sha256 = "sha256-8aa8sBBQRviWGf3hp9BExhLGFMLYXvGCWC2dybhtMJo=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 72dd0655e0d223ec80628d99456afd16a0f59e16 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 454/953] python3Packages.influxdb-client: 1.34.0 -> 1.35.0

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

diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 079edcd121ff..b707887bc392 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "influxdb-client";
-  version = "1.34.0";
+  version = "1.35.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "influxdata";
     repo = "influxdb-client-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Bswlrfh9lBobZDA4Rt/02jMER5IrZ6b3ykpbklCFhUE=";
+    hash = "sha256-kewhNnbCmciywTkk/NTBqO02jN8IAW/MriH/DkhQkFU=";
   };
 
   propagatedBuildInputs = [

From 00af8382784f9b3546cb9b0bce6a88a5fdb21df1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 455/953] python3Packages.inform: 1.26 -> 1.27

---
 .../python-modules/inform/default.nix         | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix
index aff0d77e7022..e9d6c3f1a930 100644
--- a/pkgs/development/python-modules/inform/default.nix
+++ b/pkgs/development/python-modules/inform/default.nix
@@ -1,4 +1,7 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flit-core
 , arrow
 , six
 , hypothesis
@@ -7,28 +10,33 @@
 
 buildPythonPackage rec {
   pname = "inform";
-  version = "1.26";
+  version = "1.27";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "inform";
-    rev = "v${version}";
-    sha256 = "0snrmvmc3rnz90cql5ayzs878rrkadk46rhvf2sn78nb0x57wa20";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-SvE+UAGpUomUBHlH4aYZ1BYmLp3BherRjosKsIaOA/s=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "pytest-runner>=2.0" ""
-  '';
+  nativeBuildInputs = [
+    flit-core
+  ];
 
-  propagatedBuildInputs = [ arrow six ];
+  propagatedBuildInputs = [
+    arrow
+    six
+  ];
 
-  checkInputs = [ pytestCheckHook hypothesis ];
-  preCheck = ''
-    patchShebangs test.doctests.py test.inform.py
-    ./test.doctests.py
-    ./test.inform.py
-  '';
+  checkInputs = [
+    pytestCheckHook
+    hypothesis
+  ];
+
+  disabledTests = [
+    "test_prostrate"
+  ];
 
   meta = with lib; {
     description = "Print and logging utilities";

From ea3cdcf04b5b2465ffb75971d1345883b4e989f9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 456/953] python3Packages.inquirer: 2.9.2 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix
index 0fb7a2451210..8efdb1ab03b8 100644
--- a/pkgs/development/python-modules/inquirer/default.nix
+++ b/pkgs/development/python-modules/inquirer/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "inquirer";
-  version = "2.9.2";
+  version = "3.1.1";
   format = "pyproject";
 
   src = fetchFromGitHub rec {
     owner = "magmax";
     repo = "python-inquirer";
-    rev = "v${version}";
-    sha256 = "sha256-TQEZeZDl4N78dE7CXy5OwquUoHuxxjmDAC3wdxqydaQ=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-gDJqD0IHshyGw9MmMtYjkkpvYklRLgPd6EtLVqi2I/o=";
   };
 
   nativeBuildInputs = [

From aa9dc3af912bc49eb8db51bf0830df1f6dc90ae6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 457/953] python3Packages.inscriptis: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix
index 2fa224b3f210..b22a402c9e93 100644
--- a/pkgs/development/python-modules/inscriptis/default.nix
+++ b/pkgs/development/python-modules/inscriptis/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "inscriptis";
-  version = "2.3.1";
+  version = "2.3.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "weblyzard";
     repo = "inscriptis";
-    rev = version;
-    sha256 = "sha256-an/FTbujN2VnTYa0wngM8ugV1LNHJWM32RVqIbaW0KY=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU=";
   };
 
   propagatedBuildInputs = [

From 3698e05c69d198552f6fe71ea3519667ebdf4619 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 458/953] python3Packages.ipdb: 0.13.9 -> 0.13.11

---
 .../python-modules/ipdb/default.nix           | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 363c8a4f5768..a3ec10d4b2b5 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -1,24 +1,41 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonOlder
+, decorator
 , ipython
 , isPyPy
-, mock
-, toml
+, tomli
+, setuptools
+, unittestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "ipdb";
-  version = "0.13.9";
+  version = "0.13.11";
+  format = "pyproject";
+
   disabled = isPyPy;  # setupterm: could not find terminfo database
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5";
+    hash = "sha256-wjtnNvAf1Fhswuy+vfeaXrRUeWhT4c2PLtO3uR1KPpM=";
   };
 
-  propagatedBuildInputs = [ ipython toml ];
-  checkInputs = [ mock ];
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    ipython
+    decorator
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
+
+  checkInputs = [
+    unittestCheckHook
+  ];
 
   preCheck = ''
     export HOME=$(mktemp -d)

From a94a4cb0e27f966749890e7d42e04917e1fb2824 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:06:38 +0100
Subject: [PATCH 459/953] python3Packages.comm: init at 0.1.2

---
 .../python-modules/comm/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/comm/default.nix

diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix
new file mode 100644
index 000000000000..e047717c8d69
--- /dev/null
+++ b/pkgs/development/python-modules/comm/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, hatchling
+, traitlets
+, pytestCheckHook
+}:
+
+let
+  pname = "comm";
+  version = "0.1.2";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "ipython";
+    repo = "comm";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Ve6tCvu89P5wUOj+vlzXItRR5RjJNKxItKnWP2fVk9U=";
+  };
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    traitlets
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc";
+    homepage = "https://github.com/ipython/comm";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53e16c92e15f..b8464e2994da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1917,6 +1917,8 @@ self: super: with self; {
 
   cometblue-lite = callPackage ../development/python-modules/cometblue-lite { };
 
+  comm = callPackage ../development/python-modules/comm { };
+
   commandparse = callPackage ../development/python-modules/commandparse { };
 
   commentjson = callPackage ../development/python-modules/commentjson { };

From 1682c4d69687b5cf0ad8cc1e47ba4c786285805a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 460/953] python3Packages.ipykernel: 6.15.3 -> 6.20.0

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

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 36bd9961903c..384391138daf 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -4,6 +4,7 @@
 , fetchPypi
 , hatchling
 , pythonOlder
+, comm
 , ipython
 , jupyter-client
 , packaging
@@ -14,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "ipykernel";
-  version = "6.15.3";
+  version = "6.20.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-uB1XsOFxZwhEvynNwRVisQENPahxFcRRPg7mYKg2h2U=";
+    sha256 = "sha256-ffr67GRTAHEMQUecCwvcE6nqZjm+5uOtBCdXZ06amik=";
   };
 
   # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767
@@ -34,6 +35,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    comm
     ipython
     jupyter-client
     packaging

From f027a06ee5ebf1d68f476134620334e45b5fc7b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 461/953] python3Packages.ipyvue: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix
index 6c0b15c41b37..77ed45ce4ccd 100644
--- a/pkgs/development/python-modules/ipyvue/default.nix
+++ b/pkgs/development/python-modules/ipyvue/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "ipyvue";
-  version = "1.7.0";
+  version = "1.8.0";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72";
+    sha256 = "sha256-0qjvArC8xEr9MSecuAKMBr49fA60FYRyicAADy93N7c=";
   };
 
   propagatedBuildInputs = [ ipywidgets ];

From b9d4c84c11265a0c0c0446ed816b6458f8a17f8b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 462/953] python3Packages.ipywidgets: 8.0.2 -> 8.0.4

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

diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index b4689b207756..c3fc01390377 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "8.0.2";
+  version = "8.0.4";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CMt1xuCpaDYUfL/cVVgK4E0T4F0m/7w3e04caLqiix8=";
+    hash = "sha256-wABad6R9d4icr+2JK1jjO0oqlnEhVEBMZUjsIicoEeo=";
   };
 
   propagatedBuildInputs = [

From e00e144141c8e37af0bd23e1bab53d563d0e84ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:19 +0100
Subject: [PATCH 463/953] python3Packages.isort: 5.11.2 -> 5.11.4

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

diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
index 799f21bbebe7..b4f1606a027d 100644
--- a/pkgs/development/python-modules/isort/default.nix
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "isort";
-  version = "5.11.2";
+  version = "5.11.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "isort";
-    rev = version;
-    sha256 = "sha256-4Du9vYI1srStWCTfZr4Rq3uH5c9cRtR8ZqihI36G6hA=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I=";
   };
 
   nativeBuildInputs = [

From 38fbc6460d56ed2b4dce0b5a5cef867d42700675 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 464/953] python3Packages.iterm2: 2.6 -> 2.7

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

diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix
index 96c8fcfb3c14..eff730e0ad8e 100644
--- a/pkgs/development/python-modules/iterm2/default.nix
+++ b/pkgs/development/python-modules/iterm2/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "iterm2";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rKvnr0C48mTkjbGyHhvNzgJ97p5mJ7F4wU8ZMPYV/rM=";
+    sha256 = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA=";
   };
 
   propagatedBuildInputs = [ protobuf websockets ];

From c5c9d91ebec9a101fea316132146049c4c684508 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 465/953] python3Packages.jaraco.collections: 3.5.2 -> 3.8.0

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

diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix
index 686095d3b1c0..e42499b70999 100644
--- a/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "jaraco.collections";
-  version = "3.5.2";
+  version = "3.8.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ByuT6zX55IUISFdVU05mo07xzISvKR/Sfzm0TUwN0sM=";
+    sha256 = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA=";
   };
 
   postPatch = ''

From 46bd54391d2b9dfb59339bb99325e2de4ce19eab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 466/953] python3Packages.jaraco-context: 4.1.2 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix
index 4b097fd5b096..6a8c0fd1ea4a 100644
--- a/pkgs/development/python-modules/jaraco-context/default.nix
+++ b/pkgs/development/python-modules/jaraco-context/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "jaraco-context";
-  version = "4.1.2";
+  version = "4.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "jaraco";
     repo = "jaraco.context";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-gfrDZW4d3X/QjUBN8DFSvKRLZge3pnZ6KkI7S7Nz3W0=";
+    sha256 = "sha256-J7vL+pvwXcKEkqZn44/U01HmP1CI5kIGsJ1aJevp0I4=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 41851bcf20c91611a253aa87ba28e4f1b52f53c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 467/953] python3Packages.jaraco.functools: 3.5.1 -> 3.5.2

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

diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix
index de4b8c5ce489..afd7e113189e 100644
--- a/pkgs/development/python-modules/jaraco_functools/default.nix
+++ b/pkgs/development/python-modules/jaraco_functools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "jaraco.functools";
-  version = "3.5.1";
+  version = "3.5.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-0K3PkXEKCFPv6fI6ePrVhr9n31cvDW2OD6NtKJrhwdk=";
+    sha256 = "sha256-RbBcFY860ocxB1VW/9R0m9JU7Gf5Hh6zZ9z+v/EVHbQ=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From cac38406c9fdb718517b7e90fce0e36388cbc095 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 468/953] python3Packages.jaraco-test: 5.1.0 -> 5.2.0

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

diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix
index 3f3f9d54f87f..86aca734e114 100644
--- a/pkgs/development/python-modules/jaraco-test/default.nix
+++ b/pkgs/development/python-modules/jaraco-test/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "jaraco-test";
-  version = "5.1.0";
+  version = "5.2.0";
 
   disabled = pythonOlder "3.7";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jaraco.test";
     inherit version;
-    sha256 = "04a7503c0c78cd057bd6b5f16ad1e3379b911b619df6694480a564ebc214c0a8";
+    sha256 = "sha256-K1OYx58TriCKoGfdLlEw3ArC699DR5w9r7bxLz2bdIs=";
   };
 
   nativeBuildInputs = [

From 933661396ef40c0756392c0d9264e3ae3acdbda2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 469/953] python3Packages.jaraco.text: 3.9.1 -> 3.11.0

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

diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix
index 4891b2ea38c5..91183d4f4082 100644
--- a/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/pkgs/development/python-modules/jaraco_text/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "jaraco.text";
-  version = "3.9.1";
+  version = "3.11.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1XzURIpYgCAxhCXgQZTol/lvwjuSuC/5MIok1cvys/s=";
+    sha256 = "sha256-DdtYlZX+F26oF5yAHKTs4r4Kpx83e5HzymW010GUg1E=";
   };
 
   pythonNamespaces = [

From 0d6a07172dacc46df0a72487a8931c9d4ba2c0dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 470/953] python3Packages.jax: 0.3.23 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index 07f4f5efedbd..cb963a0d6e6a 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -21,7 +21,7 @@ let
 in
 buildPythonPackage rec {
   pname = "jax";
-  version = "0.3.23";
+  version = "0.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,8 +29,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "jax-v${version}";
-    hash = "sha256-ruXOwpBwpi1G8jgH9nhbWbs14JupwWkjh+Wzrj8HVU4=";
+    rev = "refs/tags/jaxlib-v${version}";
+    hash = "sha256-ajLI0iD0YZRK3/uKSbhlIZGc98MdW174vA34vhoy7Iw=";
   };
 
   # jaxlib is _not_ included in propagatedBuildInputs because there are

From 246b3cd378de888c5acbed50deb690cfd44699fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 471/953] python3Packages.jedi-language-server: 0.39.0 ->
 0.40.0

---
 .../python-modules/jedi-language-server/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index b6d0019407ca..c32b84b75f4c 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "jedi-language-server";
-  version = "0.39.0";
+  version = "0.40.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pappasam";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-nra2Xvfo1cfMoZkY7sem7NIEDwDmODWbGVNCeefSuQY=";
+    sha256 = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8=";
   };
 
   pythonRelaxDeps = [

From e9b931770dd14016dfe2b5e81926ef2bd4cb9807 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:20 +0100
Subject: [PATCH 472/953] python3Packages.jira: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index 264bef920ea2..f823cb9c03c6 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -15,8 +15,8 @@
 
 buildPythonPackage rec {
   pname = "jira";
-  version = "3.4.0";
-  format = "setuptools";
+  version = "3.4.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pycontribs";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-XyMywnuJOGSXWsMNbwNbMaOeAa9bosBg6rvfNKw77Ik=";
+    hash = "sha256-EZCvYpcQ1dSsXDhipUalrHEG5SYOochktYrBdIoNDRo=";
   };
 
   nativeBuildInputs = [

From b89d7fd26e8feb3bb2673f7ff6efed4b0a764fb9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 473/953] python3Packages.JPype1: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix
index 698a4165455d..3664d83bfbe0 100644
--- a/pkgs/development/python-modules/JPype1/default.nix
+++ b/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
   ];
 

From 3b51ffbc1f2074447b2bcb8af0c8434a1f583a76 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 474/953] python3Packages.jsonpickle: 2.2.0 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix
index 969869f86b52..75ee64dc4623 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/pkgs/development/python-modules/jsonpickle/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "jsonpickle";
-  version = "2.2.0";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-eycpGLBVQYLlPcNA3dYtm3+QL+x+ewViDATzzO9Hmg4=";
+    sha256 = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA=";
   };
 
   checkInputs = [ pytest ];

From e5d300891495245692664395acb4ee0073820ce4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 475/953] python3Packages.jsonref: 0.2 -> 1.0.1

---
 .../python-modules/jsonref/default.nix        | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
index 2ab8ec45a701..12de6527c866 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -1,20 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi
-, pytest, mock }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "jsonref";
-  version = "0.2";
+  version = "1.0.1";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "15v69rg2lkcykb2spnq6vbbirv9sfq480fnwmfppw9gn3h95pi7k";
+  src = fetchFromGitHub {
+    owner = "gazpachoking";
+    repo = "jsonref";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-8p0BmDZGpQ6Dl9rkqRKZKc0doG5pyXpfcVpemmetLhs=";
   };
 
-  checkInputs = [ pytest mock ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
 
-  checkPhase = ''
-    py.test tests.py
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "tests.py"
+  ];
 
   meta = with lib; {
     description = "An implementation of JSON Reference for Python";

From d0b49281a2acd6cb60b04be296b1770ee0b90b99 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 476/953] python3Packages.junos-eznc: 2.6.5 -> 2.6.6

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

diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix
index 2cd29ba4da4b..157184fec1ee 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "junos-eznc";
-  version = "2.6.5";
+  version = "2.6.6";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Juniper";
     repo = "py-junos-eznc";
-    rev = version;
-    hash = "sha256-BoHT6ejccInfREbYtW6psm3fvsQxLS1vpj/aPDqqpnY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-0JF9/lSIquXp25bM3GESqLC//aorSVT0hHccaOmQuM8=";
   };
 
   propagatedBuildInputs = [

From 9f307e8e7c21fcee3e4bd4da826e3f65b6091da5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 477/953] python3Packages.jupyter_client: 7.3.5 -> 7.4.8

---
 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 598cef9a8e58..11c41677b5ac 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.5";
+  version = "7.4.8";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-PFhGahuNVdugvzzgg05PW3dguvmNHXPbCt1vGd6ezR0=";
+    sha256 = "sha256-EJo8M7YqnPZaqDJYUKCZmnlfrBVdneT3VVrvXzEO41o=";
   };
 
   nativeBuildInputs = [

From 1f460fadad238c0f9942094e845ac19fc4fb83cd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 478/953] python3Packages.jupyter_core: 4.11.2 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix
index 56dc157a69d2..1e540ff6a584 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -3,13 +3,14 @@
 , pythonOlder
 , fetchFromGitHub
 , hatchling
+, platformdirs
 , traitlets
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "jupyter_core";
-  version = "4.11.2";
+  version = "5.1.1";
   disabled = pythonOlder "3.7";
 
   format = "pyproject";
@@ -17,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "jupyter_core";
-    rev = version;
-    hash = "sha256-lDhwvhsOxLHBC6CQjCW/rmtHSuMRPC2yaurBd5K3FLc=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-54zbo+RXgT9AJabmJYHCznyoinTQqrTORzlM48WpnQQ=";
   };
 
   patches = [
@@ -30,6 +31,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    platformdirs
     traitlets
   ];
 

From eb1e7d87f6fa8794fab3de98a18e9d9962b93a37 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 479/953] python3Packages.jupyterlab-git: 0.39.2 -> 0.41.0

---
 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 b8914a2a45a0..666de2d89395 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.2";
+  version = "0.41.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     pname = "jupyterlab_git";
     inherit version;
-    sha256 = "sha256-+wzKAK5jdrlPjtVDgp7QqOyXaBDzzkRJI+6hcbOcnpo=";
+    sha256 = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4=";
   };
 
   nativeBuildInputs = [

From 3e0539fbc70b3ecf496b7985e58a7cbc8f3f41f5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:21 +0100
Subject: [PATCH 480/953] python3Packages.jupyterlab_server: 2.16.3 -> 2.17.0

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

diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index cc709c4f47a3..b891d9e0e7ea 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab_server";
-  version = "2.16.3";
+  version = "2.17.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Y1oLF2qQHxk1HAIiGhJOWTF8R29REgBAm32GfospBcM=";
+    hash = "sha256-pbaSPiqeopn5jeW1DN6Qci10748HE6dcvL+/0/Qa0Fg=";
   };
 
   nativeBuildInputs = [

From 6ecd9f95de8231a4cbf019e5e19651ea6dcd77d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 481/953] python3Packages.jupyterlab-widgets: 3.0.3 -> 3.0.5

---
 .../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 7077d39cb742..1634e986d025 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 = "3.0.3";
+  version = "3.0.5";
 
   src = fetchPypi {
     pname = "jupyterlab_widgets";
     inherit version;
-    sha256 = "sha256-x2cYE5m0yotke+/i2ROxJg9Rv52O+behRjLUwae1Nr0=";
+    sha256 = "sha256-7q7N6vbAOvyWDdriAc7YjVl5tMqcOJG8uPZjGvcF9e8=";
   };
 
   nativeBuildInputs = [

From 3285aa4a499fe7d4207a0a384df815a5d233b988 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 482/953] python3Packages.jupyter_server: 1.19.1 -> 2.0.6

---
 .../python-modules/jupyter_server/default.nix | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix
index 791e238f3874..7d948f7b52f1 100644
--- a/pkgs/development/python-modules/jupyter_server/default.nix
+++ b/pkgs/development/python-modules/jupyter_server/default.nix
@@ -3,9 +3,12 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, hatch-jupyter-builder
+, hatchling
 , pandoc
 , pytestCheckHook
 , pytest-console-scripts
+, pytest-jupyter
 , pytest-timeout
 , pytest-tornasync
 , argon2-cffi
@@ -15,8 +18,10 @@
 , ipykernel
 , ipython_genutils
 , traitlets
-, jupyter_core
+, jupyter-core
 , jupyter-client
+, jupyter-events
+, jupyter-server-terminals
 , nbformat
 , nbconvert
 , send2trash
@@ -30,14 +35,20 @@
 
 buildPythonPackage rec {
   pname = "jupyter_server";
-  version = "1.19.1";
+  version = "2.0.6";
+  format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-0cw1lpRYSXQrw+7fBpn+61CtbGBF6+8CqSmLfxPCfp8=";
+    hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8=";
   };
 
+  nativeBuildInputs = [
+    hatch-jupyter-builder
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     argon2-cffi
     jinja2
@@ -45,8 +56,10 @@ buildPythonPackage rec {
     pyzmq
     ipython_genutils
     traitlets
-    jupyter_core
+    jupyter-core
     jupyter-client
+    jupyter-events
+    jupyter-server-terminals
     nbformat
     nbconvert
     send2trash
@@ -62,6 +75,7 @@ buildPythonPackage rec {
     pandoc
     pytestCheckHook
     pytest-console-scripts
+    pytest-jupyter
     pytest-timeout
     pytest-tornasync
     requests

From c4aeefaf3feda63a118cfcddde63700b278d4ea8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 483/953] python3Packages.k5test: 0.10.1 -> 0.10.3

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

diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix
index 6c2e8466a1de..b3f56a8e0d62 100644
--- a/pkgs/development/python-modules/k5test/default.nix
+++ b/pkgs/development/python-modules/k5test/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "k5test";
-  version = "0.10.1";
+  version = "0.10.3";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c9181133f3d52c8e29a5ba970b668273c08f855e5da834aaee2ea9efeb6b069";
+    sha256 = "sha256-nJ3uvK1joxXoGDPUXp/RK/IBZmQ7iry5/29NaxhMVx8=";
   };
 
   patches = [

From c2b055eee7bea76a91991599b8b18a17ff4bff44 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 484/953] python3Packages.keras: 2.10.0 -> 2.11.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 32f4ad3a5995..788308c92d38 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.10.0";
+  version = "2.11.0";
   format = "wheel";
 
   src = fetchPypi {
     inherit format pname version;
-    sha256 = "sha256-JqbiwlIudGjd6iJxCpmzKQSTdo/AijnnXRFzoONFL98=";
+    sha256 = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4=";
   };
 
   checkInputs = [

From c3b365a7cde734a213b09ec641307fa88185a68e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 485/953] python3Packages.keystoneauth1: 5.0.0 -> 5.1.0

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

diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index cc10ec96686c..5f2a3323baa8 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -24,11 +24,11 @@
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-brtfBEyd/SYwh6Mo1R1HmUfR3ckMCdr0GR333HEzQyM=";
+    sha256 = "sha256-nve0txmnmkoEOHpqpVintspK3xi4Ex8YasrwZD/5e74=";
   };
 
   postPatch = ''

From e8b3c12e03e7c610e96fd0bf68c0245f7c27a912 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 486/953] python3Packages.lark: 1.1.2 -> 1.1.5

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

diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix
index 62123032a5d4..ebf8aea20305 100644
--- a/pkgs/development/python-modules/lark/default.nix
+++ b/pkgs/development/python-modules/lark/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "lark";
-  version = "1.1.2";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "lark-parser";
     repo = "lark";
-    rev = version;
-    sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw=";
   };
 
   # Optional import, but fixes some re known bugs & allows advanced regex features

From 0d002ed6a54049598a83fad918f7069ed2d34b52 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 487/953] python3Packages.lazy-object-proxy: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix
index 0619a62fa32d..aec83e4bce49 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "lazy-object-proxy";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4";
+    sha256 = "sha256-whmgAkWvD2+k6VkB7SgERUT1AVKEDFtqPnslaNs00VY=";
   };
 
   nativeBuildInputs = [

From 2a1d1f3788bb3b23cd301aee6efd7c917d446deb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 488/953] python3Packages.libcst: 0.4.7 -> 0.4.9

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

diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index d763c52d8191..d24093c12c4c 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "libcst";
-  version = "0.4.7";
+  version = "0.4.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,14 +26,14 @@ buildPythonPackage rec {
     owner = "instagram";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-YrGajxs8t8PU4XRkFlhwtxoa9pzpKPXq8ZvN/uqftlE=";
+    hash = "sha256-ikddvKsvXMNHMfA9jUhvyiDXII0tTs/rE97IGI/azgA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "source/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-V/WHZVvh8HtD8IUNk3V4e8/E2A8DebqY5i/lS1X6x3o=";
+    hash = "sha256-FWQGv3E5X+VEnTYD0uKN6W4USth8EQlEGbYgUAWZ5EQ=";
   };
 
   cargoRoot = "native";

From 6c8245718a9212c56c738a644c6058e6cbbd05bc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:22 +0100
Subject: [PATCH 489/953] python3Packages.libtmux: 0.13.0 -> 0.18.1

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

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 199f467fbbca..804f4bce0e3c 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , buildPythonPackage
 , poetry-core
+, pytest-rerunfailures
 , pytestCheckHook
 , procps
 , tmux
@@ -10,16 +11,20 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.13.0";
+  version = "0.18.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-u08lxVMuyO5CwFbmxn69QqdSWcvGaSMZgizRJlsHa0k=";
+    hash = "sha256-OhNyJcnxjbyP/Kpt70qLv3ZtZvXXVTWEMcjv/pa50/4=";
   };
 
+  postPatch = ''
+    sed -i '/addopts/d' setup.cfg
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];
@@ -27,11 +32,15 @@ buildPythonPackage rec {
   checkInputs = [
     procps
     tmux
-
+    pytest-rerunfailures
     pytestCheckHook
   ];
 
-  pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_test.py" ];
+  pytestFlagsArray = [
+    "tests"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "--ignore=tests/test_test.py"
+  ];
 
   pythonImportsCheck = [ "libtmux" ];
 

From 4452e4774fdac4f266d05d2260ce0bd7deab0654 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 490/953] python3Packages.lightgbm: 3.3.2 -> 3.3.3

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

diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index ad54268c8cf5..c59f28d6939d 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "lightgbm";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5d25d16e77c844c297ece2044df57651139bc3c8ad8c4108916374267ac68b64";
+    sha256 = "sha256-hX5VmuhKIpY84rYhaCkpadIa3TC8kkaoTU5+7a5nlm0=";
   };
 
   nativeBuildInputs = [

From 874d89537ac9561c0637fa06f96093a0ffada8ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 491/953] python3Packages.limits: 2.7.2 -> 2.8.0

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

diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index f298bef4892f..31b4aa02ae36 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "limits";
-  version = "2.7.2";
+  version = "2.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,14 +25,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = pname;
-    rev = version;
+    rev = "refs/tags/${version}";
     # Upstream uses versioneer, which relies on git attributes substitution.
     # This leads to non-reproducible archives on github. Remove the substituted
     # file here, and recreate it later based on our version info.
     postFetch = ''
       rm "$out/limits/_version.py"
     '';
-    hash = "sha256-sL4/BE1qNfR33rZwBcwHo3UeVMfkNz7rwBNF4LBtSIw=";
+    hash = "sha256-XGYwSe9KWw6PdxDjyqZ5kw5jlBxQR0VYacquwZ2z8rA=";
   };
 
   propagatedBuildInputs = [

From 33f8242100dd64c2263f81f2072c69f8064acb4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 492/953] python3Packages.limnoria: 2022.9.20 -> 2022.11.10

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

diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index 2acb735052bd..496f55b4000c 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "limnoria";
-  version = "2022.9.20";
+  version = "2022.11.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-db+JKQXDffMm5dcyMVtYNj1YFKHSlvYAoyZi86tqoiA=";
+    hash = "sha256-IvnA9y/pkRrkEabUX05wcAg+8To0OLbt55olQfRUAQc=";
   };
 
   propagatedBuildInputs = [

From a3740a89b42851e1df0cb3ce91ae20616ba19322 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 493/953] python3Packages.localstack: 1.2.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix
index c9856889de1f..bb9c100890af 100644
--- a/pkgs/development/python-modules/localstack/default.nix
+++ b/pkgs/development/python-modules/localstack/default.nix
@@ -19,13 +19,13 @@
 
 buildPythonPackage rec {
   pname = "localstack";
-  version = "1.2.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
-    rev = "v${version}";
-    sha256 = "sha256-en/9kxhiW4aesc2SOpg/jRXiRa222iBQuq1O3cHeBJs=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-cxkEP/fsIGTcFLAM8tn/esCMmAvsIYb46X+EzV2VHDc=";
   };
 
   postPatch = ''

From 605f04625f9ec501eee935d264aa5338a98be715 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 494/953] python3Packages.localstack-ext: 1.2.0 -> 1.3.1

---
 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 a3d323edf983..1947467c0ec8 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "localstack-ext";
-  version = "1.2.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-F+FQJwvB1WH7qcfOG6IGY+ZlfKwz39UE5rwoQKnxaac=";
+    sha256 = "sha256-zMGKGTKomduydhOAxfif/Caf1QJiG2mxig4a+789SJc=";
   };
 
   postPatch = ''

From 32a0bda9e978831d8b37422118646547a93975fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 495/953] python3Packages.lxml: 4.9.1 -> 4.9.2

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

diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index f0a9d6ff523a..65cb5afab187 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "lxml";
-  version = "4.9.1";
+  version = "4.9.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/lxml-${version}";
-    sha256 = "sha256-5MJw3ciXYnfctSNcemJ/QJGKAaYpadvdbFhkc8+pmPM=";
+    sha256 = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE=";
   };
 
   # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs

From 6298f678b9e2fcc53ca405d4094b905e91371372 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 496/953] python3Packages.python-lz4: 4.0.1 -> 4.3.1

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

diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index aaf4e0aa69bc..c7efc7af57c9 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-lz4";
-  version = "4.0.1";
+  version = "4.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-hQuZkstsB37pFDWmA0W6qGd7rAer1mun7Z6MxMp0ZmE=";
+    sha256 = "sha256-XWkCZhBapjtzH3g3t+xXiB2f54p3Xw0+UBKVNH+gGHQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From ac620f0467647a49c4f0731d2620be77f0162e4f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH 497/953] python3Packages.mac_alias: 2.2.0 -> 2.2.2

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

diff --git a/pkgs/development/python-modules/mac_alias/default.nix b/pkgs/development/python-modules/mac_alias/default.nix
index ac750b13e390..159dfa1d89ad 100644
--- a/pkgs/development/python-modules/mac_alias/default.nix
+++ b/pkgs/development/python-modules/mac_alias/default.nix
@@ -1,15 +1,24 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
 }:
 
 buildPythonPackage rec {
-  version = "2.2.0";
-  pname = "mac_alias";
+  pname = "mac-alias";
+  version = "2.2.2";
+  format = "pyproject";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "0eb84a63f98bf54c2f9fbdc4de956a63e64eb8a4a124143a1c1f5a78326442f0";
+    pname = "mac_alias";
+    inherit version;
+    hash = "sha256-yZxyjrUS6VXBHxpiA6D/qIg7JlSeiv5ogEAxql2oVrc=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   # pypi package does not include tests;
   # tests anyway require admin privileges to succeed
   doCheck = false;

From 851fa51b30f0920f675ea91ead7c1760fe44a05d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 498/953] python3Packages.mailsuite: 1.9.7 -> 1.9.14

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

diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix
index ff44629de9f1..6767e86feb22 100644
--- a/pkgs/development/python-modules/mailsuite/default.nix
+++ b/pkgs/development/python-modules/mailsuite/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "mailsuite";
-  version = "1.9.7";
+  version = "1.9.14";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d96r712suiL4dSzT5vG/rD+4PInlvpuoAo3cedqVe+w=";
+    hash = "sha256-8vybabJPQyR0XMXaNp8lQFyuPajrhucgdfazt2ci8Gs=";
   };
 
   nativeBuildInputs = [

From 1b9e217854c841c5b55025d046fbe4a10c5d0eb8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 499/953] python3Packages.Mako: 1.2.2 -> 1.2.4

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

diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix
index 9118f5a6fcf3..eeae0d7f33d1 100644
--- a/pkgs/development/python-modules/Mako/default.nix
+++ b/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 = [

From f183ff944aef7b836115cc7726c06da7b6e3b7b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 500/953] python3Packages.markdown-include: 0.7.0 -> 0.8.0

---
 .../python-modules/markdown-include/default.nix     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix
index 091809d8314b..3d32b507579e 100644
--- a/pkgs/development/python-modules/markdown-include/default.nix
+++ b/pkgs/development/python-modules/markdown-include/default.nix
@@ -2,21 +2,28 @@
 , buildPythonPackage
 , fetchFromGitHub
 , markdown
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "markdown-include";
-  version = "0.7.0";
+  version = "0.8.0";
   format = "setuptools";
 
   # only wheel on pypi
   src = fetchFromGitHub {
     owner = "cmacmackin";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-2pC0K/Z5l7q6sx4FSM4Pi1/5bt1wLZsqOmcbnE47rVs=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-wTGgxvM3/h+6plUcheeMSkpk1we7pwuWHurkDkmbnPY=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     markdown
   ];

From f8c9fd20a982fc9aafe65f91fad47a253617053f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 14:51:47 +0100
Subject: [PATCH 501/953] python3Packages.contourpy: init at 1.0.6

---
 .../python-modules/contourpy/default.nix      | 75 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/python-modules/contourpy/default.nix

diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix
new file mode 100644
index 000000000000..f80f16c51979
--- /dev/null
+++ b/pkgs/development/python-modules/contourpy/default.nix
@@ -0,0 +1,75 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+
+# build
+, pybind11
+, setuptools
+
+# propagates
+, numpy
+
+# optionals
+, bokeh
+, chromedriver
+, selenium
+
+# tests
+, matplotlib
+, pillow
+, pytestCheckHook
+}:
+
+let countourpy = buildPythonPackage rec {
+  pname = "contourpy";
+  version = "1.0.6";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "contourpy";
+    repo = "contourpy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-JbLaQ2NomJlgDmEATa7OmZ749Bezt3tvnt1nOA1aOVw=";
+  };
+
+  nativeBuildInputs = [
+    pybind11
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  passthru.optional-depdendencies = {
+    bokeh = [ bokeh chromedriver selenium ];
+  };
+
+  doCheck = false; # infinite recursion with matplotlib, tests in passthru
+
+  checkInputs = [
+    matplotlib
+    pillow
+    pytestCheckHook
+  ];
+
+  passthru.tests = {
+    check = countourpy.overridePythonAttrs (_: { doCheck = true; });
+  };
+
+  pythonImportsCheck = [
+    "contourpy"
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/contourpy/contourpy/releases/tag/v${version}";
+    description = "Python library for calculating contours in 2D quadrilateral grids";
+    homepage = "https://github.com/contourpy/contourpy";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+};
+in countourpy
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8464e2994da..f96120165e0a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1977,6 +1977,8 @@ self: super: with self; {
 
   contexttimer = callPackage ../development/python-modules/contexttimer { };
 
+  contourpy = callPackage ../development/python-modules/contourpy { };
+
   convertdate = callPackage ../development/python-modules/convertdate { };
 
   cookiecutter = callPackage ../development/python-modules/cookiecutter { };

From 09116080bca0c6836c08b4718783185383b8a13d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 502/953] python3Packages.matplotlib: 3.5.3 -> 3.6.2

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

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 6a507d01ef3b..79c842f6d3e8 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo
 , which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver
 , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
-, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging
+, certifi, contourpy, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging
 , enableGhostscript ? true, ghostscript, gtk3
 , enableGtk3 ? false, cairo
 # darwin has its own "MacOSX" backend
@@ -17,7 +17,7 @@ let
 in
 
 buildPythonPackage rec {
-  version = "3.5.3";
+  version = "3.6.2";
   pname = "matplotlib";
   format = "setuptools";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-M5ysSLgN28i/0F2q4KOnNBRlGoWWkEwqiBz9Httl8mw=";
+    sha256 = "sha256-sD/RChcJ0BAcBUiDtVD3xMXpdPdR4mgDGHWa8AWWSZA=";
   };
 
   XDG_RUNTIME_DIR = "/tmp";
@@ -47,6 +47,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     certifi
+    contourpy
     cycler
     fonttools
     freetype

From 7a701a617f65ffebc6a47656c79904ea943eb344 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 503/953] python3Packages.mayavi: 4.8.0 -> 4.8.1

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

diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix
index 55f8fca0c35e..a4960ae41127 100644
--- a/pkgs/development/python-modules/mayavi/default.nix
+++ b/pkgs/development/python-modules/mayavi/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "mayavi";
-  version = "4.8.0";
+  version = "4.8.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-TGBDYdn1+juBvhjVvxTzBlCw7jju1buhbMikQ5QXj2M=";
+    sha256 = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4=";
   };
 
   postPatch = ''

From f8c83ec55e596ef9d3b91f890960a48f784d09d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 504/953] python3Packages.mcstatus: 9.3.0 -> 10.0.1

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

diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix
index f8001dbdd568..6ba2b4874a38 100644
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "mcstatus";
-  version = "9.3.0";
+  version = "10.0.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "py-mine";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rwEZhN/CbIw5lZ1AGorsagr4RlvCMlCK/M0XzQBCvh8=";
   };
 
   nativeBuildInputs = [

From 3157d6a8b458567970fcc9397f6a52666b87f107 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 505/953] python3Packages.mdit-py-plugins: 0.3.0 -> 0.3.3

---
 .../python-modules/mdit-py-plugins/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix
index 4174c18d10bf..4b780c40df85 100644
--- a/pkgs/development/python-modules/mdit-py-plugins/default.nix
+++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
-, setuptools
+, flit-core
 , markdown-it-py
 , pytest-regressions
 , pytestCheckHook
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "mdit-py-plugins";
-  version = "0.3.0";
+  version = "0.3.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -18,12 +18,12 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-9eaVM5KxrMY5q0c2KWmctCHyPGmEGGNa9B3LoRL/mcI=";
   };
 
   nativeBuildInputs = [
-    setuptools
+    flit-core
   ];
 
   propagatedBuildInputs = [

From afc23a5a3b42ce7498743edfb7ffc32d74a78023 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:24 +0100
Subject: [PATCH 506/953] python3Packages.mediapy: 1.1.0 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix
index 9b188f9c2a59..44190b11e599 100644
--- a/pkgs/development/python-modules/mediapy/default.nix
+++ b/pkgs/development/python-modules/mediapy/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "mediapy";
-  version = "1.1.0";
+  version = "1.1.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E=";
+    hash = "sha256-uz+Pv3DvmhDajIqNpCj+2HsRT7Dh7Ks5yryhiEa8KOI=";
   };
 
   propagatedBuildInputs = [ ipython matplotlib numpy pillow ];

From b0a91bfaf8fca33e4bba99d8272b67238ab9c3d1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:25 +0100
Subject: [PATCH 507/953] python3Packages.mesa: 0.8.7 -> 1.1.1

---
 .../python-modules/mesa/default.nix           | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix
index aaf13a76530d..2398551b0daa 100644
--- a/pkgs/development/python-modules/mesa/default.nix
+++ b/pkgs/development/python-modules/mesa/default.nix
@@ -1,29 +1,46 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy27
-, cookiecutter, networkx , pandas, tornado, tqdm
-, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, cookiecutter
+, networkx
+, pandas
+, tornado
+, tqdm
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "mesa";
-  version = "0.8.7";
+  version = "1.1.1";
+  format = "setuptools";
 
   # According to their docs, this library is for Python 3+.
   disabled = isPy27;
 
-  src = fetchFromGitHub {
-    owner = "projectmesa";
-    repo = "mesa";
-    rev = "v${version}";
-    sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19";
+  src = fetchPypi {
+    pname = "Mesa";
+    inherit version;
+    hash = "sha256-FPQLPClI8CKVsacZs4DLFnaikVSwrevU5TfUMevXgSY=";
   };
 
-  checkInputs = [ pytest ];
+  propagatedBuildInputs = [
+    cookiecutter
+    networkx
+    pandas
+    tornado
+    tqdm
+  ];
 
-  # Ignore test which tries to mkdir in unreachable location.
-  checkPhase = ''
-    pytest tests -k "not scaffold"
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ];
+  disabledTests = [
+    "test_examples"
+    "test_run"
+    "test_scaffold_creates_project_dir"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/projectmesa/mesa";

From 1628b6620cb87d047c3539f6eba876b8cf50836f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:25 +0100
Subject: [PATCH 508/953] python3Packages.meson-python: 0.10.0 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index a4d650c27f59..69cfa50f8fd4 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.10.0";
+  version = "0.12.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "meson_python";
-    hash = "sha256-CN0SLBB029XFW1OZOnGcynPdghY3LJEhf3pVAmD55+E=";
+    hash = "sha256-jLFZqAk6LnPPqJf4CS7JO3TjhC+U3/f944HG/g4LBk0=";
   };
 
   nativeBuildInputs = [

From 5d043b25c706e5b940976440a878e17049fd7f6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:25 +0100
Subject: [PATCH 509/953] python3Packages.mip: 1.14.1 -> 1.14.2

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

diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix
index 6b1c353c23d7..1b86734624a5 100644
--- a/pkgs/development/python-modules/mip/default.nix
+++ b/pkgs/development/python-modules/mip/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "mip";
-  version = "1.14.1";
+  version = "1.14.2";
 
   disabled = pythonOlder "3.7";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bvpm5vUp15fbv/Sw1Lx70ihA7VHsSUzwFzoFDG+Ow1M=";
+    sha256 = "sha256-wr4gXSh456heG5nsaEi2yo7LMre2Nd6QbTm0dcDCX1k=";
   };
 
   checkInputs = [ matplotlib networkx numpy pytestCheckHook ];

From bf5f0d590c45bfdb3ccc2a7c80e0254bf05d4352 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:25 +0100
Subject: [PATCH 510/953] python3Packages.mkdocs: 1.3.0 -> 1.4.2

---
 .../python-modules/mkdocs/default.nix         | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix
index 0fb61bd8a599..347f7452d73b 100644
--- a/pkgs/development/python-modules/mkdocs/default.nix
+++ b/pkgs/development/python-modules/mkdocs/default.nix
@@ -4,7 +4,11 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
-  # runtime deps
+
+# buildtime
+, hatchling
+
+# runtime deps
 , click
 , ghp-import
 , importlib-metadata
@@ -15,7 +19,8 @@
 , pyyaml
 , pyyaml-env-tag
 , watchdog
-  # testing deps
+
+# testing deps
 , babel
 , mock
 , unittestCheckHook
@@ -23,16 +28,26 @@
 
 buildPythonPackage rec {
   pname = "mkdocs";
-  version = "1.3.0";
+  version = "1.4.2";
+  format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
-    sha256 = "sha256-S4xkr3jS5GvkMu8JnEGfqhmkxy3FtZZb7Rbuniltudg=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-/NxiKbCd2acYcNe5ww3voM9SGVE2IDqknngqApkDbNs=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "Markdown >=3.2.1, <3.4" "Markdown"
+  '';
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     click
     jinja2

From e6e62e9014765d34c22c05efe09d5c06d4252791 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 14:25:59 +0100
Subject: [PATCH 511/953] python3Packages.mkdocs-material-extensions: 1.0.3 ->
 1.1.1

---
 .../mkdocs-material-extensions.nix              | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix
index 2d03c8fa8c5d..4e1c47a8c49d 100644
--- a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix
+++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix
@@ -1,16 +1,25 @@
-{ lib, fetchFromGitHub, buildPythonPackage }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, hatchling
+}:
 
 buildPythonPackage rec {
   pname = "mkdocs-material-extensions";
-  version = "1.0.3";
+  version = "1.1.1";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "facelessuser";
     repo = pname;
-    rev = version;
-    sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3";
+    rev = "refs/tags/${version}";
+    hash = "sha256-FHI6WEQRd/Ff6pmU13f8f0zPSeFhhbmDdk4/0rdIl4I=";
   };
 
+  nativeBuildInputs = [
+    hatchling
+  ];
+
   doCheck = false; # Circular dependency
 
   pythonImportsCheck = [ "materialx" ];

From 3b8c42c9b04a3c8a1e40b62ae9e274c89af87c0b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 13:49:05 +0100
Subject: [PATCH 512/953] python3Packages.hatch-requirements-txt: init at 0.3.0

---
 .../hatch-requirements-txt/default.nix        | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/hatch-requirements-txt/default.nix

diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix
new file mode 100644
index 000000000000..b7ba9446575d
--- /dev/null
+++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, hatch
+, hatchling
+, packaging
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "hatch-requirements-txt";
+  version = "0.3.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "repo-helper";
+    repo = "hatch-requirements-txt";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Gyt5Fs8uqVe0cOKtxFeg1n1WMyeK5Iokh71ynb2i5cM=";
+  };
+
+  nativeBuildInputs = [
+    hatch
+  ];
+
+  propagatedBuildInputs = [
+    hatchling
+    packaging
+  ];
+
+  doCheck = false; # missing coincidence dependency
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/repo-helper/hatch-requirements-txt/releases/tag/${version}";
+    description = "Hatchling plugin to read project dependencies from requirements.txt";
+    homepage = "https://github.com/repo-helper/hatch-requirements-txt";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f96120165e0a..da85f0e3352d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4189,6 +4189,8 @@ self: super: with self; {
 
   hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { };
 
+  hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { };
+
   haversine = callPackage ../development/python-modules/haversine { };
 
   hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };

From 7504ff4f4e5ebbe91cf3b016b8b6f52c3e043b93 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:25 +0100
Subject: [PATCH 513/953] python3Packages.mkdocs-material: 8.4.3 -> 8.5.11

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

diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index d82c1a654362..fe1eca400072 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -2,6 +2,9 @@
 , callPackage
 , buildPythonPackage
 , fetchFromGitHub
+, hatch-requirements-txt
+, hatch-nodejs-version
+, hatchling
 , jinja2
 , markdown
 , mkdocs
@@ -9,12 +12,13 @@
 , pygments
 , pymdown-extensions
 , pythonOlder
+, requests
 }:
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "8.4.3";
-  format = "setuptools";
+  version = "8.5.11";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -22,9 +26,15 @@ buildPythonPackage rec {
     owner = "squidfunk";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-ntArFD/wnoFC2vMS9WjiFP5/I1XklgSPGKGxFXxdNxs=";
+    hash = "sha256-jF5lpRv2itkhkqH7RzUXEH5e0Bia3SnTApfoy61RfJA=";
   };
 
+  nativeBuildInputs = [
+    hatch-requirements-txt
+    hatch-nodejs-version
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     jinja2
     markdown
@@ -32,6 +42,7 @@ buildPythonPackage rec {
     mkdocs-material-extensions
     pygments
     pymdown-extensions
+    requests
   ];
 
   # No tests for python

From 60a8a9c7be0112654cf6e8e72a53c1ebe1a74521 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:25 +0100
Subject: [PATCH 514/953] python3Packages.mkdocs-minify: 0.5.0 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify/default.nix
index ee6765d31751..3c952fb06610 100644
--- a/pkgs/development/python-modules/mkdocs-minify/default.nix
+++ b/pkgs/development/python-modules/mkdocs-minify/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-minify";
-  version = "0.5.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "byrnereese";
     repo = "${pname}-plugin";
-    rev = version;
-    sha256 = "sha256-7v4uX711KAKuXFeVdLuIdGQi2i+dL4WX7+Zd4H1L3lM=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-ABoLt5sFpt8Hm07tkqeAcs63ZvJ4vTbGw4QRYVYpMEA=";
   };
 
   propagatedBuildInputs = [

From 2f3020e43ca735688dbf2609fba474147df82db8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:25 +0100
Subject: [PATCH 515/953] python3Packages.mkdocs-swagger-ui-tag: 0.4.3 -> 0.5.1

---
 .../python-modules/mkdocs-swagger-ui-tag/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index 2997e93ce0b9..46e3d410614b 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-swagger-ui-tag";
-  version = "0.4.3";
+  version = "0.5.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-N/7JhVX3STsUAz7O6yWkvKz72+3RZA5CNb3Z6FTrdRs=";
+    sha256 = "sha256-CAIQbSg8o+FxPqb/O9ML1b6OxmmH4c+RRU4ecHyfn8w=";
   };
 
   propagatedBuildInputs = [ mkdocs beautifulsoup4 ];

From 31c183f769e85d1de26be0bbd37c481651e6785e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 516/953] python3Packages.mlxtend: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix
index 63cc4e3b39ec..a3747545b4da 100644
--- a/pkgs/development/python-modules/mlxtend/default.nix
+++ b/pkgs/development/python-modules/mlxtend/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "mlxtend";
-  version = "0.20.0";
+  version = "0.21.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "rasbt";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-ECDO3nc9IEgmZNdSA70BzOODOi0wnisI00F2Dxzdz+M=";
+    sha256 = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA=";
   };
 
   checkInputs = [ pytestCheckHook ];

From e8147603f742bc133f3f668f3d9137b0c4b67ad1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 517/953] python3Packages.mne-python: 1.2.2 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix
index 53a852934d47..702521de977a 100644
--- a/pkgs/development/python-modules/mne-python/default.nix
+++ b/pkgs/development/python-modules/mne-python/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "mne-python";
-  version = "1.2.2";
+  version = "1.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "mne-tools";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-KFifnu9MR3FoVs7gLv+CpB/p3/6Iej9RJuBf1uc1HJs=";
+    hash = "sha256-3N9S8QhQ3vtC9SZBQqvwVpE8V062VVWTV3nBhPI1lmA=";
   };
 
   propagatedBuildInputs = [

From d082644e73e2847cfd1fc0dafbaa675ec339a976 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 518/953] python3Packages.mocket: 3.10.8 -> 3.10.9

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

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 7e5d62454c6b..799c67089275 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.10.8";
+  version = "3.10.9";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-aiofKFE9CPLMVJm+IT6VmtJSsVuH7ucpv5Kp1w7d2FE=";
+    sha256 = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw=";
   };
 
   propagatedBuildInputs = [

From 258013bebaca02bf013de591296797b655156914 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 519/953] python3Packages.monai: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix
index 4f142c5f2bba..faa8e112c530 100644
--- a/pkgs/development/python-modules/monai/default.nix
+++ b/pkgs/development/python-modules/monai/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "monai";
-  version = "1.0.0";
+  version = "1.1.0";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Project-MONAI";
     repo = "MONAI";
     rev = "refs/tags/${version}";
-    hash = "sha256-BnsgZpkXsY2l6inuzOkuvK4zJqYs2dj7jF5gKKiLnZM=";
+    hash = "sha256-XTjZhynIiFtFjJSW6rRAnpErZvf6QHkuK4e2L6l3naM=";
   };
 
   # Ninja is not detected by setuptools for some reason even though it's present:

From d80c5f78a759e5f1deb0c6656968dbe47dd52fde Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 520/953] python3Packages.mongoengine: 0.24.1 -> 0.25.0

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

diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix
index ff91a63d792f..3ba9c9dea368 100644
--- a/pkgs/development/python-modules/mongoengine/default.nix
+++ b/pkgs/development/python-modules/mongoengine/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mongoengine";
-  version = "0.24.1";
+  version = "0.25.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "MongoEngine";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-KmCk4YTkwpWePTOOFyp4hGIcxpy/rrfAAC1/Xes/IYk=";
+    sha256 = "sha256-2UPjyKJGiW8UfWgMu8WKZJ5l+p4vTR57GxMFC5amb4A=";
   };
 
   propagatedBuildInputs = [

From d48a83c558925d6b09880c554627b9d251447353 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 521/953] python3Packages.monty: 2022.9.8 -> 2022.9.9

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

diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index a5d5958ec0dc..b4b8292ea01d 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "monty";
-  version = "2022.9.8";
+  version = "2022.9.9";
   disabled = pythonOlder "3.5"; # uses type annotations
 
   src = fetchFromGitHub {
     owner = "materialsvirtuallab";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-3C5L7nKokuxtYlw13AKSrNVsvKH9okmBNyLXt7Vmjqk=";
+    sha256 = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw=";
   };
 
   postPatch = ''

From d691b8da974f839e18aa51ea7d347f4d11c7cc7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 522/953] python3Packages.more-itertools: 8.14.0 -> 9.0.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 1735148c58ec..4f8b9884d44c 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.14.0";
+  version = "9.0.0";
   format = "flit";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wJRDzT1UOLja/M2GemvBywiUOJ6Qy1PSJ0VrCwvMt1A=";
+    sha256 = "sha256-WmJX5Ah47wUgsYA5kOPiIwOkG1cUAGwyo/2DBLJuoas=";
   };
 
   nativeBuildInouts = [

From 9ae1a57e3392ecfbde6312dafeb0e0c352edf605 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 523/953] python3Packages.mt-940: 4.26.0 -> 4.27.0

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

diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
index 3b63b02986a2..b2e5f53119f7 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -3,12 +3,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.26.0";
+  version = "4.27.0";
   pname = "mt-940";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE=";
+    sha256 = "sha256-LL4CRioio63gpXrsurVucrkFgQrEh0gZPZ79Y2tk/90=";
   };
 
   propagatedBuildInputs = lib.optional (!isPy3k) enum34;

From 08e5a5a0f510424ec87d29098297d793d897573a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 524/953] python3Packages.multidict: 6.0.3 -> 6.0.4

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

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index ebc4daae0bc1..0a32937f13a5 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "6.0.3";
+  version = "6.0.4";
 
   disabled = pythonOlder "3.7";
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JSOikAbANGh+zNPucAk6aXEpo//ocyU107Lfak7MJ50=";
+    hash = "sha256-NmaQZJLvt2RTwOe5fyz0WbBoLnQCwEialUhJZdvB2kk=";
   };
 
   postPatch = ''

From 3c7fd0faaba45968573d3e1690d8b5e0e1f30c7c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:26 +0100
Subject: [PATCH 525/953] python3Packages.multiprocess: 0.70.13 -> 0.70.14

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

diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix
index 8558706485c2..6d0780370ff0 100644
--- a/pkgs/development/python-modules/multiprocess/default.nix
+++ b/pkgs/development/python-modules/multiprocess/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "multiprocess";
-  version = "0.70.13";
+  version = "0.70.14";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "uqfoundation";
     repo = pname;
     rev = "refs/tags/multiprocess-${version}";
-    sha256 = "sha256-L/PesvaidavDEgJGqBxwcCYtG9TlKSwaxrUMJ+XVFOM=";
+    sha256 = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo=";
   };
 
   propagatedBuildInputs = [

From 334b50032b41dbfa23fd18f3c92ad28a08481e80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 526/953] python3Packages.myst-docutils: 0.18.0 -> 0.18.1

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

diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix
index c7d9f7999bc7..6746b314c021 100644
--- a/pkgs/development/python-modules/myst-docutils/default.nix
+++ b/pkgs/development/python-modules/myst-docutils/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "myst-docutils";
-  version = "0.18.0";
+  version = "0.18.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-evyIuNLbBWR3KfQMv2lNw6fOgX1+/uMS5cHIbSTYDmA=";
+    sha256 = "sha256-Dxg5TtQaK4plvRmXZa7AqPFIv/jvUOpV8M/BJohiXj0=";
   };
 
   nativeBuildInputs = [

From aa03642101b84a69e45243c00ebcd51d2969147f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 527/953] python3Packages.myst-parser: 0.18.0 -> 0.18.1

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

diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index e81bf763b3a8..a7a0ec69c8f5 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -19,15 +19,15 @@
 
 buildPythonPackage rec {
   pname = "myst-parser";
-  version = "0.18.0";
+  version = "0.18.1";
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-GEtrC7o5YnkuvBfQQfhG5P74QMiHz63Fdh1cC/r5CF0=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-wgRZwafAF05LtwjH6SVKzsY7bKeZ6lUlM3dB5PdOn1E=";
   };
 
   postPatch = ''

From 6e483a3261b17d95de5ce03625fc87468c1ab206 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 528/953] python3Packages.nameparser: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix
index 63e795f98c85..d3780e0c3c29 100644
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "nameparser";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM=";
+    sha256 = "sha256-9LbHwQSNUovWqisnz0KgZEfSsx5FqVsgRJUTB48dhu8=";
   };
 
   LC_ALL="en_US.UTF-8";

From b9a99f8adf435cff7ac70db067fad8cb07ec867c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 529/953] python3Packages.napari: 0.4.16 -> 0.4.17

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

diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix
index 4e4fffa53063..592407007221 100644
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@@ -35,7 +35,7 @@
 
 mkDerivationWith buildPythonPackage rec {
   pname = "napari";
-  version = "0.4.16";
+  version = "0.4.17";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -44,7 +44,7 @@ mkDerivationWith buildPythonPackage rec {
     owner = "napari";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Fx3DoTIb2ev5wMP/gmprPIoxeF2f+Cbac6pnWB/zTTw=";
+    hash = "sha256-34FALCI7h0I295553Rv0KZxKIipuA2OMNsINGde7/oE=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 0b7bcc050395c4986d26ddae85dc8b66502ab39c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 530/953] python3Packages.nbclient: 0.6.8 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index 1643904c314f..937ade730310 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -1,6 +1,7 @@
 { async_generator
 , buildPythonPackage
 , fetchFromGitHub
+, hatchling
 , ipykernel
 , ipywidgets
 , jupyter-client
@@ -11,14 +12,15 @@
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
+, testpath
 , traitlets
 , xmltodict
 }:
 
 let nbclient = buildPythonPackage rec {
   pname = "nbclient";
-  version = "0.6.8";
-  format = "setuptools";
+  version = "0.7.2";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -26,10 +28,20 @@ let nbclient = buildPythonPackage rec {
     owner = "jupyter";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-+GQkEGWReo9y8bgcysslQdzJUcvQiZkQTQiwmWJ1mx8=";
+    hash = "sha256-2H6Oi1tK/GrtfMTR1j12tZdRzQkFUxXzMSpfCtGPyWE=";
   };
 
-  propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    async_generator
+    traitlets
+    nbformat
+    nest-asyncio
+    jupyter-client
+  ];
 
   # circular dependencies if enabled by default
   doCheck = false;
@@ -40,6 +52,7 @@ let nbclient = buildPythonPackage rec {
     nbconvert
     pytest-asyncio
     pytestCheckHook
+    testpath
     xmltodict
   ];
 

From 4c58c9fd41503369e0cdc00a0720177ae1a8da5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 531/953] python3Packages.nbformat: 5.7.0 -> 5.7.1

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

diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index a418e5c6b48f..c9c66ca33a64 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "nbformat";
-  version = "5.7.0";
+  version = "5.7.1";
 
   disabled = pythonOlder "3.7";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d4760c15c1a04269ef5caf375be8b98dd2f696e5eb9e603ec2bf091f9b0d3f3";
+    sha256 = "sha256-OBCgEwRT7QMZcFIdIJibilkvPC5zKDqCgK40rh91s/g=";
   };
 
   nativeBuildInputs = [

From 9732403d4ad5236cab526577357a6fdccce8dbe2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 532/953] python3Packages.nest_asyncio: 1.5.5 -> 1.5.6

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

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index faa015d85f31..995641eb9253 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.5";
+  version = "1.5.6";
   pname = "nest_asyncio";
   disabled = !(pythonAtLeast "3.5");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-5EIpHNlCaYvmGYI6F6hqV1nqvh+GEwhHkN4Yn+nhbWU=";
+    sha256 = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA=";
   };
 
   # tests not packaged with source dist as of 1.3.2/1.3.2, and

From 6c06893996ec3fc2849d853c90033a84f9070164 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:27 +0100
Subject: [PATCH 533/953] python3Packages.networkx: 2.8.6 -> 2.8.8

---
 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 7c026be5cd26..65a722b8500c 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.6";
+  version = "2.8.8";
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-vSt3MDAIYMvS2v6OWvif9cmmXDl1s1J5nYemI4tDAaY=";
+    sha256 = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4=";
   };
 
   propagatedBuildInputs = [ decorator setuptools ];

From f16d438df3998a97cd7513d3fae978f804dbf3f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 534/953] python3Packages.nipype: 1.8.4 -> 1.8.5

---
 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 fc221085f98e..1e95b77c181d 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.4";
+  version = "1.8.5";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-yoG6iLfF7ugBL4eNC9OLINIzBj1YgF4TVngFKb77qak=";
+    sha256 = "sha256-44QnQ/tmBGTdKd5z3Pye9m0nO+ELzGQFn/Ic1e8ellU=";
   };
 
   postPatch = ''

From 2bae125367bdd3c3a4ed32f4b7f0a6438036b635 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 535/953] python3Packages.nkdfu: 0.1 -> 0.2

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

diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix
index fa094404b8b1..d95b688ed9ce 100644
--- a/pkgs/development/python-modules/nkdfu/default.nix
+++ b/pkgs/development/python-modules/nkdfu/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "nkdfu";
-  version = "0.1";
+  version = "0.2";
   format = "flit";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A=";
+    sha256 = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg=";
   };
 
   propagatedBuildInputs = [

From 41320581ccacba1800b1e0a5681a78880b49f6c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 536/953] python3Packages.notebook: 6.4.12 -> 6.5.2

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

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index fdb599466ff2..4e16aa3bdd0f 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -27,12 +27,12 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "6.4.12";
+  version = "6.5.2";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-YmjJ7JBIz/ekVAXJkMKaycpAsLw+wpJj0hjF4B8rToY=";
+    sha256 = "sha256-wYl+UxfiJfx4tFVJpqtLZo5MmW/QOgTpOP5eevK//9A=";
   };
 
   LC_ALL = "en_US.utf8";

From e28781aeeddda06c2cc988b756e09e8f77e4436f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 537/953] python3Packages.notebook-shim: 0.1.0 -> 0.2.2

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

diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix
index a37e0cb3c679..4f606a415709 100644
--- a/pkgs/development/python-modules/notebook-shim/default.nix
+++ b/pkgs/development/python-modules/notebook-shim/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "notebook-shim";
-  version = "0.1.0";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "notebook_shim";
-    rev = "v${version}";
-    sha256 = "sha256-5oIYj8SdC4E0N/yFxsmD2p4VkStHvqrVqAwb/htyPm4=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s=";
   };
 
   propagatedBuildInputs = [ jupyter_server ];

From b7460358cfb5e167640eef57657958370ad1c91a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 538/953] python3Packages.nsz: 4.1.0 -> 4.2.1

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

diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix
index c165e850de0c..29284c97eaeb 100644
--- a/pkgs/development/python-modules/nsz/default.nix
+++ b/pkgs/development/python-modules/nsz/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "nsz";
-  version = "4.1.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "nicoboss";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-tdngXV+VUOAkg3lF2NOmw0mBeSEE+YpUfuKukTKcPnM=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4=";
   };
 
   propagatedBuildInputs = [pycryptodome enlighten zstandard ]

From 5393c637129ead9f4a19046f0de7101056d43cc2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 539/953] python3Packages.ntc-templates: 3.0.0 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index a188daf6b428..f0b6c0dedc60 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "ntc-templates";
-  version = "3.0.0";
+  version = "3.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY=";
   };
 
   nativeBuildInputs = [

From d8cf929129ddd8d8aaf87b47d926df981d6dfdea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 540/953] python3Packages.numcodecs: 0.10.2 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index bb550bea782c..e6b4e591e921 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -2,28 +2,33 @@
 , buildPythonPackage
 , fetchPypi
 , isPy27
+, setuptools
 , setuptools-scm
 , cython
 , entrypoints
 , numpy
 , msgpack
+, py-cpuinfo
 , pytestCheckHook
 , python
 }:
 
 buildPythonPackage rec {
   pname = "numcodecs";
-  version = "0.10.2";
+  version = "0.11.0";
+  format ="pyproject";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-IoOMaz/Zhr2cckA5uIhwBX95DiKyDm4cu6oN4ULdWcQ=";
+    sha256 = "sha256-bAWLMh3oShcpKZsOrk1lKy5I6hyn+d8NplyxNHDmNes=";
   };
 
   nativeBuildInputs = [
+    setuptools
     setuptools-scm
     cython
+    py-cpuinfo
   ];
 
   propagatedBuildInputs = [

From 34958e7fc36620e14f6ad81591add9ed92163572 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:28 +0100
Subject: [PATCH 541/953] python3Packages.numexpr: 2.8.3 -> 2.8.4

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

diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 6c76a8fc88ee..63d95622c061 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.8.3";
+  version = "2.8.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-y2R8nZx4Xa4HWb9sh1zeK+xHK1w/emAVc0sWGudm0UE=";
+    hash = "sha256-1UMlN0GNGGkbkRXWFdbaoX7oJ1uu8+3xr7v4vGmAYUc=";
   };
 
   nativeBuildInputs = [

From 051bb529f0d8e02991b5208ea9a49b2b0f908d44 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:29 +0100
Subject: [PATCH 542/953] python3Packages.numpydoc: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix
index 9eebc8c39a48..6be8e93f545a 100644
--- a/pkgs/development/python-modules/numpydoc/default.nix
+++ b/pkgs/development/python-modules/numpydoc/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "numpydoc";
-  version = "1.4.0";
+  version = "1.5.0";
   format = "setuptools";
 
   disabled = isPy27;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname;
     inherit version;
-    sha256 = "sha256-lJTa8cdhL1mQX6CeZcm4qQu6yzgE2R96lOd4gx5vz6U=";
+    sha256 = "sha256-sNt7daMjZ6DiXCOzl4QsZeNEoSBlJNFsgGnwockbX0w=";
   };
 
   postPatch = ''

From acd47c7e3fe4b190ed82ef380e8fefec2db19a4e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:29 +0100
Subject: [PATCH 543/953] python3Packages.numpy-stl: 2.17.1 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index c4877e839cd1..1b28ac339f7f 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "numpy-stl";
-  version = "2.17.1";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NskgGS9EXdV/CRpjYpvdpaknTUdROjOsLvrRJzc5S3o=";
+    sha256 = "sha256-V4t46ssFKayaui8X3MNj1Yx8PFcIcQwY+MHpll8ugaw=";
   };
 
   propagatedBuildInputs = [

From 0a2aafb65e3996fb8dea63add1aac4283b0e286a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:29 +0100
Subject: [PATCH 544/953] python3Packages.nutils: 7.0 -> 7.2

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

diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix
index 3089093d9cd1..4d85e9bab865 100644
--- a/pkgs/development/python-modules/nutils/default.nix
+++ b/pkgs/development/python-modules/nutils/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "nutils";
-  version = "7.0";
+  version = "7.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "evalf";
     repo = "nutils";
     rev = "refs/tags/v${version}";
-    hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8=";
+    hash = "sha256-KCvUBE3qbX6v1HahBj4/jjM8ujvFGtWNuH1D+bTHrQ0=";
   };
 
   propagatedBuildInputs = [

From 5cd36bd3675d98115e4f7e7559b7b226c8de756d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:29 +0100
Subject: [PATCH 545/953] python3Packages.oci: 2.85.0 -> 2.90.0

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

diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 11525c710382..361eefdfd7d1 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "oci";
-  version = "2.85.0";
+  version = "2.90.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "oracle";
     repo = "oci-python-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NaVD7oWdKrUC0wjoFTbRg02tCFMlRyNIRHciTtyra7w=";
+    hash = "sha256-pDLG8w5YfjmiP5JYDWoSLC0NGTfJ2Zmkz4Ed8zAB1pY=";
   };
 
   propagatedBuildInputs = [

From f2025defc27736259d18c44e8c7935d9d984d1c7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:29 +0100
Subject: [PATCH 546/953] python3Packages.openapi-core: 0.16.3 -> 0.16.4

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

diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index 509e5a2184dd..8a2bcc444dd1 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "openapi-core";
-  version = "0.16.3";
+  version = "0.16.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "p1c2u";
     repo = "openapi-core";
     rev = "refs/tags/${version}";
-    hash = "sha256-aej82CXk0bCE5W0+uuSVSvC08D5yoXv0h1wcoABWRoI=";
+    hash = "sha256-16DM9HrptQmj95OOM5XSGIEKzxrCkN3sU/7o8Yh0l6s=";
   };
 
   postPatch = ''

From f2a63866f8139aabdcf4730917d229c663d44f93 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:29 +0100
Subject: [PATCH 547/953] python3Packages.openstep-plist: 0.3.0 -> 0.3.0.post1

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

diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix
index 274294f59388..8fb7d7676403 100644
--- a/pkgs/development/python-modules/openstep-plist/default.nix
+++ b/pkgs/development/python-modules/openstep-plist/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "openstep-plist";
-  version = "0.3.0";
+  version = "0.3.0.post1";
 
   src = fetchPypi {
     pname = "openstep_plist";
     inherit version;
-    sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk=";
+    sha256 = "sha256-GK/z1e3tnr++3+ukRKPASDJGl7+KObsENhwN1Tv+qws=";
     extension = "zip";
   };
 

From 5876815f2cbac6447ff79d9f501dc760136d590a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:29 +0100
Subject: [PATCH 548/953] python3Packages.optuna: 2.10.1 -> 3.0.5

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

diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix
index 1236a24628ec..f4dfcf4f58da 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/pkgs/development/python-modules/optuna/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "optuna";
-  version = "2.10.1";
+  version = "3.0.5";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "optuna";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-HHVEoLCZtEJEfc4xYobQrzRcDDxxeQjgL2Rw2KeVbi0=";
+    sha256 = "sha256-TfAWL81a7GIePkPm+2uXinBP5jwnhWCZPp5GJjXOC6g=";
   };
 
   checkInputs = [

From f35fa7843977f6b2fdcb709c09e1940e7bf476ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 549/953] python3Packages.oslo-utils: 6.0.1 -> 6.1.0

---
 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 fe207cbd5c46..4d2c1e5754c3 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.1";
+  version = "6.1.0";
 
   src = fetchPypi {
     pname = "oslo.utils";
     inherit version;
-    sha256 = "sha256-mwRU+ZQV0MqsXIYFNxbXRtGY7Oxm5nLY5eY4a2+6orY=";
+    sha256 = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus=";
   };
 
   postPatch = ''

From 3795acc160631d5be8bf3429f31a69280d57bd1f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 550/953] python3Packages.osqp: 0.6.2.post5 -> 0.6.2.post8

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

diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index 016f9325db40..fc001c52a5ef 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "osqp";
-  version = "0.6.2.post5";
+  version = "0.6.2.post8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-svoXquQqftSY7CYbM/Jiu0s2BefoRkBiFZ2froF/DWE=";
+    hash = "sha256-I9a65KNhL2DV9lLQ5fpLLq1QfKv/9dkw2CIFeubtZnc=";
   };
 
   postPatch = ''

From 08491ea91e94c7b84b821d9c0e5ccb2d13287bc5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 551/953] python3Packages.ovoenergy: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix
index 1e60872b2c1b..005557a2a6e6 100644
--- a/pkgs/development/python-modules/ovoenergy/default.nix
+++ b/pkgs/development/python-modules/ovoenergy/default.nix
@@ -3,12 +3,15 @@
 , buildPythonPackage
 , click
 , fetchFromGitHub
+, incremental
+, pydantic
 , pythonOlder
+, typer
 }:
 
 buildPythonPackage rec {
   pname = "ovoenergy";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,13 +19,24 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ZbLs8w0qeaV2qWP08FKnlZ3fefj15Bw2A2bGpL6/d0I=";
   };
 
+  nativeBuildInputs = [
+    incremental
+  ];
+
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "typer==0.6.1" "typer"
+  '';
+
   propagatedBuildInputs = [
     aiohttp
     click
+    pydantic
+    typer
   ];
 
   # Project has no tests

From 7850963e5d4e0a6c26010f66352ccaaaabbbd1f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 552/953] python3Packages.panel: 0.14.1 -> 0.14.2

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

diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index 1271fb3b4da0..9b35cb6ac177 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "panel";
-  version = "0.14.1";
+  version = "0.14.2";
 
   format = "wheel";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # tries to fetch even more artifacts
   src = fetchPypi {
     inherit pname version format;
-    hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI=";
+    hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU=";
   };
 
   propagatedBuildInputs = [

From ab27d4b784aac6716f0900a00bde4d28c7e09e6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 553/953] python3Packages.parfive: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix
index 131d8de094fc..28f69b432079 100644
--- a/pkgs/development/python-modules/parfive/default.nix
+++ b/pkgs/development/python-modules/parfive/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "parfive";
-  version = "2.0.1";
+  version = "2.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/b4KrYg0mXoQJ/L+9ol7gD2myB0aLgDj0IWa8sxarKU=";
+    sha256 = "sha256-kIIR+cXLUtyLJ5YmhyCV88zhXahok/U7QXbezt3PyF0=";
   };
 
   buildInputs = [

From 3520c79fea38599a22cb1a9c511d5bff9a394684 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 554/953] python3Packages.particle: 0.20.1 -> 0.21.0

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

diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix
index d1207fe84983..a804ed19dfb5 100644
--- a/pkgs/development/python-modules/particle/default.nix
+++ b/pkgs/development/python-modules/particle/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "particle";
-  version = "0.20.1";
+  version = "0.21.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HoWWwoGMrkRqlYzrF2apGsxsZAHwHbHSO5TCSCelxUc=";
+    sha256 = "sha256-SDdIg05+gfLNaQ+glitTf3Z/6K9HBci62mjIu9rIoX0=";
   };
   nativeBuildInputs = [
     setuptools-scm

From 2694b9d7c021e96163cff538eb35ca20557a2b22 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 555/953] python3Packages.parver: 0.3.1 -> 0.4

---
 .../python-modules/parver/default.nix         | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
index 878b2746758c..7ce7a7a3884f 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -1,32 +1,35 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, six
+, pythonOlder
+, setuptools
 , attrs
 , pytestCheckHook
 , hypothesis
 , pretend
 , arpeggio
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "parver";
-  version = "0.3.1";
+  version = "0.4";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";
+    hash = "sha256-1KPbuTxTNz7poLoFXkhYxEFpsgS5EuSdAD6tlduam8o=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "arpeggio ~= 1.7" "arpeggio"
-  '';
+  nativeBuildInputs = [
+    setuptools
+  ];
 
   propagatedBuildInputs = [
-    six
     attrs
     arpeggio
+  ] ++ lib.optionals (pythonOlder "3.10") [
+    typing-extensions
   ];
 
   checkInputs = [

From e6f5bef95ba3dac5d203e8215073dbc3f141a060 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 556/953] python3Packages.path: 16.4.0 -> 16.6.0

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

diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix
index a22aa64e8b1e..0f8a96be94e1 100644
--- a/pkgs/development/python-modules/path/default.nix
+++ b/pkgs/development/python-modules/path/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "path";
-  version = "16.4.0";
+  version = "16.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uvLnV8Sxm+ggj55n5I+0dbSld9VhNZDORmk7298IL1I=";
+    hash = "sha256-vqOBbh1U9OM6rHjSAxoLDtL5XmnbhbRdUfF9+XBx2mk=";
   };
 
   nativeBuildInputs = [

From b6097e1a1bd7c1d9b5fc725cbd2422983f83ad5a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:30 +0100
Subject: [PATCH 557/953] python3Packages.pathos: 0.2.9 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix
index 9c6dd6256606..333f1be21c4e 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/pkgs/development/python-modules/pathos/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pathos";
-  version = "0.2.9";
+  version = "0.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "uqfoundation";
     repo = pname;
     rev = "refs/tags/pathos-${version}";
-    sha256 = "sha256-39D+itH0nkOzmh3Rpg/HXLRj2F1UPsys+iU0ZiodkM0=";
+    sha256 = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q=";
   };
 
   propagatedBuildInputs = [

From 900a521d817c456eb7d0e46e19c25b6fda4e9ea3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 558/953] python3Packages.pathspec: 0.10.1 -> 0.10.3

---
 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 121f83df2898..66facfd1e132 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pathspec";
-  version = "0.10.1";
+  version = "0.10.3";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0=";
+    hash = "sha256-ViAN5Ad9nQeRRlqpCVoB1CGGHkBbUJaVUFHe79aX1vY=";
   };
 
   nativeBuildInputs = [

From 59791d4b010aacfc258a95f6fa9224a33af30c15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 559/953] python3Packages.pdm-pep517: 1.0.4 -> 1.0.6

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

diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix
index 156226536bcf..94af38104c6c 100644
--- a/pkgs/development/python-modules/pdm-pep517/default.nix
+++ b/pkgs/development/python-modules/pdm-pep517/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pdm-pep517";
-  version = "1.0.4";
+  version = "1.0.6";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-OS+MK0fG7CBVDLjhniS529Jzc0E/BntW7Ndfl2f5MBU=";
+    sha256 = "sha256-pEB3A9UPpNZxODo1SGiwWhMGDBvzgmTLtd3Jpz5KHcU=";
   };
 
   preCheck = ''

From 0d18c3b1a56d3f04efc185cb2fd12f338a3ad2ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 560/953] python3Packages.peewee: 3.15.3 -> 3.15.4

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

diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 089088a09bd3..8351b05c39a8 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "peewee";
-  version = "3.15.3";
+  version = "3.15.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "coleifer";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-6s+JTUYmuP6Y6D+mi8YTznHbPYUS7yk259MuPpm9H/s=";
+    hash = "sha256-UbhJWooZuZOm1AUbM+66Qm76zar+sBOvuUnAc1vLvOU=";
   };
 
   buildInputs = [

From bbc8fb4c920efdeb3506f3f2800937b641a13962 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 561/953] python3Packages.pex: 2.1.117 -> 2.1.119

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index b42bb5e4e406..314d3fdfb0e6 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.117";
+  version = "2.1.119";
   format = "flit";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Q1dz/xEQuJOrelDAB3YhISK6HPsqBQXGAx7Qgpqq+6w=";
+    hash = "sha256-QughY8G0Z9/371tlG0VMUqeKW/Nndv9mMbR1AIBlmTA=";
   };
 
   nativeBuildInputs = [

From e1908edd6eba58c62581fac49cede11487c1f32e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 562/953] python3Packages.phonenumbers: 8.13.2 -> 8.13.3

---
 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 5123b9be6856..ce5c8a2e363d 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.13.2";
+  version = "8.13.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AXn2iNSMDn4WHre52G1YeUCvH1F0+Xwf39iTxZnA2Uo=";
+    hash = "sha256-fQxFwVQBOXC3i4b0GI4OAKjnfWvr73yB79wDjbh27ro=";
   };
 
   checkInputs = [

From d4142f11b9a3a0da0bb074570a87ab3a97df34e2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 563/953] python3Packages.phonopy: 2.17.0 -> 2.17.1

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

diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index db88015eaf76..fdfd05a8e497 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "phonopy";
-  version = "2.17.0";
+  version = "2.17.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bBlNCfq+b73Z/yxIhmP9s2kgjlGz+EKTpI1CnpuqkuU=";
+    hash = "sha256-t+1i1S8UVd0s9/Fda0H2kaouDDBVS+x6G40Meb2rLYc=";
   };
 
   propagatedBuildInputs = [

From 09ec532f1c2b3603544f3c4f509ab56c5d29deb3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 564/953] python3Packages.piccolo-theme: 0.12.0 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix
index 8f04d0ce00dc..4a0e3bf0f98b 100644
--- a/pkgs/development/python-modules/piccolo-theme/default.nix
+++ b/pkgs/development/python-modules/piccolo-theme/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "piccolo-theme";
-  version = "0.12.0";
+  version = "0.14.0";
 
   src = fetchPypi {
     pname = "piccolo_theme";
     inherit version;
-    sha256 = "sha256-o6uaqAo/Nb28doByq40XakKJpA4o6/Z/PzMhmb058FE=";
+    sha256 = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU=";
   };
 
   propagatedBuildInputs = [

From 8b27759a3a4983c58e128e10ed1efda63caef768 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:31 +0100
Subject: [PATCH 565/953] python3Packages.pint: 0.19.2 -> 0.20.1

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

diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index b4e68c190946..0dd3650810e1 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pint";
-  version = "0.19.2";
+  version = "0.20.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit version;
     pname = "Pint";
-    sha256 = "sha256-4dSYn/UQs3ja1k+RcR572r5cp411sGoYVprEVGeMS68=";
+    sha256 = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 15870dea7ad73f55554b7f7f3ab709d0bac555c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:32 +0100
Subject: [PATCH 566/953] python3Packages.pip-tools: 6.11.0 -> 6.12.1

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

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 7a595a85d8fd..78e2952ceae1 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "6.11.0";
+  version = "6.12.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kMXcFQ44VuRGO4HMyZMHzPlVTl24OT6yc3BcsLj3HGA=";
+    hash = "sha256-iO+3spqSP/6sBxPm8j74UpzGF1Un1CuT9zdWzJQ4cpM=";
   };
 
   patches = [ ./fix-setup-py-bad-syntax-detection.patch ];

From 77a284c3dacc673bf87d65667e89a931db0d3d4c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:32 +0100
Subject: [PATCH 567/953] python3Packages.pkginfo: 1.8.3 -> 1.9.2

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

diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix
index b3f4f1d450bf..5dd176c7ed90 100644
--- a/pkgs/development/python-modules/pkginfo/default.nix
+++ b/pkgs/development/python-modules/pkginfo/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "pkginfo";
-  version = "1.8.3";
+  version = "1.9.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-qE2kMY3Yb4cKlEeoyYNAqgYha/xvK3vcS4dmmErhhnw=";
+    sha256 = "sha256-rAPjfk1gGq7kD4CH9j/EoqbJgU3aLI+mqrGxgpZTvfo=";
   };
 
   checkInputs = [

From fb714af70d4cec3710df5962ecc46e3ab1fdc4c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:32 +0100
Subject: [PATCH 568/953] python3Packages.plantuml-markdown: 3.7.3 -> 3.8.0

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

diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix
index 6da64c191315..3c2d4bd7495c 100644
--- a/pkgs/development/python-modules/plantuml-markdown/default.nix
+++ b/pkgs/development/python-modules/plantuml-markdown/default.nix
@@ -11,7 +11,7 @@
 }:
 let
   pname = "plantuml-markdown";
-  version = "3.7.3";
+  version = "3.8.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -20,7 +20,7 @@ buildPythonPackage {
     owner = "mikitex70";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-iRIHq4GmYzNq11t61Lz69amOoG54j50Mc32NsaLNHOk=";
+    sha256 = "sha256-6zGE3j+AfS5r3dj+4mfT4juxKUODEOgGlnn3wtvPcEk=";
   };
 
   propagatedBuildInputs = [

From 0a075a8ef706f74149b3c49121072db629c57132 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:32 +0100
Subject: [PATCH 569/953] python3Packages.plaster: 1.0 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix
index 749ffdb7f321..ad2e4545cb04 100644
--- a/pkgs/development/python-modules/plaster/default.nix
+++ b/pkgs/development/python-modules/plaster/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "plaster";
-  version = "1.0";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3";
+    sha256 = "sha256-+L78VL+MEUfBCrQCl+yEwmdvotTqXW9STZQ2qAB075g=";
   };
 
   checkPhase = ''

From 077dffd8a50ae02b125d3fec669d47d4511236cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:32 +0100
Subject: [PATCH 570/953] python3Packages.platformdirs: 2.6.0 -> 2.6.2

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

diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 8c0bdb3cb43a..b21e65479bf5 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "2.6.0";
+  version = "2.6.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-qh5pv+rAFRMMJHr4nhKQ9Ndyvjd2QuSlkIeVcrXPrQI=";
+    hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From d7d8e5291434837e91ff5a8754ed67678802c5b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:32 +0100
Subject: [PATCH 571/953] python3Packages.plotly: 5.10.0 -> 5.11.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 f150945a37cb..05e7e15a0086 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.10.0";
+  version = "5.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-TTbZhZt6FTsnNWLe7tjCklh6Ry6x/VfNQVjsidne+ts=";
+    sha256 = "sha256-Tv70ecLsHYbc2shAW2ynDKZWSad0COOafoSh6i22x4c=";
   };
 
   propagatedBuildInputs = [

From c0f0ca33761b45cc4572462571a0ae67185e0414 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:32 +0100
Subject: [PATCH 572/953] python3Packages.plumbum: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index 70b4421778f3..d9410f246ba5 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -12,18 +12,18 @@
 
 buildPythonPackage rec {
   pname = "plumbum";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = "plumbum";
-    rev = "v${version}";
-    sha256 = "sha256-bCCcNFz+ZsbKSF7aCfy47lBHb873tDYN0qFuSCxJp1w=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-SqZO9qYOtBB+KWP0DLsImI64QTTpYKzWMYwSua9k2S0=";
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "--cov-config=setup.cfg" ""
+    substituteInPlace pyproject.toml \
+      --replace '"--cov-config=setup.cfg", ' ""
   '';
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -61,6 +61,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}";
     description = " Plumbum: Shell Combinators ";
     homepage = " https://github.com/tomerfiliba/plumbum ";
     license = licenses.mit;

From 0451b99f7d15a1f352b5ec1b4ad89cb3974400f9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:33 +0100
Subject: [PATCH 573/953] python3Packages.plyvel: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix
index d47805bb643f..09a1c31297b7 100644
--- a/pkgs/development/python-modules/plyvel/default.nix
+++ b/pkgs/development/python-modules/plyvel/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "plyvel";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4ea98bea04ebf0f44747bacdfafefc8827787106fbb787f0aedc46482b2dfd53";
+    sha256 = "sha256-zZGOCzFpCrzT0gKodCyvlRqy/hVz3nr3HDhFaEf5ICs=";
   };
 
   buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest;

From 90bb0fceca544c5afe01a9b16bddaa430098b916 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:33 +0100
Subject: [PATCH 574/953] python3Packages.poetry: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index ff5d4c91a5d6..83c91e847455 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -43,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.3.0";
+  version = "1.3.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     owner = "python-poetry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-e60lGOu/g3SahArQXUuW8nIFgReILF5/lPOfOn0qz5o=";
+    hash = "sha256-yiV2Y0vBF0d7BFfT5wonzRUGHVH040PZrlAUpVTFCZc=";
   };
 
   nativeBuildInputs = [

From f3bf226a9d556b16ebac5c7bec7d2f9517a33d66 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:33 +0100
Subject: [PATCH 575/953] python3Packages.poetry-dynamic-versioning: 0.18.0 ->
 0.21.3

---
 .../python-modules/poetry-dynamic-versioning/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
index 00baeef1185b..e42228eb3b4e 100644
--- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "poetry-dynamic-versioning";
-  version = "0.18.0";
+  version = "0.21.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-UO2D80cZurfPCtDXAEQ4nOJdhNtIghLtZN7gL+9xbGc=";
+    hash = "sha256-LdcjzfOiKar0BCdU7W+N5adErdk/NOUf+FzeaMlfn3w=";
   };
 
   nativeBuildInputs = [

From b469261cfc790bd92aae22e02e83db15102754b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:33 +0100
Subject: [PATCH 576/953] python3Packages.ppft: 1.7.6.5 -> 1.7.6.6

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

diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix
index 15597188135f..d53ac9acddbb 100644
--- a/pkgs/development/python-modules/ppft/default.nix
+++ b/pkgs/development/python-modules/ppft/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ppft";
-  version = "1.7.6.5";
+  version = "1.7.6.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-R+DauHpRbAuZks1bDJCDSOTH2WQwTRBrIn+tKK4DIZ4=";
+    sha256 = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE=";
   };
 
   propagatedBuildInputs = [
@@ -26,8 +26,9 @@ buildPythonPackage rec {
   # darwin seems to hang
   doCheck = !stdenv.isDarwin;
   checkPhase = ''
-    cd examples
+    runHook preCheck
     ${python.interpreter} -m ppft.tests
+    runHook postCheck
   '';
 
   pythonImportsCheck = [

From a8e5d43300a1f380349bf911a018a71697281bbe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:33 +0100
Subject: [PATCH 577/953] python3Packages.prettytable: 3.4.1 -> 3.5.0

---
 .../python-modules/prettytable/default.nix    | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index 922f85990db7..6df087e3e68e 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -1,24 +1,35 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, glibcLocales
-, setuptools-scm
+, fetchFromGitHub
+, pythonOlder
+, hatch-vcs
+, hatchling
 , wcwidth
 , importlib-metadata
-, pythonOlder
+, pytest-lazy-fixture
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "3.4.1";
+  version = "3.5.0";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-fX3YTQsgby2qxEcacvKZ1pB/NFFgZP6yg44zOk4lZ70=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "prettytable";
+    rev = "refs/tags/${version}";
+    hash= "sha256-J6oWNug2MEkUZSi67mM5H/Nf4tdSTB/ku34plp1XWCM=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-  buildInputs = [ glibcLocales ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    hatch-vcs
+    hatchling
+  ];
 
   propagatedBuildInputs = [
     wcwidth
@@ -26,18 +37,21 @@ buildPythonPackage rec {
     importlib-metadata
   ];
 
-  preCheck = ''
-    export LANG="en_US.UTF-8"
-  '';
+  checkInputs = [
+    pytest-lazy-fixture
+    pytestCheckHook
+  ];
 
-  # no test no longer available in pypi package
-  doCheck = false;
-  pythonImportsCheck = [ "prettytable" ];
+  pythonImportsCheck = [
+    "prettytable"
+  ];
 
   meta = with lib; {
-    description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
-    homepage = "http://code.google.com/p/prettytable/";
+    changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}";
+    description = "Display tabular data in a visually appealing ASCII table format";
+    homepage = "https://github.com/jazzband/prettytable";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 
 }

From 7b06e06240e11d6fdf8430719badd7d4e015ffec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:33 +0100
Subject: [PATCH 578/953] python3Packages.prompt-toolkit: 3.0.31 -> 3.0.36

---
 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 038575794bd3..ad0281d7eeb6 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.31";
+  version = "3.0.36";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "prompt_toolkit";
     inherit version;
-    sha256 = "sha256-mtqVLJ0Xh/Uv9tXzSE0LTfiVJ4fAh+32offCyx6ogUg=";
+    sha256 = "sha256-PhY/JUvvWgOxRjl9fBljvT4oEvCWS7miTm7HYf0o22M=";
   };
 
   propagatedBuildInputs = [

From 8ed4c4d45609cc12a5f78c0b9a3ee16bec39ea72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:33 +0100
Subject: [PATCH 579/953] python3Packages.pyathena: 2.14.0 -> 2.19.0

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

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index 15b43db0e5b4..d49488ffc3d1 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -10,15 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyathena";
-  version = "2.14.0";
+  version = "2.19.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "PyAthena";
-    inherit version;
-    hash = "sha256-1DeqvlHlOt781nObnPdgZo3JqjwcK8lSREXqUNoKhhU=";
+    inherit pname version;
+    hash = "sha256-59NH4HIhgDOxwgSUJq71ewpQTn2sbpNNT9Q3nj8qJss=";
   };
 
   propagatedBuildInputs = [

From 6316223bd08f29e139740d4dda88207f0b711a64 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:34 +0100
Subject: [PATCH 580/953] python3Packages.PyAudio: 0.2.12 -> 0.2.13

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

diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix
index 82f2b685d268..365a8565db65 100644
--- a/pkgs/development/python-modules/pyaudio/default.nix
+++ b/pkgs/development/python-modules/pyaudio/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "PyAudio";
-  version = "0.2.12";
+  version = "0.2.13";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54=";
+    sha256 = "sha256-JrzMgeQkPRwP9Uh+a0gd5jKfzWXHk2XCZ87zjzY6K1Y=";
   };
 
   buildInputs = [ pkgs.portaudio ];

From 6df4b29f69791f83b0b7eda67be3fa0eb5a95d8a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:34 +0100
Subject: [PATCH 581/953] python3Packages.pybids: 0.15.3 -> 0.15.5

---
 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 18717f40f4fe..6bedbefb1954 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.3";
+  version = "0.15.5";
   pname = "pybids";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-TZnJebxLwgnP9woC0downJv4xrAzjioLZuvqd8fzxGE=";
+    sha256 = "sha256-ryIiWpFoh0KSmyLI4LDn+EkXEYwDIr8/A7opoZJ+bo4=";
   };
 
   propagatedBuildInputs = [

From 3fbf757238f992c74383ba9c80a960a6ef3865d2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:34 +0100
Subject: [PATCH 582/953] python3Packages.pycairo: 1.21.0 -> 1.23.0

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

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index ee77b3e10358..5d17ecef0386 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pycairo";
-  version = "1.21.0";
+  version = "1.23.0";
 
   disabled = pythonOlder "3.6";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "pygobject";
     repo = "pycairo";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-cwkGN5O15DduCLkFWeh8DPO4lY64iIlCQaUsCBKB8Mw=";
+    sha256 = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM=";
   };
 
   nativeBuildInputs = [

From 0abf95169fbf7d4b55d69c21e9d0e5d048c31499 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:34 +0100
Subject: [PATCH 583/953] python3Packages.pyclip: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix
index 6a344365b25b..a1a17fd8dc59 100644
--- a/pkgs/development/python-modules/pyclip/default.nix
+++ b/pkgs/development/python-modules/pyclip/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyclip";
-  version = "0.6.0";
+  version = "0.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spyoungtech";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM=";
   };
 
   postPatch = ''

From 682144d79934f24c1dce27f82cc627fd4a98b492 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:34 +0100
Subject: [PATCH 584/953] python3Packages.pyclipper: 1.3.0.post3 -> 1.3.0.post4

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

diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix
index 9216f0d5b893..2f0f500f6784 100644
--- a/pkgs/development/python-modules/pyclipper/default.nix
+++ b/pkgs/development/python-modules/pyclipper/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyclipper";
-  version = "1.3.0.post3";
+  version = "1.3.0.post4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fonttools";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-viBnmzbCAH9QaVHwUq43rm11e8o3N/jtGsGpmRZokaw=";
+    hash = "sha256-FMqOZ0WOorTtbdweeu9UdoUNWOPrcwc+0SK+55XxyQQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From a4c28ebbbd031ee6933d9b1819e71d16ceabcf4f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:34 +0100
Subject: [PATCH 585/953] python3Packages.pycm: 3.6 -> 3.7

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

diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix
index f3817a16d996..a2c3cb01511c 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pycm";
-  version = "3.6";
+  version = "3.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "sepandhaghighi";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-96M/QKt4AdiZoZ7L9AHocSyZPkwEb2iuRJKW3rVP3hc=";
+    sha256 = "sha256-Yow5MVbaBgKA7U6RNpS/Yh1mG3XSLKPSDsUeBRSln1U=";
   };
 
   propagatedBuildInputs = [

From af09c188704cf3ff8d1f609b5c090dd9ecd619b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 586/953] python3Packages.pycognito: 2022.08.0 -> 2022.12.0

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

diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index c0e0043d0597..6f425f10bf21 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pycognito";
-  version = "2022.08.0";
+  version = "2022.12.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-A80iYF2zwM2YkhnwJMU/bZezsCzs389ro1fikG8vXSA=";
+    sha256 = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE=";
   };
 
   propagatedBuildInputs = [

From bcf7a4ca43366da7b15684c8f830307bc3250143 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 587/953] python3Packages.pycuda: 2022.1 -> 2022.2.2

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

diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index c0ea080396bd..e2a41cca4a3a 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -24,11 +24,11 @@ let
 in
 buildPythonPackage rec {
   pname = "pycuda";
-  version = "2022.1";
+  version = "2022.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rNkDDZPnbmCxIuM60WvPAbsTRPTDBN7f8c0r/7DzE6M=";
+    sha256 = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs=";
   };
 
   preConfigure = with lib.versions; ''

From 0a8c2d347d863200e8e42d5e963e65398bbef85e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 588/953] python3Packages.pydantic: 1.9.2 -> 1.10.4

---
 .../development/python-modules/pydantic/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 31f456dabc68..e0f342f72217 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
+, autoflake
 , cython
 , devtools
 , email-validator
@@ -9,6 +10,7 @@
 , pytestCheckHook
 , python-dotenv
 , pythonOlder
+, pyupgrade
 , typing-extensions
 # dependencies for building documentation.
 # docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245
@@ -27,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "pydantic";
-  version = "1.9.2";
+  version = "1.10.4";
 
   outputs = [
     "out"
@@ -41,7 +43,7 @@ buildPythonPackage rec {
     owner = "samuelcolvin";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-ZGFxyQ1qD3zZWTdfTeoGj3UcUwAzO8K0DySdVAsMHyI=";
+    sha256 = "sha256-BFyv1uVq2pLcJeS5955G/pDA3ce9YTqZ6F7kAkwnuvY=";
   };
 
   postPatch = ''
@@ -65,8 +67,10 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    autoflake
     devtools
     email-validator
+    pyupgrade
     python-dotenv
     typing-extensions
   ];
@@ -76,6 +80,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pytestFlagsArray = [
+    # https://github.com/pydantic/pydantic/issues/4817
+    "-W" "ignore::pytest.PytestReturnNotNoneWarning"
+  ];
+
   preCheck = ''
     export HOME=$(mktemp -d)
   '';

From a9e8c1393d29390f1454432d8c52a6a0d494772d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 589/953] python3Packages.pyfakefs: 4.6.3 -> 5.0.0

---
 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 bac9202a2b22..67364ba58ebd 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.3";
+  version = "5.0.0";
   pname = "pyfakefs";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bfEqfPZXY3obA2vCAFlyfGQvkpkOkP7i+wA9qjzabKE=";
+    sha256 = "sha256-GdHY8e5SCJHXi27QXCB44HktVF+D3uM0YfuqXMcuGH0=";
   };
 
   postPatch = ''

From 455ed05201ab6d2bd45232facd2de0abc09d8022 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 590/953] python3Packages.pygame-gui: 064 -> 067

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

diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index 7404a5fefcbb..f57004f3727d 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pygame-gui";
-  version = "064";
+  version = "067";
   # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "MyreMylar";
     repo = "pygame_gui";
     rev = "refs/tags/v_${version}";
-    sha256 = "sha256-13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U=";
+    sha256 = "sha256-ZBd9jq+20A8kxsvZxuCIfyzuZvk5/73vhh4xmExuwGQ=";
   };
 
   propagatedBuildInputs = [ pygame python-i18n ];

From 52ba811bcb7ee5cb95584192ff62b73cbe7f1afe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 591/953] python3Packages.pygeos: 0.13 -> 0.14

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

diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix
index 3b22c119ba20..c6ce198ee26d 100644
--- a/pkgs/development/python-modules/pygeos/default.nix
+++ b/pkgs/development/python-modules/pygeos/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pygeos";
-  version = "0.13";
+  version = "0.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HDcweKrVou/tHDnNcceXqiAzvzCH8191FrrIm+ULmGE=";
+    sha256 = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM=";
   };
 
   patches = [

From 23161011bb137abcbe38bd7321c3aa35f1eefb79 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 592/953] python3Packages.pygit2: 1.10.1 -> 1.11.1

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

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 413b79c562b1..35230d44a5aa 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.10.1";
+  version = "1.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NUZRvwYsAtHwgEHW+/GptL96k6/OZZeb3Ai9xlZTqi4=";
+    hash = "sha256-eT9YP9M2IPCsODdtsPV3aO8pIribRZ51saxEA3frZOw=";
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''

From 9b10cac84e752ded4d83e0081d284ebeb61ad906 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:35 +0100
Subject: [PATCH 593/953] python3Packages.pyglet: 1.5.27 -> 2.0.2.1

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

diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index f1c4bb44d9ae..b8aa22e9251b 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -18,13 +18,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.27";
+  version = "2.0.2.1";
   pname = "pyglet";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-TQDgZ0UfOxD9UbaXZP3atlRENyoto0TuKzXwqObr8AU=";
+    sha256 = "sha256-WonGjdooD3Yb3rAha536An+y4nUZoOo8FvZViyBPHl8=";
     extension = "zip";
   };
 

From 71b0df651059029cd48beb46f7eac88d19d56bba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 594/953] python3Packages.pygmt: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix
index a2a993de7f17..83c7bc5cc0fa 100644
--- a/pkgs/development/python-modules/pygmt/default.nix
+++ b/pkgs/development/python-modules/pygmt/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pygmt";
-  version = "0.7.0";
+  version = "0.8.0";
 
   disabled = pythonOlder "3.6";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "GenericMappingTools";
     repo = "pygmt";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-Z38fZvmeWDLZEIyH+UG6Nb6KNnjEuXIn3RRH4CPWz9A=";
+    sha256 = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE=";
   };
 
   postPatch = ''

From a653dbcd1a12621fe5a8e6701b000d5a18d99bc2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 595/953] python3Packages.pyjwt: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index a46a05ba9c23..bd3b33578d05 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyjwt";
-  version = "2.5.0";
+  version = "2.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyJWT";
     inherit version;
-    sha256 = "sha256-53q4lICQXYaZhEKsV4jzUzP6hfZQR6U0rcOO3zyI/Ds=";
+    sha256 = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0=";
   };
 
   postPatch = ''

From 1c0fb6690f466f0cb9465860b049d4553bbb8ae7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 596/953] python3Packages.pykdtree: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix
index b4b442945962..642e5ba9d581 100644
--- a/pkgs/development/python-modules/pykdtree/default.nix
+++ b/pkgs/development/python-modules/pykdtree/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pykdtree";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-c0L3XnMRA+ZT/B9rn9q8JBDPkrbnsGFggEp1eGybV0c=";
+    sha256 = "sha256-eAtpPQVVuFfXqrMeNdQpO/Tr253sekW6S7I7RAD2Jtw=";
   };
 
   buildInputs = [ openmp ];

From fc590165ee6b336b3f8490edbd72c34f4090d2a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 597/953] python3Packages.pylink-square: 0.14.2 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix
index e572ec542fbc..af522cd2171b 100644
--- a/pkgs/development/python-modules/pylink-square/default.nix
+++ b/pkgs/development/python-modules/pylink-square/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pylink-square";
-  version = "0.14.2";
+  version = "1.0.0";
 
   format = "setuptools";
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "square";
     repo = "pylink";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4jmFU8jlrEAYTAQH+uQCWrzqwKX4onb7Xk4iTYzx9dI=";
+    hash = "sha256-05mg2raHiKg0gHxF/7zFd81C/8OrhStThMwEnpaFGSc=";
   };
 
   propagatedBuildInputs = [ psutil six future ];

From 19d8e24671a04ca88149c8c846d50ece6e575aea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 598/953] python3Packages.pylsp-mypy: 0.6.3 -> 0.6.4

---
 .../python-modules/pylsp-mypy/default.nix            | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
index dbb35d71c5dd..aef852cafc55 100644
--- a/pkgs/development/python-modules/pylsp-mypy/default.nix
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pylsp-mypy";
-  version = "0.6.3";
+  version = "0.6.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,17 +20,9 @@ buildPythonPackage rec {
     owner = "Richardk2n";
     repo = "pylsp-mypy";
     rev = "refs/tags/${version}";
-    hash = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4=";
+    hash = "sha256-BpYg2noReHFgJ/5iQI09XUWNAN7UdcYgqpZ/IPr17Ao=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "0001-adapt-test-to-latest-mypy.patch";
-      url = "https://github.com/python-lsp/pylsp-mypy/commit/99cf687798464f810b128881dbbec82aa5353e04.patch";
-      sha256 = "sha256-wLaGMaW/gTab2fX7zGnemLQQNDWxBURYb7VsgEas61Y=";
-    })
-  ];
-
   propagatedBuildInputs = [
     mypy
     python-lsp-server

From 7fcc42532dfb471207ab9bf1d806f6d970bac5d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 599/953] python3Packages.pymavlink: 2.4.35 -> 2.4.37

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

diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index baa31b40e342..d9b51d9d0755 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pymavlink";
-  version = "2.4.35";
+  version = "2.4.37";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-P2pqcxI6w9cw4b26g5ad5CeW9Sf1fNN0FGiIzOWfOCU=";
+    sha256 = "sha256-dU561/kOBW++mrfzX/kqNVPgi7m/QniBrCJxBD/fZ1Y=";
   };
 
   propagatedBuildInputs = [ future lxml ];

From 5bc47c33bde8b1e904931f117d121c3d1f4f36a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 600/953] python3Packages.pymc: 4.4.0 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix
index b61766324130..8603eeabdee1 100644
--- a/pkgs/development/python-modules/pymc/default.nix
+++ b/pkgs/development/python-modules/pymc/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pymc";
-  version = "4.4.0";
+  version = "5.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "pymc-devs";
     repo = "pymc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZBltvvKXfqHYLeYOEYFK8kQc0wHM9+UHLRJFMSYX4Ow=";
+    hash = "sha256-uWvzWbZyRRE8L9X9+azmN+1JYahwwNSYCk2fQ/C8Yi0=";
   };
 
   nativeBuildInputs = [

From 06f7e081179140d73f100c8d767848e6974aaaf6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:36 +0100
Subject: [PATCH 601/953] python3Packages.pymdown-extensions: 9.5 -> 9.9

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

diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix
index 08749312580c..a360517eb128 100644
--- a/pkgs/development/python-modules/pymdown-extensions/default.nix
+++ b/pkgs/development/python-modules/pymdown-extensions/default.nix
@@ -38,14 +38,14 @@ let
 in
 buildPythonPackage rec {
   pname = "pymdown-extensions";
-  version = "9.5";
+  version = "9.9";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "facelessuser";
     repo = "pymdown-extensions";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-bgvoY+8bbGoG1A93A+Uan1UDpQmEUu/TJu3FOkXechQ=";
+    sha256 = "sha256-JZtze6KjiBJGEQzA8lsTShhZu96wxAr4KeKzCe0A18Q=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 3705a350630728dd68654de2bb6b4830ec14af45 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 602/953] python3Packages.PyMeeus: 0.5.11 -> 0.5.12

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

diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix
index 162f3ab55966..8cece9b0e67a 100644
--- a/pkgs/development/python-modules/pymeeus/default.nix
+++ b/pkgs/development/python-modules/pymeeus/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "PyMeeus";
-  version = "0.5.11";
+  version = "0.5.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb9d670818d8b0594317b48a7dadea02a0594e5344263bf2054e1a011c8fed55";
+    sha256 = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ=";
   };
 
   checkInputs = [ pytest ];

From 499963505a8f6a3d0a73a37c80971ef25f1e557a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 603/953] python3Packages.pymodbus: 2.5.3 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index 41babc82175e..bb002a0fe8eb 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -9,6 +9,7 @@
 , pygments
 , pyserial
 , pyserial-asyncio
+, pytest-asyncio
 , pytestCheckHook
 , redis
 , sqlalchemy
@@ -18,13 +19,13 @@
 
 buildPythonPackage rec {
   pname = "pymodbus";
-  version = "2.5.3";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "riptideio";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-7zuFKJuKc+J4g7qoK22xed8dmXJatQbQXz4aKAOcvN8=";
   };
 
   # Twisted asynchronous version is not supported due to a missing dependency
@@ -41,6 +42,7 @@ buildPythonPackage rec {
   checkInputs = [
     asynctest
     mock
+    pytest-asyncio
     pytestCheckHook
     redis
     sqlalchemy

From ed7b04272413c24853ea20c4ba736222a1fc7d31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 604/953] python3Packages.pymongo: 4.2.0 -> 4.3.3

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

diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 285a729eb894..292e7fceead6 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -2,18 +2,25 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, dnspython
 }:
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "4.2.0";
-  disabled = pythonOlder "3.6";
+  version = "4.3.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-cvM49qq9N9NDvZ0f3T3pIRBNOVdmvMXNxAOeTC3Zd2Y=";
+    hash = "sha256-NOlf+wpov/vDtDfy0fJfyRb+899c3u0JktpfQvrpuAc=";
   };
 
+  propagatedBuildInputs = [
+    dnspython
+  ];
+
   # Tests call a running mongodb instance
   doCheck = false;
 

From 78bbaa84a295ef6f44a3f2c074b902098b817544 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 605/953] python3Packages.pymupdf: 1.21.0 -> 1.21.1

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

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 8095ee1b7c0c..075444ca17bd 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pymupdf";
-  version = "1.21.0";
+  version = "1.21.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyMuPDF";
     inherit version;
-    hash = "sha256-pj38KJ4SeharYDEO5gBf6DEhx6l/fBINtoj5KByeXQ8=";
+    hash = "sha256-+BV0GkNcYqADa7y/X6bFM1Z71pxTONQTcU/FeyLbk+A=";
   };
 
   postPatch = ''

From e518314491ee856ca49ad9a09005133d698c087f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 606/953] python3Packages.pynina: 0.1.8 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix
index be81bd6e6557..03f83f54494c 100644
--- a/pkgs/development/python-modules/pynina/default.nix
+++ b/pkgs/development/python-modules/pynina/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pynina";
-  version = "0.1.8";
+  version = "0.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyNINA";
     inherit version;
-    sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0=";
+    sha256 = "sha256-2Ujq2+6xQXPjKzK3HQbJnjz8cX3ALUV+22gdQflFxFY=";
   };
 
   propagatedBuildInputs = [

From c2a599e390356c8c2223b99bf60741097a676d90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 607/953] python3Packages.pynrrd: 0.4.3 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix
index 91cff70bae35..a0a884297737 100644
--- a/pkgs/development/python-modules/pynrrd/default.nix
+++ b/pkgs/development/python-modules/pynrrd/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pynrrd";
-  version = "0.4.3";
+  version = "1.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "mhe";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-4UM2NAKWfsjxAoLQCFSPVKG5GukxqppywqvLM0V/dIs=";
+    hash = "sha256-R/bUItF2BaKTFdMNBHFJKq0jSX6z49e8CGXENUn07SU=";
   };
 
   propagatedBuildInputs = [

From 04d43b16e161612f4627f81ac071f160d50008a0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 608/953] python3Packages.pyprecice: 2.4.0.0 -> 2.5.0.1

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

diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index 621850742af2..d9172c959550 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyprecice";
-  version = "2.4.0.0";
+  version = "2.5.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "precice";
     repo = "python-bindings";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg=";
+    hash = "sha256-0dxWtlN3x3orBgtCTxTsql39+MBVsgeHO7gXjOO8qcA=";
   };
 
   nativeBuildInputs = [

From fb45efabed13fcbbde14e88fb36c8af8f278b9cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:37 +0100
Subject: [PATCH 609/953] python3Packages.pyro-ppl: 1.8.2 -> 1.8.3

---
 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 b0cc9c7f91cd..48bc622f4adb 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.2";
+  version = "1.8.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit version pname;
-    hash = "sha256-4Afl0ROCpY78+4+61xxy6vEGbIZsaNxURXDEGMGCiks=";
+    hash = "sha256-Pt1DgbAg0S6KtQ6+ApjHpo0VC4oCT5mK2G/ax6MI1Q4=";
   };
 
   propagatedBuildInputs = [

From b7c37b77ae973328a5dfc2cfdb98f7a693cf05fa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:38 +0100
Subject: [PATCH 610/953] python3Packages.pyrsistent: 0.18.1 -> 0.19.3

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

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 5a1b66bfa26c..35758684474f 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.18.1";
+  version = "0.19.3";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y=";
+    sha256 = "sha256-GimUdzcGu7SZXDGpe8lPFBgxSSO9EEjG2WSDcEA3ZEA=";
   };
 
   propagatedBuildInputs = [ six ];

From 6a7f77ee6a76d4272c010ae334b4eb8108207993 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:38 +0100
Subject: [PATCH 611/953] python3Packages.pysam: 0.19.1 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 55883383c61d..461d0c19d854 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname   = "pysam";
-  version = "0.19.1";
+  version = "0.20.0";
 
   # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
   # missing some files which cause test failures.
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pysam-developers";
     repo = "pysam";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-fbvfobffLha1eFatnHvh0tOYcuMRLTmy/BJ9QXFHx2o=";
+    sha256 = "sha256-7yEZJ+iIw4qOxsanlKQlqt1bfi8MvyYjGJWiVDmXBrc=";
   };
 
   nativeBuildInputs = [ samtools ];

From 940d6dab6f84d0a12d75f0258ded1695ce7e8bbc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:38 +0100
Subject: [PATCH 612/953] python3Packages.pysensibo: 1.0.22 -> 1.0.24

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

diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix
index 4fd0bacc89e6..ad68da4478db 100644
--- a/pkgs/development/python-modules/pysensibo/default.nix
+++ b/pkgs/development/python-modules/pysensibo/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pysensibo";
-  version = "1.0.22";
+  version = "1.0.24";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "andrey-git";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-AUcdKcdoYCg8OgUcFoLLpNK5GQMTg89XCR5CkTfNkcc=";
+    hash = "sha256-lLorBf4HjynkTyLfKGcxEpSzyCawjKDej/HFtHl/Ar8=";
   };
 
   propagatedBuildInputs = [

From 8e38f2c57917b07e754e51107e2f3663d84f60a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:38 +0100
Subject: [PATCH 613/953] python3Packages.pysigma: 0.8.9 -> 0.8.10

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

diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index 82fde07aef48..33737c42de4f 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma";
-  version = "0.8.9";
+  version = "0.8.10";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SXZ6bo1b5xhVGSlWr51ZCxT0Ov1g/qd8V43P5KEhY+s=";
+    hash = "sha256-/MprHx4MlbdY22K8hWDPj7owwZcgWjRyVYDrPqB3oIE=";
   };
 
   nativeBuildInputs = [

From 93c2e912c092d98e2b20a3e48cffd1c5fdf771cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:38 +0100
Subject: [PATCH 614/953] python3Packages.pysmb: 1.2.8 -> 1.2.9

https://github.com/miketeo/pysmb/releases/tag/pysmb-1.2.9
---
 .../python-modules/pysmb/default.nix            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix
index 01f30bf2d5f1..497f76c9ec93 100644
--- a/pkgs/development/python-modules/pysmb/default.nix
+++ b/pkgs/development/python-modules/pysmb/default.nix
@@ -1,26 +1,28 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pyasn1
 , pythonOlder
+, tqdm
 }:
 
 buildPythonPackage rec {
   pname = "pysmb";
-  version = "1.2.8";
+  version = "1.2.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    format = "setuptools";
-    extension = "zip";
-    hash = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U=";
+  src = fetchFromGitHub {
+    owner = "miketeo";
+    repo = "pysmb";
+    rev = "refs/tags/pysmb-${version}";
+    hash = "sha256-2AZAtypotSVXWfwokUpfWYQMiMq6EgbdBx2G7bU0Cqw=";
   };
 
   propagatedBuildInputs = [
     pyasn1
+    tqdm
   ];
 
   # Tests require Network Connectivity and a server up and running
@@ -33,6 +35,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/miketeo/pysmb/releases/tag/pysmb-${version}";
     description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
     homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
     license = licenses.zlib;

From cf1095c963811314f284002010162379f1fe84fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:38 +0100
Subject: [PATCH 615/953] python3Packages.pyspellchecker: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix
index 425d1a67f136..462ed0f0b139 100644
--- a/pkgs/development/python-modules/pyspellchecker/default.nix
+++ b/pkgs/development/python-modules/pyspellchecker/default.nix
@@ -1,20 +1,29 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, setuptools
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pyspellchecker";
-  version = "0.7.0";
-  format = "setuptools";
+  version = "0.7.1";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-zKbDJCjuOI0Vsbh+lK/Dv5T7GGK6hIo7RJvs1inSatM=";
+  src = fetchFromGitHub {
+    owner = "barrust";
+    repo = "pyspellchecker";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DM1Q8OirFMoYqjdSnsNL5r7Zxffxc0DEXwv1W6y8GnE=";
   };
 
-  # no tests in PyPI
-  doCheck = false;
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Pure python spell checking";

From 014b3ef19242cfd8a65e447b60c66ca3cb794dd2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:38 +0100
Subject: [PATCH 616/953] python3Packages.pyspnego: 0.5.3 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index 966fb6679237..303310a6b5dc 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pyspnego";
-  version = "0.5.3";
+  version = "0.7.0";
 
   disabled = pythonOlder "3.7";
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "jborean93";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-awlS1VHXj6n9Ee4qUI1x5tEdkMF/ZEr9NPKh4ICkv3g=";
+    sha256 = "sha256-FtXHbPilQKqo/pmFAYRCoSHkq2fIhP9DYi8kNNBz7uM=";
   };
 
   propagatedBuildInputs = [

From 1f1be99a018bbb0f5f46bd20b1a7092186426c59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 617/953] python3Packages.py-sr25519-bindings: 0.1.5 -> 0.2.0

---
 .../python-modules/py-sr25519-bindings/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix
index 9db6cc998956..c2c8d961f6cc 100644
--- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix
+++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "py-sr25519-bindings";
-  version = "0.1.5";
+  version = "0.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "polkascan";
     repo = "py-sr25519-bindings";
-    rev = "a97398b386c10ebe0a1f6c45dea466add0d407ce";
-    sha256 = "sha256-RJfwWeD82J5QqY+qq2bC3vlqT75jUwhTXuIsza4qUzk=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {

From e4bd212f03817605fa4da75a4176ccaf4f1e6eae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 618/953] python3Packages.PyStemmer: 2.0.1 -> 2.2.0

---
 .../python-modules/pystemmer/default.nix      | 59 +++++++++++++++++--
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix
index 120867f389cc..dd258c380c6f 100644
--- a/pkgs/development/python-modules/pystemmer/default.nix
+++ b/pkgs/development/python-modules/pystemmer/default.nix
@@ -1,22 +1,69 @@
-{ lib, python, fetchPypi, buildPythonPackage, cython }:
+{ lib
+, python
+, fetchPypi
+, fetchFromGitHub
+, fetchpatch
+, buildPythonPackage
+, cython
+, libstemmer
+ }:
 
 buildPythonPackage rec {
   pname = "PyStemmer";
-  version = "2.0.1";
+  version = "2.2.0";
+  format = "setuptools";
 
-  src = fetchPypi {
+  src' = fetchPypi {
     inherit pname version;
-    sha256 = "9b81c35302f1d2a5ad9465b85986db246990db93d97d3e8f129269ed7102788e";
+    sha256 = "sha256-4hcbkbhrscap3d8J6Mhn5Ij4vWm94H0EEKNc3O4NhXw=";
+  };
+
+  src = fetchFromGitHub {
+    owner = "snowballstem";
+    repo = "pystemmer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-bJVFeO7XP+aZ2nowQiuws5ziL/FmS1eaOllW6QxA70U=";
   };
 
   nativeBuildInputs = [ cython ];
 
-  preBuild = ''
-    cython src/Stemmer.pyx
+  patches = [
+    (fetchpatch {
+      # Allow building with system libstemmer
+      url = "https://github.com/snowballstem/pystemmer/commit/2f52b4b2ff113fe6c33cebe14ed4fd4388bb1742.patch";
+      hash = "sha256-JqR/DUmABgWaq23CNjoKSasL0mNhM2QuU986mouK6A8=";
+    })
+    (fetchpatch {
+      # Fix doctests
+      url = "https://github.com/snowballstem/pystemmer/commit/b2826f19fe8ba65238b5f3b4cee7096a698f048e.patch";
+      hash = "sha256-VTZydjYaJJ/KoHD4KbON36kZnkuAyO51H0Oeg6VXTqg=";
+    })
+  ];
+
+  postConfigure = ''
+    export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include"
   '';
 
+  NIX_CFLAGS_COMPILE = [
+    "-I${lib.getDev libstemmer}/include"
+  ];
+
+  NIX_CFLAGS_LINK = [
+    "-L${libstemmer}/lib"
+  ];
+
+  #preBuild = ''
+  #  cython src/Stemmer.pyx
+  #'';
+
+  pythonImportsCheck = [
+    "Stemmer"
+  ];
+
   checkPhase = ''
+    runHook preCheck
     ${python.interpreter} runtests.py
+    runHook postCheck
   '';
 
   meta = with lib; {

From 0140880e76c29446618a8ab00c98c815c4c53499 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 619/953] python3Packages.pyswitchbee: 1.6.2 -> 1.7.16

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

diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix
index 58466f0d9b80..01bf784e3856 100644
--- a/pkgs/development/python-modules/pyswitchbee/default.nix
+++ b/pkgs/development/python-modules/pyswitchbee/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbee";
-  version = "1.6.2";
+  version = "1.7.16";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "jafar-atili";
     repo = "pySwitchbee";
     rev = "refs/tags/${version}";
-    hash = "sha256-MDutpeHI6MW1VwCRTPJK/y08ee4eidOHluMf6lPQfEk=";
+    hash = "sha256-n04N7wfCBJIbwEEHJ6I1Lt3rpZg46umGPawShlXDuZ8=";
   };
 
   postPatch = ''

From 89d8078be9d1f7a3e222b9fa4ae3d43f8653ea92 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 620/953] python3Packages.pyswitchbot: 0.30.1 -> 0.36.1

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

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 8100fcea5157..df5cf9d79607 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -1,15 +1,18 @@
 { lib
 , bleak
 , bleak-retry-connector
+, boto3
 , buildPythonPackage
+, cryptography
 , fetchFromGitHub
 , pythonOlder
 , pytestCheckHook
+, requests
 }:
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.30.1";
+  version = "0.36.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,12 +21,15 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     rev = "refs/tags/${version}";
-    hash = "sha256-5Rn1hQ1TZhRiCJGJCaA1sl+HnerL/oOhRdMiSl1Recg=";
+    hash = "sha256-eXCHmtdizRJJdwFeZU0yLi8NWwMqbET6ZItQQClYVI4=";
   };
 
   propagatedBuildInputs = [
     bleak
     bleak-retry-connector
+    boto3
+    cryptography
+    requests
   ];
 
   checkInputs = [

From c39bbc6e1612e4f0c141348d9df3ae20e595e252 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 621/953] python3Packages.pyTelegramBotAPI: 4.7.0 -> 4.8.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 03ed9fc5884d..73cbce9161a9 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyTelegramBotAPI";
-  version = "4.7.0";
+  version = "4.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sVu518B+PDSpW6MhYtNWkPpwuT471VfGuDDtpL7Mo/U=";
+    hash = "sha256-6nfpXzq2yCVDK8pAuWzAVzr0pKn5VHqb3UH9VXhSHJ0=";
   };
 
   propagatedBuildInputs = [

From db4920aac2572f278351cb1559422dbe71b2df80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 622/953] python3Packages.pytest-bdd: 6.0.0 -> 6.1.1

---
 .../python-modules/pytest-bdd/default.nix     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix
index cfae0cb2bf95..8490fba2b369 100644
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -1,48 +1,49 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, execnet
-, glob2
 , Mako
-, mock
 , parse
 , parse-type
-, py
+, poetry-core
 , pytest
 , pytestCheckHook
 , pythonOlder
+, setuptools
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "pytest-bdd";
-  version = "6.0.0";
-  format = "setuptools";
+  version = "6.1.1";
+  format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-1dyAhvEw8gUe78qDpgrcwl6grWKiwPgSe/QeFAjBzZg=";
+    hash = "sha256-+76jIgfDQPdIoesTr1+QUu8wmOnrdf4KT+TJr9F2Hqk=";
   };
 
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
   buildInputs = [
     pytest
   ];
 
   propagatedBuildInputs = [
-    glob2
     Mako
     parse
     parse-type
-    py
+    typing-extensions
   ];
 
   checkInputs = [
     pytestCheckHook
-    execnet
-    mock
+    setuptools
   ];
 
   preCheck = ''

From 65625811e2cdd7d5faab55a2ad87d73653bc77fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 623/953] python3Packages.pytest-check: 1.0.10 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
index f13cf9bba100..bda2aec16cf6 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-check";
-  version = "1.0.10";
+  version = "1.3.0";
   format = "flit";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ng7c10Dyxb5qbO22TDkNl5wAzXg2eYrLO21sjtEBoio=";
+    hash = "sha256-o4eWjWJSVzjNnzalKAEzFtfZFc8Mz1vhRqOOf/+gu6k=";
   };
 
   buildInputs = [

From d38e9e7f7cf2aa65c9522c4f4512ea8bc1e323b5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 624/953] python3Packages.pytest-cov: 3.0.0 -> 4.0.0

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

diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix
index 971b12dc01c7..88e77f9f7ce9 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/pkgs/development/python-modules/pytest-cov/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-cov";
-  version = "3.0.0";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470";
+    sha256 = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA=";
   };
 
   buildInputs = [ pytest ];

From 837057ad441a6bc1e7a340112767efa80e8bbebc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:39 +0100
Subject: [PATCH 625/953] python3Packages.pytest-env: 0.6.2 -> 0.8.1

---
 .../python-modules/pytest-env/default.nix     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix
index 72df18c88475..6947f56b8b11 100644
--- a/pkgs/development/python-modules/pytest-env/default.nix
+++ b/pkgs/development/python-modules/pytest-env/default.nix
@@ -1,15 +1,35 @@
-{ lib, buildPythonPackage, fetchPypi, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, hatch-vcs
+, hatchling
+, pytest
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "pytest-env";
-  version = "0.6.2";
+  version = "0.8.1";
+  format = "pyproject";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1hl0ln0cicdid4qjk7mv90lw9xkb0v71dlj7q7rn89vzxxm9b53y";
+    pname = "pytest_env";
+    inherit version;
+    hash = "sha256-17L1Jz7G0eIhdXmYvC9Q0kdO19C5MxuSVWAR+txOmr8=";
   };
 
-  checkInputs = [ pytest ];
+  nativeBuildInputs = [
+    hatch-vcs
+    hatchling
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Pytest plugin used to set environment variables";

From dbf99fbf180bfd77e6f83f177e3dbeaeef829bbf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 626/953] python3Packages.pytest-html: 3.1.1 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix
index 78b2de292f1d..dea7f772f78f 100644
--- a/pkgs/development/python-modules/pytest-html/default.nix
+++ b/pkgs/development/python-modules/pytest-html/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-html";
-  version = "3.1.1";
+  version = "3.2.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3";
+    sha256 = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From bfffe9f517482b840696b42d0da097f6959b0978 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 627/953] python3Packages.pytest-httpx: 0.21.0 -> 0.21.2

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

diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index 6a66727b1ebb..45c094d9f3c2 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-httpx";
-  version = "0.21.0";
+  version = "0.21.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Colin-b";
     repo = "pytest_httpx";
-    rev = "v${version}";
-    hash = "sha256-mUzmtZCguaab4fAE7VcUhv+NQVYiPpxxHpiVVlzwrIo=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-pIYSXmOxLfWknWTfrnhslx76UMSSlnqzFE7qvJo1mz4=";
   };
 
   buildInputs = [

From bdf5d789720d73f9598c09011f27cc09985937ed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 628/953] python3Packages.pytest-metadata: 2.0.2 -> 2.0.4

---
 .../pytest-metadata/default.nix               | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix
index 321aacb5c704..7555ed351ea4 100644
--- a/pkgs/development/python-modules/pytest-metadata/default.nix
+++ b/pkgs/development/python-modules/pytest-metadata/default.nix
@@ -1,24 +1,38 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, poetry-core
 , pytest
+, pytestCheckHook
 , pythonOlder
 , setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "pytest-metadata";
-  version = "2.0.2";
+  version = "2.0.4";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-/NL0FvFb4pWUNSezyLoWpErlpxQZOckMPcXOnRZ88qU=";
+    pname = "pytest_metadata";
+    inherit version;
+    hash = "sha256-/MZT9l/jA1tHiCC1KE+/D1KANiLuP2Ci+u16fTuh9B4=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-  buildInputs = [ pytest ];
+  nativeBuildInputs = [
+    poetry-core
+    setuptools-scm
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Plugin for accessing test session metadata";

From 7142d8529acdd689bee6890525690992c8a2e1b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 629/953] python3Packages.pytest-mypy: 0.9.1 -> 0.10.3

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

diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix
index bec0ee59d0c5..e4d368bf61d4 100644
--- a/pkgs/development/python-modules/pytest-mypy/default.nix
+++ b/pkgs/development/python-modules/pytest-mypy/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-mypy";
-  version = "0.9.1";
+  version = "0.10.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w=";
+    sha256 = "sha256-+EWPZCMj8Toso+LmFQn3dnlmtSe02K3M1QMsPntP09s=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From b30f07c456ad96d32412ed736ec0f463ba5a62e0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 630/953] python3Packages.pytest-quickcheck: 0.8.6 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 99d65ec28669..0a7c1907635f 100644
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-quickcheck";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3ef9bde7ba1fe6470c5b61631440186d1254e276c67a527242d91451ab7994e5";
+    sha256 = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY=";
   };
 
   buildInputs = [ pytest ];

From a74ef53ea9fc30d9c6aa2f65c506247954fca37d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 631/953] python3Packages.pytest-regressions: 2.3.1 -> 2.4.1

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

diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index 99099d3ac924..08269f054ae9 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-regressions";
-  version = "2.3.1";
+  version = "2.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0=";
+    sha256 = "sha256-Jk0j6BMt7rV0Qc9Ga3tdtEV5fzRucrZyyVt/UqR78Bs=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 21d87dc6a281f96489491efe5377a408a114c799 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 632/953] python3Packages.pytest-rerunfailures: 10.2 -> 10.3

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

diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 9b16760b23b8..8ea63cfa5ff4 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
-  version = "10.2";
+  version = "10.3";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9e1e1bad51e07642c5bbab809fc1d4ec8eebcb7de86f90f1a26e6ef9de446697";
+    sha256 = "sha256-2CRNeZ+Jpu215XMB3a6ztvENZpFjjVHoCzcTEVkuKMY=";
   };
 
   buildInputs = [ pytest ];

From a41745eb2cec309b30bb52e3077db2021bb22d05 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 633/953] python3Packages.pytest-sugar: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix
index 9b59eb2e55b8..4377990df3c3 100644
--- a/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/pkgs/development/python-modules/pytest-sugar/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-sugar";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7qeLbxW2NSd9PZAoDNOG2P7qHKsPm+dZR6Ym6LArR30=";
+    sha256 = "sha256-xHk0lfPDLhFPD1QWKQlGwxbrlq1aNoTc2t2pJn5Zsrg=";
   };
 
   buildInputs = [ pytest ];

From 297ad1ff734f2911cb4574f59deccaa7397ba1d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:40 +0100
Subject: [PATCH 634/953] python3Packages.pytest-testmon: 1.4.0 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix
index 4748cdedf81b..1b9ab4c8336c 100644
--- a/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-testmon";
-  version = "1.4.0";
+  version = "1.4.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PVLXOBTo2xnMBM4wyvrmGgyztW0ajGxMU+oIhrjZiw8=";
+    hash = "sha256-3tYW0RWRbbGKbPpXWuqJ79sRWMj+vnffS0XNa7Yb0fw=";
   };
 
   buildInputs = [

From e51a24258b304e7b0f2cd7c9ebfaf4a51b713070 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:41 +0100
Subject: [PATCH 635/953] python3Packages.python-dbusmock: 0.28.4 -> 0.28.6

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

diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index cc8181e7325c..06bc1ff0cafa 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -20,13 +20,13 @@ let
   '';
 in buildPythonPackage rec {
   pname = "python-dbusmock";
-  version = "0.28.4";
+  version = "0.28.6";
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-gsGg9zHVyDTCVZmFUI8qqXDt0ui+o3hPwjRlsYUmShg=";
+    sha256 = "sha256-tNV1GQsUG5BGTNGB0VBUa0Yxqv/HsRSlRfEU4KNd29w=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From d7ac074d6a24fc37d16e298a352744752c978679 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:41 +0100
Subject: [PATCH 636/953] python3Packages.python-gitlab: 3.11.0 -> 3.12.0

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

diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index 63cfb7c38846..6682b57ed7ae 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "python-gitlab";
-  version = "3.11.0";
+  version = "3.12.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-25Rytq5PupaLQJ3DL67iDdZQiQZdqpPgjSG3lqZdZXg=";
+    hash = "sha256-VnOQwrk2kNrmLtlzi/nyIfpFwBN4/fiWCJ2/fIoTT70=";
   };
 
   propagatedBuildInputs = [

From f6e39eaa01ef90e29c66c18a03f619a6fcec59fa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:41 +0100
Subject: [PATCH 637/953] python3Packages.python-lsp-server: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 62e6ce951bde..67119cdda521 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "python-lsp-server";
-  version = "1.6.0";
+  version = "1.7.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "python-lsp";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q=";
+    sha256 = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From c0c4550c1b197436e24d5875e41d4fe38959c4bd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:41 +0100
Subject: [PATCH 638/953] python3Packages.python-nomad: 1.4.1 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix
index 6d6c5c90fdfe..ffd93a2e28f0 100644
--- a/pkgs/development/python-modules/python-nomad/default.nix
+++ b/pkgs/development/python-modules/python-nomad/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-nomad";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "087a7d5d2af9fd8ce5da70d29e4b456c6b8b0ea3cd16613ed50f6eb8ad6cdba6";
+    sha256 = "sha256-VpngJvm9eK60lPeFIbjnTwzWWoJ9tRBDYP5SghDMbAg=";
   };
 
   propagatedBuildInputs = [ requests ];

From c8f346cb9df3e5da47077712fd192bebdce38d94 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:41 +0100
Subject: [PATCH 639/953] python3Packages.pythonocc-core: 7.6.2 -> 7.7.0

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

diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
index 1bef56a01a40..da72cc0839af 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pythonocc-core";
-  version = "7.6.2";
+  version = "7.7.0";
 
   src = fetchFromGitHub {
     owner = "tpaviot";
     repo = "pythonocc-core";
-    rev = version;
-    sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-YybpwiCeBnwZfYS6ZxUbycHFn2DlqYxcNMylRN5ihFM=";
   };
 
   postPatch = ''

From 3e2e47e2f781ec3f6cd16bf300903b26095858d6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 640/953] python3Packages.python-redis-lock: 3.7.0 -> 4.0.0

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

diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix
index 7671e5a4a9b2..deb84265fd1c 100644
--- a/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "python-redis-lock";
-  version = "3.7.0";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374";
+    sha256 = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo=";
   };
 
   propagatedBuildInputs = [

From 1e9beb3ead5f8d7d8af11733e6b2bb3a499b4bb9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 641/953] python3Packages.python-socks: 2.0.3 -> 2.1.1

---
 .../python-modules/python-socks/default.nix     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index b0d0fbd36616..4d8f29de081b 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -3,29 +3,31 @@
 , buildPythonPackage
 , curio
 , fetchFromGitHub
+, anyio
 , flask
 , pytest-asyncio
 , pytest-trio
 , pythonOlder
 , pytestCheckHook
 , trio
+, trustme
 , yarl
 }:
 
 buildPythonPackage rec {
   pname = "python-socks";
-  version = "2.0.3";
+  version = "2.1.1";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6.1";
+  disabled = pythonOlder "3.6.2";
 
   __darwinAllowLocalNetworking = true;
 
   src = fetchFromGitHub {
     owner = "romis2012";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-tVoBon9HF9MTOK+dN9g58fQO706ElNlCeULx//7hPWA=";
+    repo = "python-socks";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-QvUuCS8B/6+dgzWrflizLfNlAUeOPpUPtmFaE6LGYGc=";
   };
 
   propagatedBuildInputs = [
@@ -34,11 +36,15 @@ buildPythonPackage rec {
     async-timeout
   ];
 
+  doCheck = false; # requires tiny_proxy module
+
   checkInputs = [
+    anyio
     flask
     pytest-asyncio
     pytest-trio
     pytestCheckHook
+    trustme
     yarl
   ];
 
@@ -47,6 +53,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/romis2012/python-socks/releases/tag/v${version}";
     description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python";
     homepage = "https://github.com/romis2012/python-socks";
     license = licenses.asl20;

From af4145651e56992540031f43e563b0facac4486f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 642/953] python3Packages.python-stdnum: 1.17 -> 1.18

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

diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index 51ac732b1729..3799a7fda405 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "python-stdnum";
-  version = "1.17";
+  version = "1.18";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-N04rXhORLM2/ULCyP8osPgUxF0gFwy104UXzd1Yyg0A=";
+    hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA=";
   };
 
   checkInputs = [

From cf13eef71f08775c6ae15657ca740352371b0155 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 643/953] python3Packages.pytorch-lightning: 1.6.5 -> 1.8.6

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

diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix
index a2d8da399d28..55e580308aa8 100644
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pytorch-lightning";
-  version = "1.6.5";
+  version = "1.8.6";
 
   disabled = isPy27;
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "PyTorchLightning";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-CgD5g5nhz2DI4gOQyPl8/Cq6wWHzL0ALgOB5SgUOgaI=";
+    hash = "sha256-5AyOCeRFiV7rdmoBPx03Xju6eTR/3jiE+HQBiEmdzmo=";
   };
 
   propagatedBuildInputs = [

From 9cc0036ba07370ef6bafb07d7b621306c1c573c5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 644/953] python3Packages.pyvisa-py: 0.5.3 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix
index 4b7a179678a3..2218f81bbdb5 100644
--- a/pkgs/development/python-modules/pyvisa-py/default.nix
+++ b/pkgs/development/python-modules/pyvisa-py/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "pyvisa-py";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "pyvisa";
     repo = "pyvisa-py";
     rev = "refs/tags/${version}";
-    hash = "sha256-37GptqqBSIFOpm6SpS61ZZ9C4iU5AiOduVq255mTRNo=";
+    hash = "sha256-1EAkE2uYjo8sUbSrF6E1AGZkKPTxkSre3ov2RU8YhfM=";
   };
 
   nativeBuildInputs = [

From 905f685b2927cf6aa0ab07da7fb52b6500298da3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 645/953] python3Packages.pyvmomi: 8.0.0.1 -> 8.0.0.1.1

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

diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
index 4f07951be5db..54ee52c347bf 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyvmomi";
-  version = "8.0.0.1";
+  version = "8.0.0.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "vmware";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-DVqC5giVMixj9NlGJ2gaH7ybX3hdQsdNTjuTkesao9E=";
+    hash = "sha256-K3gCG4TYyCiHKhrixPwBtBZ4s0bNd7Z4f3CLGnqCDG0=";
   };
 
   propagatedBuildInputs = [

From ba24a36da5b29eadd669a22eb944e0608a4cc65c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 646/953] python3Packages.PyWavelets: 1.3.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
index a85a59ff4ab6..52ff09078e9b 100644
--- a/pkgs/development/python-modules/pywavelets/default.nix
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "PyWavelets";
-  version = "1.3.0";
+  version = "1.4.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-y6qdYgUtna+Np2X8jnwww46iuOnhwYhBkT37SuxnHuU=";
+    sha256 = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM=";
   };
 
   checkInputs = [ nose pytest ];

From 5ed4e72c0c060a080817bd62c098f8136871b5d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 647/953] python3Packages.pywebview: 3.7 -> 3.7.2

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

diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index b80c85d8e13b..28c0da0e0434 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pywebview";
-  version = "3.7";
+  version = "3.7.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "r0x0r";
     repo = "pywebview";
     rev = "refs/tags/${version}";
-    hash = "sha256-RRq6b0hqAzig/WwFK0VsrhHO6ar8HhMdAEIosPPNUQg=";
+    hash = "sha256-5e05XkyxvOGLaEwKljYFppHQ99BxDQ7wPkViRlRo1VI=";
   };
 
   nativeBuildInputs = [

From 6f20f0c34e41476a892ba749d2055d0ebe2fd140 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:42 +0100
Subject: [PATCH 648/953] python3Packages.pyworld: 0.3.0 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix
index 9833a29593e8..4e22e5f5d9cc 100644
--- a/pkgs/development/python-modules/pyworld/default.nix
+++ b/pkgs/development/python-modules/pyworld/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pyworld";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e19b5d8445e0c4fc45ded71863aeaaf2680064b4626b0e7c90f72e9ace9f6b5b";
+    sha256 = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0=";
   };
 
   nativeBuildInputs = [

From 8f330ab47ece16bdd84ce3644b3590834e45844e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 649/953] python3Packages.pyxattr: 0.7.2 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix
index 35bfaecda977..1ad0391ea34d 100644
--- a/pkgs/development/python-modules/pyxattr/default.nix
+++ b/pkgs/development/python-modules/pyxattr/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
     pname = "pyxattr";
-    version = "0.7.2";
+    version = "0.8.0";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "68477027e6d3310669f98aaef15393bfcd9b2823d7a7f00a6f1d91a3c971ae64";
+      sha256 = "sha256-e/QM7FrpPdZWEocX29Joz8Ozso2VU214hndslPomeFU=";
     };
 
     # IOError: [Errno 95] Operation not supported (expected)

From 9add900c29613a054e648c813f1d36b0af17750e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 650/953] python3Packages.pyzmq: 23.2.1 -> 24.0.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 480247d01bb0..af8131306f7c 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.1";
+  version = "24.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KzgaqGfs59CoLzCgx/PUOHt88uBpfjPvqlvtbFeEq80=";
+    hash = "sha256-IW9dfbtnFmdZ5ZsEebyoK4rPm+1gFbUmuOsQFD+wjnc=";
   };
 
   buildInputs = [

From 67333dc21a886619ea20b2a147b1a2b6f49ddda2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 651/953] python3Packages.qiskit-aer: 0.10.4 -> 0.11.2

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

diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix
index f7ad8da805a0..0941574a9575 100644
--- a/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-aer";
-  version = "0.10.4";
+  version = "0.11.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -39,8 +39,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "qiskit-aer";
-    rev = version;
-    sha256 = "sha256-mf+Pgw/daFkt1bvqSeYzlO/Sd2F2MtwZcLr+h1u+eb0=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw=";
   };
 
   postPatch = ''

From 86698c039ae402faa9c7c8786a3aa0233ad727ba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 652/953] python3Packages.qiskit: 0.37.0 -> 0.39.4

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

diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 458fa6a146e3..02782b5939d6 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -28,7 +28,7 @@ in
 buildPythonPackage rec {
   pname = "qiskit";
   # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
-  version = "0.37.0";
+  version = "0.39.4";
 
   disabled = pythonOlder "3.6";
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "Qiskit";
     repo = "qiskit";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-TsDDiSWSjk2iXaxFjGXQxPFEPCR242dR26H0cpA6ZxY=";
+    sha256 = "sha256-4Lf+0Dq64J53qTEzr9gtuYwe1a+zIgHmgoKMTBEef8M=";
   };
 
   propagatedBuildInputs = [

From 95dab6bb8eb5dfa0d5775401ecc2246e1f87b150 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 653/953] python3Packages.qiskit-finance: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix
index 45764b4983ef..f731249ceef2 100644
--- a/pkgs/development/python-modules/qiskit-finance/default.nix
+++ b/pkgs/development/python-modules/qiskit-finance/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-finance";
-  version = "0.3.3";
+  version = "0.3.4";
 
   disabled = pythonOlder "3.6";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "qiskit";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-1XM4gBuMsvjwU4GSdQJobMyyDFZOOTbwvnUPG0nXFoc=";
+    sha256 = "sha256-Ijoqn6nANLsEVKA5nycd1xbW5htJ+TQm6LkiMUWTsSs=";
   };
 
   postPatch = ''

From 292c2df5c6a8f41af71a0b38685c006cb2bc589b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 654/953] python3Packages.qiskit-machine-learning: 0.4.0 ->
 0.5.0

---
 .../python-modules/qiskit-machine-learning/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
index e4761dc33b02..a9b46f5980f8 100644
--- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix
+++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-machine-learning";
-  version = "0.4.0";
+  version = "0.5.0";
 
   disabled = pythonOlder "3.6";
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "qiskit";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-WZSXt+sVeO64wCVbDgBhuGvo5jTn/JKh9oNSO7ZY9wo=";
+    sha256 = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI=";
   };
 
   propagatedBuildInputs = [

From c468a1fd9a1324aced102aee869f4ccb8a1f290b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 655/953] python3Packages.qiskit-nature: 0.4.3 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix
index 7c7510675f13..ee869d032f37 100644
--- a/pkgs/development/python-modules/qiskit-nature/default.nix
+++ b/pkgs/development/python-modules/qiskit-nature/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-nature";
-  version = "0.4.3";
+  version = "0.5.2";
 
   disabled = pythonOlder "3.6";
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "Qiskit";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-trThxcft6AOxalOglOKPwrJ23Bqt/FmMCAucKmNmB7c=";
+    sha256 = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw=";
   };
 
   propagatedBuildInputs = [

From a6c5e4aa48b4859f144e93156b90bd459c25a978 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:43 +0100
Subject: [PATCH 656/953] python3Packages.QtPy: 2.2.0 -> 2.3.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 97d2111677f3..f1c601f76810 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.2.0";
+  version = "2.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-2F8bEh8kpBrSbFXERuZqvbfFKIOfjE8R8VbsRUGQORQ=";
+    sha256 = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U=";
   };
 
   propagatedBuildInputs = [

From 7c265e1391e0f69b30777e2800de462e354059d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 657/953] python3Packages.radish-bdd: 0.14.0 -> 0.14.2

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

diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 258cd012716c..322db5b8f9cd 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "radish-bdd";
-  version = "0.14.0";
+  version = "0.14.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "radish";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7C8XgGlpNVUONSfg9DsIS8Awpy6iDzFOLAFs1xpfHXI=";
+    hash = "sha256-Xyj9yA4Rif3/BWEBnFubXQxwMM0IkHQ1koFZ+HWYQcI=";
   };
 
   propagatedBuildInputs = [

From 87a1a8bc017f4f26e072ad274384005f7f51cc80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 658/953] python3Packages.rasterio: 1.3.0 -> 4

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

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 7876e6667491..01dca1adf748 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.3.0"; # not x.y[ab]z, those are alpha/beta versions
+  version = "4"; # not x.y[ab]z, those are alpha/beta versions
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
@@ -38,8 +38,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rasterio";
     repo = "rasterio";
-    rev = "refs/tags/${version}";
-    hash = "sha256-CBnG1zNMOL3rAmnErv7XZZ2Cu9W+DnRPcjtKdmYXHUA=";
+    rev = "refs/tags/release-test-${version}";
+    hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4=";
   };
 
   nativeBuildInputs = [

From 740f6fc4d817d24c80395ae4297777d111c7ed9e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 659/953] python3Packages.rdflib: 6.1.1 -> 6.2.0

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

diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 27356390cfda..5ae23438b7a2 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -18,12 +18,13 @@
 , html5lib
 
 # tests
+, pytest-cov
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "rdflib";
-  version = "6.1.1";
+  version = "6.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -31,8 +32,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RDFLib";
     repo = pname;
-    rev = version;
-    hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd";
+    rev = "refs/tags/${version}";
+    hash = "sha256-GkqfSyApOFKPIiIYXhgaRZuMawk7PRYmxGDhnRI+Rz0=";
   };
 
   propagatedBuildInputs = [
@@ -53,6 +54,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
+    pytest-cov
     pytestCheckHook
   ]
   ++ passthru.optional-dependencies.networkx
@@ -68,6 +70,10 @@ buildPythonPackage rec {
     # Requires network access
     "test_service"
     "testGuessFormatForParse"
+    "test_infix_owl_example1"
+    "test_context"
+    "test_guess_format_for_parse"
+    "rdflib.extras.infixowl"
   ] ++ lib.optionals stdenv.isDarwin [
     # Require loopback network access
     "TestGraphHTTP"

From 192e12eead22f03354c038c61a7e380d049ae6d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 660/953] python3Packages.readchar: 3.0.5 -> 4.0.3

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

diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix
index 81c489bd8c09..0b21c483cd02 100644
--- a/pkgs/development/python-modules/readchar/default.nix
+++ b/pkgs/development/python-modules/readchar/default.nix
@@ -12,20 +12,20 @@
 
 buildPythonPackage rec {
   pname = "readchar";
-  version = "3.0.5";
+  version = "4.0.3";
   format = "setuptools";
 
   # Don't use wheels on PyPI
   src = fetchFromGitHub {
     owner = "magmax";
     repo = "python-${pname}";
-    rev = "v${version}";
-    sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0=";
   };
 
   postPatch = ''
     substituteInPlace setup.cfg \
-      --replace "--cov readchar" ""
+      --replace "--cov=readchar" ""
   '';
 
   nativeBuildInputs = [

From 093bc511c056fdea34573f5b4629f0cc6e01edb9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 661/953] python3Packages.readthedocs-sphinx-ext: 2.1.8 ->
 2.2.0

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

diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
index e0ba8cd57cf4..6ff9d965b288 100644
--- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
+++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "readthedocs-sphinx-ext";
-  version = "2.1.8";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pX43E9r3e/kdG6GeS5iIpHwKv+tj7PAuOsd/z9mb/mk=";
+    sha256 = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA=";
   };
 
   propagatedBuildInputs = [ requests ];

From 5dd80f134507ee2e812a8a7a98b29459a7baf19f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 662/953] python3Packages.recipe-scrapers: 14.14.0 -> 14.26.0

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

diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix
index 897a8239f0fa..4b4d283e309c 100644
--- a/pkgs/development/python-modules/recipe-scrapers/default.nix
+++ b/pkgs/development/python-modules/recipe-scrapers/default.nix
@@ -8,19 +8,25 @@
 , requests
 , pytestCheckHook
 , responses
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "recipe-scrapers";
-  version = "14.14.0";
+  version = "14.26.0";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "hhursev";
     repo = "recipe-scrapers";
-    rev = version;
-    sha256 = "sha256-3qrjNd1jX4JP3qG9YX8MQqwPh8cvfkZa1tEk0uCwego=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-U7A9HmkXPcuYEsY/uGUVh3LYHDYhV/uizELh1/vXG+U=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     beautifulsoup4
     extruct

From 5213bbdae4431b52336358be6546969172b3f4b3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 663/953] python3Packages.redis: 4.3.4 -> 4.4.0

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

diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index adaf4d86ef69..649a1192afd0 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "redis";
-  version = "4.3.4";
+  version = "4.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-3fJwcd9K3zghxPLKWdZ1JcOoLl8mi+2XuBPLT6v4eIA=";
+    sha256 = "sha256-e4yH0ZxF0/EnGxJIWNKlwTFgxOdNSDXignNAD6NNUig=";
   };
 
   propagatedBuildInputs = [

From 9737f9131cf4392784fc33981315aec2ba55e162 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 664/953] python3Packages.regex: 2022.9.13 -> 2022.10.31

---
 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 1bd2d8b5d871..d41bed6136ed 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.9.13";
+  version = "2022.10.31";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8HNztuVqbzoN89dbZRonjKe9NXp5YHiiapWOoc4FiP0=";
+    hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM=";
   };
 
   checkPhase = ''

From 3fc0fc46d93beb34ac0992c4ef514757d032062e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 665/953] python3Packages.reolink: 0.61 -> 0.63

https://github.com/fwestenberg/reolink/releases/tag/v0.62
https://github.com/fwestenberg/reolink/releases/tag/v0.63
---
 pkgs/development/python-modules/reolink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix
index 070c665e8a41..13b1c662c8a4 100644
--- a/pkgs/development/python-modules/reolink/default.nix
+++ b/pkgs/development/python-modules/reolink/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "reolink";
-  version = "0.61";
+  version = "0.63";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fwestenberg";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-XUYTDHh0oTro6BT+h4LjRdMukOZTlWP+giFpjLciZNQ=";
+    hash = "sha256-qwS7frXRk4gCBoAyBFLlbpYsyQZYqMLGB/pdznwyCoA=";
   };
 
   propagatedBuildInputs = [

From 640a0469e86cdbd98fc99f14fad036c174d7d26d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:44 +0100
Subject: [PATCH 666/953] python3Packages.reportlab: 3.6.11 -> 3.6.12

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

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 7a58aaddaace..a84ed43c5c05 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -12,11 +12,11 @@ let
   ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
 in buildPythonPackage rec {
   pname = "reportlab";
-  version = "3.6.11";
+  version = "3.6.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko=";
+    sha256 = "sha256-sTzr9OOXu6FFQrzQIzOLb/LBUaOhKqvKie7L+XLLNho=";
   };
 
   patches = [

From 2359aa440b9e7831f32bbe4f7d046ad82d014676 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 667/953] python3Packages.reproject: 0.9 -> 0.9.1

---
 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 a8643ca65073..da889482998c 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "reproject";
-  version = "0.9";
+  version = "0.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zhjI4MjlCV9zR0nNcss+C36CZXY/imGsalfKMGacfi0=";
+    hash = "sha256-pXSUVeTrxtSqKTa286xdCAAFipg38iR4XSO6CRfWXtc=";
   };
 
   nativeBuildInputs = [

From 1a3881d351f96dba60a50fbbd680163b7ac1430c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 668/953] python3Packages.requests-toolbelt: 0.9.1 -> 0.10.1

---
 .../requests-toolbelt/default.nix             | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix
index af6788d173fc..1b86cddc50f6 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "requests-toolbelt";
-  version = "0.9.1";
+  version = "0.10.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A=";
+    hash = "sha256-YuCff/XMvakncqKfOUpJw61ssYHVaLEzdiayq7Yopj0=";
   };
 
   propagatedBuildInputs = [
@@ -29,25 +29,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  patches = [
-    (fetchpatch {
-      # Fix collections.abc deprecation warning, https://github.com/requests/toolbelt/pull/246
-      name = "fix-collections-abc-deprecation.patch";
-      url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch";
-      sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4=";
-    })
-    # Make pyopenssl optional
-    (fetchpatch {
-      url = "https://github.com/requests/toolbelt/commit/c7c1f8626b73e5715e6ecc1de0833fabdfd67323.patch";
-      sha256 = "sha256-OhE3nyYyKKRHs9rCq8EJYebwaYyjWjbvbtL79MIMMRc=";
-    })
-    # Make pyopenssl optional
-    (fetchpatch {
-      url = "https://github.com/requests/toolbelt/commit/2453f32f1c995e7b19294750a4177bc32326826e.patch";
-      sha256 = "sha256-qmKHp+aVeazZt8X+sZeYfZCB56SE0OvFvWCXRZtkCew=";
-    })
-  ];
-
   disabledTests = [
     # https://github.com/requests/toolbelt/issues/306
     "test_no_content_length_header"

From 6f0d3dce5ea8b2ba2e8d16e213cea88337fc2d78 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 669/953] python3Packages.restrictedpython: 5.2 -> 6.0

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

diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix
index 6e782b1bd336..4d8c10e97cad 100644
--- a/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/pkgs/development/python-modules/restrictedpython/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "restrictedpython";
-  version = "5.2";
+  version = "6.0";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "RestrictedPython";
     inherit version;
-    sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs=";
+    sha256 = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0=";
   };
 
   checkInputs = [

From d207c3a7897224d178ca839379664fb2addf6d86 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 670/953] python3Packages.rich: 12.6.0 -> 13.0.0

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

diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 5d9c1f45c3b3..a760ed03dfde 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -17,15 +17,15 @@
 
 buildPythonPackage rec {
   pname = "rich";
-  version = "12.6.0";
+  version = "13.0.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-g3tXftEoBCJ1pMdLyDBXQvY9haGMQkuY1/UBOtUqrLE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Mc2ZTpn2cPGXIBblwwukJGiD8etdVi8ag9Xb77gG62A=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 91e8bf9b3c0719f603bec1b9599d0fe01c602a50 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 671/953] python3Packages.RoboMachine: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix
index 504a5ac557ea..e0f04758b66f 100644
--- a/pkgs/development/python-modules/robomachine/default.nix
+++ b/pkgs/development/python-modules/robomachine/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "RoboMachine";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4251d405759a38f1e665acc245dcbcdec319376718169a73c57560183370fe0e";
+    sha256 = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k=";
   };
 
   propagatedBuildInputs = [ pyparsing robotframework allpairspy ];

From 9e9d8601f690d62672ed9cc494a9a25224181f5a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 672/953] python3Packages.robotframework: 5.0.1 -> 6.0.1

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

diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix
index 4f925c341dcf..2b52290fbcba 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "robotframework";
-  version = "5.0.1";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-aJUXqY6OFlbdLIr5Qpg27mGFm6hD+WvCrqXmf204WUo=";
+    sha256 = "sha256-WyT7nZfWEXLWaAU7aRnCK/Uw99iysmq4hyjEIn4DCCc=";
   };
 
   checkInputs = [ jsonschema ];

From bc7240f8120f8a6c304b8e19bf1048349bb9b396 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 673/953] python3Packages.s3fs: 2022.10.0 -> 2022.11.0

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

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index b1bebfce47c0..d295c73b2fe2 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -11,16 +11,20 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "2022.10.0";
+  version = "2022.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6N64DyC9CyBZFBuHT9udauuMzjUxLqXywCsiWnigBAY=";
+    hash = "sha256-EMWsKDpPW2f/rW0fJf9+4CYUJ1DFxdyGh0bNkE9hfDM=";
   };
 
+  postPatch = ''
+    sed -i 's/fsspec==.*/fsspec/' requirements.txt
+  '';
+
   buildInputs = [
     docutils
   ];

From 5fecd992be56f070208d9ef507556c46978844e6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:45 +0100
Subject: [PATCH 674/953] python3Packages.sagemaker: 2.109.0 -> 2.126.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 ebcb42920618..cac3e0fc4049 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.109.0";
+  version = "2.126.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hs71bIoByh5S1ncsku+y4X2i0yU65FknJE05lEmnru4=";
+    hash = "sha256-wuU53FmrtAY8E08Q+W4OhBoBQ8kks3LjJiR7kxlbfAg=";
   };
 
   nativeBuildInputs = [ pythonRelaxDepsHook ];

From 29bd96f3f4bff2c73aafd2af107510a66bd34d85 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:46 +0100
Subject: [PATCH 675/953] python3Packages.scancode-toolkit: 31.1.1 -> 31.2.3

---
 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 40e391347702..87ef6331196d 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.1.1";
+  version = "31.2.3";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/QLW+rxkDbrv/78xiXOuSNaQvY+0oYZQV0/m60CEZLk=";
+    hash = "sha256-+5zYYpH8EyHPruX9LDWzeVPny7VoFiARb4+32FXMxUc=";
   };
 
   dontConfigure = true;

From 1a4a453473bfcf70cfa4999017af6137915c60ad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:46 +0100
Subject: [PATCH 676/953] python3Packages.scikit-bio: 0.5.7 -> 0.5.8

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

diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index e86b384f9c4a..27e2063b075a 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -20,13 +20,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.5.7";
+  version = "0.5.8";
   pname = "scikit-bio";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Y0PKDGIeL8xdHAQsi+MgBmTFMllWqDvqdRzxvMddHak=";
+    sha256 = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs=";
   };
 
   nativeBuildInputs = [ cython ];

From 9df08f2c6c0e4a854dc2cd71b41dbfc751008944 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:46 +0100
Subject: [PATCH 677/953] python3Packages.scikit-build-core: 0.1.3 -> 0.1.5

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

diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index 802b50cab32f..2685c42df626 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-build-core";
-  version = "0.1.3";
+  version = "0.1.5";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "scikit_build_core";
     inherit version;
-    hash = "sha256-qkVj7fS2+JB8mpJ788vTw4jhD/TGtZAMtCiBlmjbFM8=";
+    hash = "sha256-OUS/QOaBd0DDBrDk8c3LzFrPVrVF65EJQPRjGtnUmjU=";
   };
 
   postPatch = ''

From 8a5cb90f399d9a539d9dbb16fd5de221363ee59e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:46 +0100
Subject: [PATCH 678/953] python3Packages.scikit-build: 0.15.0 -> 0.16.4

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

diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 4a466fcef06d..e2d2cffde73c 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -23,14 +23,20 @@
 
 buildPythonPackage rec {
   pname = "scikit-build";
-  version = "0.15.0";
+  version = "0.16.4";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-5yPNDzSJoEI3C56piLu5z9dyXoslsgyhx5gYIfz2X7k=";
+    hash = "sha256-KiDEreqzwq7BHXC86WkJlc/w5Tvq/jIae1MACayo5zE=";
   };
 
+  # This line in the filterwarnings section of the pytest configuration leads to this error:
+  #  E   UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils.
+  postPatch = ''
+    sed -i "/'error',/d" pyproject.toml
+  '';
+
   propagatedBuildInputs = [
     distro
     packaging

From d949566e919e0d91a5b1d25b7423427a3e2329b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:46 +0100
Subject: [PATCH 679/953] python3Packages.scikit-learn: 1.1.3 -> 1.2.0

---
 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 ca5bc74c0105..ca982ecb7128 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.3";
+  version = "1.2.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-vvUZeKUewZl3cA/nuGrs6knIJYhPOBF1a3SjsVK7TjU=";
+    sha256 = "sha256-aAtls8ruRpVBOF0spbA/9wQI9sYYxYOUgxLw0hJd9oA=";
   };
 
   buildInputs = [

From b60a370d42ea64a8b4490950da51e2705347e778 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:46 +0100
Subject: [PATCH 680/953] python3Packages.scikit-survival: 0.18.0 ->
 0.19.0.post1

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

diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index 1dd50b6380d8..38d602e291bc 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "scikit-survival";
-  version = "0.18.0";
+  version = "0.19.0.post1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LfQESmKxSJ4tWlp3EZTBajOxZC3IEOUtJmX8A5ROpmU=";
+    sha256 = "sha256-UBhUCpRXyd5gLxaf38wBURo2DIoUgMmROogGF3bwWJk=";
   };
 
   nativeBuildInputs = [

From 8d8e62e74f511160a599471549a98bc9e4f4818d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 681/953] python3Packages.setuptools-scm: 7.0.5 -> 7.1.0

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

diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix
index b4e8cc5afa62..dc338bd41120 100644
--- a/pkgs/development/python-modules/setuptools-scm/default.nix
+++ b/pkgs/development/python-modules/setuptools-scm/default.nix
@@ -5,24 +5,33 @@
 , typing-extensions
 , tomli
 , setuptools
+, pythonOlder
 , lib
 }:
 
 buildPythonPackage rec {
   pname = "setuptools-scm";
-  version = "7.0.5";
+  version = "7.1.0";
+  format = "pyproject";
 
   src = fetchPypi {
     pname = "setuptools_scm";
     inherit version;
-    sha256 = "sha256-Ax4Tr3cdb4krlBrbbqBFRbv5Hrxc5ox4qvP/9uH7SEQ=";
+    hash = "sha256-bFCDRadxqtfVbr/w5wYovysOx1c3Yr6ZYCFHMN4njyc=";
   };
 
+  nativeBuildInputs = [
+    packaging
+    setuptools
+    typing-extensions
+  ];
+
   propagatedBuildInputs = [
     packaging
-    typing-extensions
-    tomli
     setuptools
+    typing-extensions
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
   ];
 
   pythonImportsCheck = [

From 6426df7cc26bc3329c089185e53d28c9d30bc804 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 682/953] python3Packages.Shapely: 1.8.4 -> 2.0.0

---
 .../python-modules/shapely/default.nix        | 17 +++-------
 .../shapely/library-paths.patch               | 31 -------------------
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/python-modules/shapely/library-paths.patch

diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index fda2645105f6..260a27236500 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -11,13 +11,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "Shapely";
-  version = "1.8.4";
+  pname = "shapely";
+  version = "2.0.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw=";
+    sha256 = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo=";
   };
 
   nativeBuildInputs = [
@@ -33,18 +33,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # Environment variable used in shapely/_buildcfg.py
+  # Environment variable used in setup.py
   GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
 
-  patches = [
-    # Patch to search form GOES .so/.dylib files in a Nix-aware way
-    (substituteAll {
-      src = ./library-paths.patch;
-      libgeos_c = GEOS_LIBRARY_PATH;
-      libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
-    })
- ];
-
   preCheck = ''
     rm -r shapely # prevent import of local shapely
   '';
diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch
deleted file mode 100644
index d095eada9d6e..000000000000
--- a/pkgs/development/python-modules/shapely/library-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/shapely/geos.py b/shapely/geos.py
-index 88c5f53..1ccd6e4 100644
---- a/shapely/geos.py
-+++ b/shapely/geos.py
-@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'):
-         alt_paths = [
-             'libgeos_c.so.1',
-             'libgeos_c.so',
-+            '@libgeos_c@',
-         ]
-         _lgeos = load_dll('geos_c', fallbacks=alt_paths)
- 
-@@ -160,6 +161,7 @@ elif sys.platform == 'darwin':
-             "/usr/local/lib/libgeos_c.dylib",
-             # homebrew Apple Silicon
-             "/opt/homebrew/lib/libgeos_c.dylib",
-+            "@libgeos_c@",
-         ]
-         _lgeos = load_dll('geos_c', fallbacks=alt_paths)
- 
-diff --git a/tests/test_dlls.py b/tests/test_dlls.py
-index c71da8e..c36262c 100644
---- a/tests/test_dlls.py
-+++ b/tests/test_dlls.py
-@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase):
-             '/opt/homebrew/lib/libgeos_c.dylib',  # homebrew (macOS)
-             os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux)
-             'libgeos_c.so.1',
--            'libgeos_c.so'])
-+            'libgeos_c.so',
-+            '@libgeos_c@'])

From 809587a8eb88fe2b7030b6dad44a3407de716247 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 683/953] python3Packages.shortuuid: 1.0.9 -> 1.0.11

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

diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix
index b443e319290c..097cf5be5334 100644
--- a/pkgs/development/python-modules/shortuuid/default.nix
+++ b/pkgs/development/python-modules/shortuuid/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "shortuuid";
-  version = "1.0.9";
+  version = "1.0.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RZ8S+hrMNP8hOxNxRnwDJRaWRaMe2YniaIcjOa91Y9U=";
+    hash = "sha256-/HXyYVkUgVqOTLFQGzpRN0XLZu8P1fxvufjD+jSB94k=";
   };
 
   checkInputs = [
@@ -25,10 +25,6 @@ buildPythonPackage rec {
     "shortuuid"
   ];
 
-  pytestFlagsArray = [
-    "shortuuid/tests.py"
-  ];
-
   meta = with lib; {
     description = "Library to generate concise, unambiguous and URL-safe UUIDs";
     homepage = "https://github.com/stochastic-technologies/shortuuid/";

From 4d3f8ca00ec989546565c55e58cc09cb7be1c32f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 684/953] python3Packages.sip: 6.7.4 -> 6.7.5

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

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 07a731b53d92..5facfac582c0 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "sip";
-  version = "6.7.4";
+  version = "6.7.5";
 
   src = fetchPypi {
     pname = "sip";
     inherit version;
-    sha256 = "sha256-nb+KDnyNdtFkLi/dP1PmpSL3wwmA5Sd2PEV2DCUFz78=";
+    sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ=";
   };
 
   propagatedBuildInputs = [ packaging ply toml ];

From 09ab6a0715ebb1bd71831f29309dfa011317b4d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 685/953] python3Packages.slackclient: 2.9.3 -> 3.19.5

---
 .../python-modules/slackclient/default.nix    | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index 1c02d592d679..49e3cc70a30b 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -1,12 +1,14 @@
 { lib
 , stdenv
 , aiohttp
+, boto3
 , buildPythonPackage
-, codecov
 , fetchFromGitHub
-, flake8
+, flask
+, flask-sockets
 , isPy3k
 , mock
+, moto
 , psutil
 , pytest-cov
 , pytest-mock
@@ -15,20 +17,23 @@
 , requests
 , responses
 , six
+, sqlalchemy
+, websockets
 , websocket-client
 }:
 
 buildPythonPackage rec {
   pname = "slackclient";
-  version = "2.9.3";
+  version = "3.19.5";
+  format =  "setuptools";
 
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "slackapi";
     repo = "python-slack-sdk";
-    rev = "v${version}";
-    sha256 = "1rfb7izgddv28ag37gdnv3sd8z2zysrxs7ad8x20x690zshpaq16";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk=";
   };
 
   propagatedBuildInputs = [
@@ -39,22 +44,30 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    codecov
-    flake8
+    boto3
+    flask
+    flask-sockets
     mock
+    moto
     psutil
-    pytest-cov
     pytest-mock
     pytestCheckHook
-    pytest-runner
     responses
+    sqlalchemy
+    websockets
   ];
 
   # Exclude tests that requires network features
   pytestFlagsArray = [ "--ignore=integration_tests" ];
 
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
   disabledTests = [
     "test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
+    "test_interactions"
+    "test_send_message_while_disconnection"
   ] ++ lib.optionals stdenv.isDarwin [
     # these fail with `ConnectionResetError: [Errno 54] Connection reset by peer`
     "test_issue_690_oauth_access"

From 627d90a0d1b51eb8033a9ca544d8d02adb8d2d22 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 686/953] python3Packages.sly: 0.4 -> 0.5

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

diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix
index 273972cbe4ee..b13c41be7276 100644
--- a/pkgs/development/python-modules/sly/default.nix
+++ b/pkgs/development/python-modules/sly/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "sly";
-  version = "0.4";
+  version = "0.5";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0an31bm5m8wqwphanmcsbbnmycy6l4xkmg4za4bwq8hk4dm2dwp5";
+    sha256 = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ=";
   };
 
   checkInputs = [ pytest ];

From 579b0aa1a9b872fbd9ce6ddef472b32e66e59a7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 687/953] python3Packages.softlayer: 6.1.0 -> 6.1.3

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

diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix
index 6c3df4eb6f98..70bfb13f8008 100644
--- a/pkgs/development/python-modules/softlayer/default.nix
+++ b/pkgs/development/python-modules/softlayer/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "softlayer";
-  version = "6.1.0";
+  version = "6.1.3";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "softlayer-python";
-    rev = "v${version}";
-    sha256 = "sha256-T49KVAsgcAZySkaJi47IrFcMHGZvEkGDjPWsdMarzwM=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U=";
   };
 
   postPatch = ''

From 77976313e7fa5a07ced531e68320ec71b2ca06be Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 688/953] python3Packages.solc-select: 0.2.1 -> 1.0.2

---
 .../python-modules/solc-select/default.nix            | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix
index e51f1cd143f1..af8724d1999d 100644
--- a/pkgs/development/python-modules/solc-select/default.nix
+++ b/pkgs/development/python-modules/solc-select/default.nix
@@ -1,17 +1,24 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, packaging
+, pycryptodome
 }:
 
 buildPythonPackage rec {
   pname = "solc-select";
-  version = "0.2.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6VawTcffIgnR+zuC4rti+Ocwu1VMTX+VihT/L7LzchI=";
+    sha256 = "sha256-zrpWHQdoCVDGaDGDf9fWhnRsTe1GVwqk1qls1PyvlLw=";
   };
 
+  propagatedBuildInputs = [
+    packaging
+    pycryptodome
+  ];
+
   # no tests
   doCheck = false;
   pythonImportsCheck = [ "solc_select" ];

From 1f5d31e1d501ac01f3b09e3919f5c872011df269 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:47 +0100
Subject: [PATCH 689/953] python3Packages.spacy: 3.4.1 -> 3.4.4

---
 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 54c96a73cb82..c64e1384c65a 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.1";
+  version = "3.4.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WcXPXTSKbA5kpZrFz+bNhdCOhmM3hwyV0exhYdUx5GM=";
+    hash = "sha256-5QDPLLXxhJRhp5KPomlwN1YGm9+3FVkGUkCvbQIIsIw=";
   };
 
   propagatedBuildInputs = [

From 1cb93c0d8fc91fc79c922349dd67cd460f4f29cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 690/953] python3Packages.sphinx-argparse: 0.3.2 -> 0.4.0

---
 .../development/python-modules/sphinx-argparse/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix
index a4a414328b55..778ce64016b6 100644
--- a/pkgs/development/python-modules/sphinx-argparse/default.nix
+++ b/pkgs/development/python-modules/sphinx-argparse/default.nix
@@ -7,11 +7,12 @@
 
 buildPythonPackage rec {
   pname = "sphinx-argparse";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-5UrWyPiVrGu50N2foH5H4TeipCrhinFFFSYuhrTMS6s=";
+    pname = "sphinx_argparse";
+    inherit version;
+    sha256 = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek=";
   };
 
   postPatch = ''

From 41f040ace8ff2a2e4dd6a11c003789a81851f855 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 691/953] python3Packages.sphinx-autodoc-typehints: 1.19.2 ->
 1.19.5

---
 .../sphinx-autodoc-typehints/default.nix             | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index 85f6366f0f07..bd3edbd9c0f6 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, hatch-vcs
+, hatchling
 , pythonOlder
 , sphinx
 , pytestCheckHook
@@ -8,7 +10,7 @@
 
 let
   pname = "sphinx-autodoc-typehints";
-  version = "1.19.2";
+  version = "1.19.5";
 in
 
 buildPythonPackage {
@@ -20,9 +22,14 @@ buildPythonPackage {
   src = fetchPypi {
     pname = "sphinx_autodoc_typehints";
     inherit version;
-    hash = "sha256-hy+y17PXlIJsKONu32c56TVJSRRH3KvrB8WIVen5FN4=";
+    hash = "sha256-OKInN44rwVyE4pr4yx11gRgtoRBxEf0ciLGbXrcHYgU=";
   };
 
+  nativeBuildInputs = [
+    hatch-vcs
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     sphinx
   ];
@@ -39,6 +46,7 @@ buildPythonPackage {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/${version}";
     description = "Type hints (PEP 484) support for the Sphinx autodoc extension";
     homepage = "https://github.com/tox-dev/sphinx-autodoc-typehints";
     license = licenses.mit;

From 93ce11ea74a842f63bb43d035bb786a006092e6a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 692/953] python3Packages.sphinxcontrib-bayesnet: 0.1 -> 0.4

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

diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix
index 6f53dd79d364..799a4ba1b5cf 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-bayesnet";
-  version = "0.1";
+  version = "0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x1kisvj7221cxfzmwplx3xlwbavl636fpncnjh7gghp1af71clw";
+    sha256 = "sha256-+M+K8WzQqxQUGgAgGPK+isf3gKK7HOrdI6nNW/V8Wv0=";
   };
 
   propagatedBuildInputs = [ sphinx sphinxcontrib-tikz ];

From 5f3a7bf8bd743519aa18c21fedfe2d5bca630b8c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 693/953] python3Packages.sphinx-mdinclude: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix
index 246c30e79664..ad4f1b5d326e 100644
--- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix
+++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "sphinx-mdinclude";
-  version = "0.5.2";
+  version = "0.5.3";
   format = "flit";
 
   src = fetchPypi {
     pname = "sphinx_mdinclude";
     inherit version;
-    hash = "sha256-F7UVe1xNrz+vCbJOCxwyJQoxfwSCORW+qu9vDH7oEPc=";
+    hash = "sha256-KZjj0YswIsmYPRtyGR/jfiX/zNVBZcvjrLIszu3ZGvQ=";
   };
 
   nativeBuildInputs = [ flit-core ];

From f2e460fc9b28796eaaf61da1e2ddbdad1226acba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 694/953] python3Packages.sphinx-rtd-theme: 1.0.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
index 514ce279fe79..3259b47963fd 100644
--- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "sphinx-rtd-theme";
-  version = "1.0.0";
+  version = "1.1.1";
 
   src = fetchPypi {
     pname = "sphinx_rtd_theme";
     inherit version;
-    sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf";
+    sha256 = "sha256-YUbIRfHhlHs8PdRDLCiZihaTzMdCtPmtfGMSnwdXwQM=";
   };
 
   postPatch = ''

From 19cd4c7199eb7edc6238200dba68f1d49ac439ff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 695/953] python3Packages.spyder: 5.4.0 -> 5.4.1

---
 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 bb744b2abab4..d6d408b8c686 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -46,14 +46,14 @@
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "5.4.0";
+  version = "5.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw=";
+    hash = "sha256-kQBOYRXhjz+OQk7Vlxb/UKiDi92mA8ialsFQ+QzqhlE=";
   };
 
   nativeBuildInputs = [

From b440d1cffbd093832cd741bed2023dfdf178497b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 696/953] python3Packages.spyder-kernels: 2.4.0 -> 2.4.1

---
 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 f39b03763c81..837cf0c0a520 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "spyder-kernels";
-  version = "2.4.0";
+  version = "2.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-O9MvvjChUKucztvVvrbd04veHZqHeNpS9+30ILv7jlE=";
+    hash = "sha256-eD2N+9cVzZdyjpE5FnebN8+OllZjVevaz+NBHSvrR5Y=";
   };
 
   propagatedBuildInputs = [

From 93eba65f4673757ee4cb46b9f57fca363c88e19d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:48 +0100
Subject: [PATCH 697/953] python3Packages.sqlalchemy-utils: 0.38.3 -> 0.39.0

---
 .../sqlalchemy-utils/default.nix              | 89 ++++++++++++++-----
 .../skip-database-tests.patch                 | 78 ++--------------
 2 files changed, 72 insertions(+), 95 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index 49bba2811312..af108f17c0d3 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -1,58 +1,101 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, six
+, pythonOlder
+
+# runtime
+, importlib-metadata
 , sqlalchemy
-, colour
-, flexmock
-, jinja2
-, mock
-, pg8000
+
+# optionals
+, babel
+, arrow
+, pendulum
+#, intervals
 , phonenumbers
-, pygments
-, pymysql
-, pytestCheckHook
+, passlib
+, colour
 , python-dateutil
+, furl
+, cryptography
+
+# tests
+, pytestCheckHook
+, pygments
+, jinja2
+, docutils
+, flexmock
+, psycopg2
+, psycopg2cffi
+, pg8000
+, pytz
+, backports-zoneinfo
+, pymysql
+, pyodbc
+
 }:
 
 buildPythonPackage rec {
   pname = "sqlalchemy-utils";
-  version = "0.38.3";
+  version = "0.39.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "SQLAlchemy-Utils";
-    sha256 = "sha256-n5r7pgekBFXPcDrfqYRlhL8mFooMWmCnAGO3DWUFH00=";
+    hash = "sha256-s3JAkX2BwU/htuUJakArrORysXkSE4TkfBDYVNv1r5I=";
   };
 
   patches = [
-    # We don't run MySQL, MSSQL, or PostgreSQL
     ./skip-database-tests.patch
   ];
 
   propagatedBuildInputs = [
-    six
     sqlalchemy
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
   ];
 
+  passthru.optional-dependencies = {
+    babel = [ babel ];
+    arrow = [ arrow ];
+    pendulum = [ pendulum ];
+    #intervals = [ intervals ];
+    phone = [ phonenumbers ];
+    password = [ passlib ];
+    color = [ colour ];
+    timezone = [ python-dateutil ];
+    url = [ furl ];
+    encrypted = [ cryptography ];
+  };
+
   checkInputs = [
-    colour
-    flexmock
-    jinja2
-    mock
-    pg8000
-    phonenumbers
-    pygments
-    pymysql
     pytestCheckHook
+    pygments
+    jinja2
+    docutils
+    flexmock
+    psycopg2
+    psycopg2cffi
+    pg8000
+    pytz
     python-dateutil
+    pymysql
+    pyodbc
+  ]
+  ++ lib.flatten (builtins.attrValues passthru.optional-dependencies)
+  ++ lib.optionals (pythonOlder "3.9") [
+    backports-zoneinfo
   ];
 
-  disabledTests = [
-    "test_literal_bind"
+  pytestFlagsArray = [
+    "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice"
+    "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop"
+    "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop"
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}";
     homepage = "https://github.com/kvesteri/sqlalchemy-utils";
     description = "Various utility functions and datatypes for SQLAlchemy";
     license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch
index 79aa12f03d99..d5f9a46ecb88 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch
+++ b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch
@@ -1,13 +1,12 @@
 diff --git a/conftest.py b/conftest.py
-index 9e146cd..8dbc9a5 100644
+index 4426e02..1f84096 100644
 --- a/conftest.py
 +++ b/conftest.py
-@@ -61,17 +61,12 @@ def mysql_db_user():
- 
+@@ -73,17 +73,12 @@ def mysql_db_user():
  @pytest.fixture
  def postgresql_dsn(postgresql_db_user, postgresql_db_password, postgresql_db_host,
                     db_name):
--    return 'postgresql://{0}:{1}@{2}/{3}'.format(
+-    return 'postgresql://{}:{}@{}/{}'.format(
 -        postgresql_db_user,
 -        postgresql_db_password,
 -        postgresql_db_host,
@@ -18,83 +17,18 @@ index 9e146cd..8dbc9a5 100644
  
  @pytest.fixture
  def mysql_dsn(mysql_db_user, db_name):
--    return 'mysql+pymysql://{0}@localhost/{1}'.format(mysql_db_user, db_name)
+-    return f'mysql+pymysql://{mysql_db_user}@localhost/{db_name}'
 +    pytest.skip()
  
  
  @pytest.fixture
-@@ -108,8 +104,7 @@ def mssql_db_driver():
+@@ -121,8 +116,7 @@ def mssql_db_driver():
  
  @pytest.fixture
  def mssql_dsn(mssql_db_user, mssql_db_password, mssql_db_driver, db_name):
--    return 'mssql+pyodbc://{0}:{1}@localhost/{2}?driver={3}'\
+-    return 'mssql+pyodbc://{}:{}@localhost/{}?driver={}'\
 -        .format(mssql_db_user, mssql_db_password, db_name, mssql_db_driver)
 +    pytest.skip()
  
  
  @pytest.fixture
-diff --git a/tests/functions/test_database.py b/tests/functions/test_database.py
-index 0ad6721..83f208d 100644
---- a/tests/functions/test_database.py
-+++ b/tests/functions/test_database.py
-@@ -76,28 +76,6 @@ class TestDatabasePostgres(DatabaseTest):
-                 "TEMPLATE my_template") in str(excinfo.value)
- 
- 
--class TestDatabasePostgresPg8000(DatabaseTest):
--
--    @pytest.fixture
--    def dsn(self, postgresql_db_user, postgresql_db_password):
--        return 'postgresql+pg8000://{0}:{1}@localhost/{2}'.format(
--            postgresql_db_user,
--            postgresql_db_password,
--            'db_to_test_create_and_drop_via_pg8000_driver'
--        )
--
--
--class TestDatabasePostgresPsycoPG2CFFI(DatabaseTest):
--
--    @pytest.fixture
--    def dsn(self, postgresql_db_user, postgresql_db_password):
--        return 'postgresql+psycopg2cffi://{0}:{1}@localhost/{2}'.format(
--            postgresql_db_user,
--            postgresql_db_password,
--            'db_to_test_create_and_drop_via_psycopg2cffi_driver'
--        )
--
--
- @pytest.mark.usefixtures('postgresql_dsn')
- class TestDatabasePostgresWithQuotedName(DatabaseTest):
- 
-@@ -116,31 +94,6 @@ class TestDatabasePostgresWithQuotedName(DatabaseTest):
-                 'TEMPLATE "my-template"') in str(excinfo.value)
- 
- 
--class TestDatabasePostgresCreateDatabaseCloseConnection:
--    def test_create_database_twice(
--        self,
--        postgresql_db_user,
--        postgresql_db_password
--    ):
--        dsn_list = [
--            'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-a'.format(
--                postgresql_db_user,
--                postgresql_db_password
--            ),
--            'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-b'.format(
--                postgresql_db_user,
--                postgresql_db_password
--            ),
--        ]
--        for dsn_item in dsn_list:
--            assert not database_exists(dsn_item)
--            create_database(dsn_item, template="template1")
--            assert database_exists(dsn_item)
--        for dsn_item in dsn_list:
--            drop_database(dsn_item)
--            assert not database_exists(dsn_item)
--
--
- @pytest.mark.usefixtures('mssql_dsn')
- class TestDatabaseMssql(DatabaseTest):
- 

From 3719a7bb2684b195c0f0856245b2d0554066f938 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 698/953] python3Packages.sqlitedict: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix
index 5634eb41601a..bb373761504d 100644
--- a/pkgs/development/python-modules/sqlitedict/default.nix
+++ b/pkgs/development/python-modules/sqlitedict/default.nix
@@ -1,18 +1,20 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, py
+, pytest-benchmark
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "sqlitedict";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "RaRe-Technologies";
     repo = "sqlitedict";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-8dmGn5h3NigCdDtnDYjpjntRpyjk7ivRp1B8x8nUgpE=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic=";
   };
 
   preCheck = ''
@@ -20,9 +22,15 @@ buildPythonPackage rec {
   '';
 
   checkInputs = [
+    py
+    pytest-benchmark
     pytestCheckHook
   ];
 
+  pytestFlagsArray = [
+    "--benchmark-disable"
+  ];
+
   meta = with lib; {
     description = "Persistent, thread-safe dict";
     homepage = "https://github.com/RaRe-Technologies/sqlitedict";

From 539f174c28346323df925c65fcda7cea866c832e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 699/953] python3Packages.sqlparse: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix
index 29e92cdecb93..16b5626da199 100644
--- a/pkgs/development/python-modules/sqlparse/default.nix
+++ b/pkgs/development/python-modules/sqlparse/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "sqlparse";
-  version = "0.4.2";
+  version = "0.4.3";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae";
+    sha256 = "sha256-acqASEa7EU0uw4DkNgqKNA24PwzPOvzusUBN8Cj1cmg=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 89ec49e8c5aa6d45c15841b55b1df4fa1a9d5d43 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 5 Jan 2023 03:27:36 +0300
Subject: [PATCH 700/953] starship: add git to checkInputs

Fixes build after 3eec3c8fed0251563841e26e044600139c2f92eb
---
 pkgs/tools/misc/starship/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 999079e55860..3688957af704 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -5,6 +5,7 @@
 , installShellFiles
 , cmake
 , fetchpatch
+, git
 , nixosTests
 , Security
 , Foundation
@@ -37,6 +38,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-hs0ImaozKH6QcUfts+oseUqecg7bGX5cx50ixnNamW8=";
 
+  checkInputs = [ git ];
+
   preCheck = ''
     HOME=$TMPDIR
   '';

From e9c7c8cd48b02176dcffd53a4991e51ed3700c46 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 701/953] python3Packages.srsly: 2.4.4 -> 2.4.5

---
 .../python-modules/sly/default.nix            | 25 +++++++++++++++----
 .../python-modules/srsly/default.nix          | 24 ++++++++++++++----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix
index b13c41be7276..411bc3e9297e 100644
--- a/pkgs/development/python-modules/sly/default.nix
+++ b/pkgs/development/python-modules/sly/default.nix
@@ -1,24 +1,39 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pytest
+, setuptools
+, pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "sly";
   version = "0.5";
+  format = "pyproject";
+
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ=";
+    hash = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ=";
   };
 
-  checkInputs = [ pytest ];
+  nativeBuildInputs = [
+    setuptools
+  ];
 
-  # tests not included with pypi release
-  doCheck = false;
+  postPatch = ''
+    # imperative dev dependency installation
+    rm Makefile
+  '';
+
+  pythonImportsCheck = [
+    "sly"
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "An improved PLY implementation of lex and yacc for Python 3";
diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 5108f9ea5eaa..8dd111b0797c 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -6,35 +6,49 @@
 , catalogue
 , mock
 , numpy
+, psutil
 , pytest
 , ruamel-yaml
+, setuptools
+, tornado
 }:
 
 buildPythonPackage rec {
   pname = "srsly";
-  version = "2.4.4";
+  version = "2.4.5";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg=";
+    hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c=";
   };
 
-  nativeBuildInputs = [ cython ];
+  nativeBuildInputs = [
+    cython
+    setuptools
+  ];
 
-  propagatedBuildInputs = [ catalogue ];
+  propagatedBuildInputs = [
+    catalogue
+  ];
 
   checkInputs = [
     mock
     numpy
+    psutil
     pytest
     ruamel-yaml
+    tornado
   ];
 
-  pythonImportsCheck = [ "srsly" ];
+  pythonImportsCheck = [
+    "srsly"
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/explosion/srsly/releases/tag/v${version}";
     description = "Modern high-performance serialization utilities for Python";
     homepage = "https://github.com/explosion/srsly";
     license = licenses.mit;

From e207360d518ab1115548cdbd89894b7f82220af3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 702/953] python3Packages.ssdp: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index bd73a6abaead..b21f043f0b5e 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -9,15 +9,15 @@
 
 buildPythonPackage rec {
   pname = "ssdp";
-  version = "1.1.0";
+  version = "1.1.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "codingjoe";
     repo = pname;
-    rev = version;
-    sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-D2mww3sEc2SvufWNmT450a2CW+ogROn3RHypljkebuY=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 00a1031c62c2557b6f2ad1b5a3c15a8bc8cff790 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 703/953] python3Packages.statsd: 3.3.0 -> 4.0.1

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

diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix
index da455c02d670..3f9caa13132e 100644
--- a/pkgs/development/python-modules/statsd/default.nix
+++ b/pkgs/development/python-modules/statsd/default.nix
@@ -1,19 +1,25 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , nose
 , mock
 }:
 
 buildPythonPackage rec {
   pname = "statsd";
-  version = "3.3.0";
+  version = "4.0.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3";
+    hash = "sha256-mXY9qBv+qNr2s9ItEarMsBqND1LqUh2qs351ikyn0Sg=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [ nose mock ];
 
   patchPhase = ''

From 9270985e662dd5f435b3fd5f87ee787078e52695 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 704/953] python3Packages.stem: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index 9ad5e2285ffb..1259e4cc91bb 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "stem";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50";
+    sha256 = "sha256-gdQ6fGaLqde8EQOy56kR6dFIKUs3PSelmujaee96Pi8=";
   };
 
   postPatch = ''

From 49d262033a6e3329085d2fd650a3d5bfe85129d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 705/953] python3Packages.stravalib: 0.10.4 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix
index a06a375be0e5..c59ffc8253b7 100644
--- a/pkgs/development/python-modules/stravalib/default.nix
+++ b/pkgs/development/python-modules/stravalib/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "stravalib";
-  version = "0.10.4";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215";
+    sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs=";
   };
 
   checkInputs = [

From bc7b5c5f0284566f095e8016bd1334032dfeeb4c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:49 +0100
Subject: [PATCH 706/953] python3Packages.strawberry-graphql: 0.125.0 ->
 0.151.2

---
 .../python-modules/strawberry-graphql/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index ca4b1b81725d..cd01471d366d 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -5,7 +5,7 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql";
-  version = "0.125.0";
+  version = "0.151.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -13,8 +13,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry";
-    rev = version;
-    sha256 = "sha256-8ERmG10qNiYg9Zr8oUZk/Uz68sCE+oWrqmJ5kUMqbRo=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-sHrdZ33irwTkm3OHQ2yxxcCWZDcaNbKy7amfRTtPVZ8=";
   };
 
   patches = [

From 8dd1aaf5967da58bfacc5d695309007113df9937 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:50 +0100
Subject: [PATCH 707/953] python3Packages.stripe: 4.1.0 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 18d348b144cb..96a7310cb04c 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "4.1.0";
+  version = "5.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hSrKk/Lu6rWCPSrPSlvtsl+Ub6EM6llaW1l9B0jxNl8=";
+    hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0=";
   };
 
   propagatedBuildInputs = [

From 04ebeb2953392595e8a2e1ad798e8e29fe24d0d6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:50 +0100
Subject: [PATCH 708/953] python3Packages.subprocess-tee: 0.3.5 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix
index adc4cae187bc..4b1c120e31d1 100644
--- a/pkgs/development/python-modules/subprocess-tee/default.nix
+++ b/pkgs/development/python-modules/subprocess-tee/default.nix
@@ -8,11 +8,12 @@
 
 buildPythonPackage rec {
   pname = "subprocess-tee";
-  version = "0.3.5";
+  version = "0.4.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577";
+    sha256 = "sha256-s8EkmT+LiNHrHC/eC8IGl4fqxyC6iHccuhfoyTMkgl0=";
   };
 
   nativeBuildInputs = [

From a4975abeeab0649a552828286f8faf0d4ca57f2d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:50 +0100
Subject: [PATCH 709/953] python3Packages.sunpy: 4.0.5 -> 4.1.0

---
 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 88dca4a51d4a..253be956cdc6 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.5";
+  version = "4.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7I23WtSeZPtHULJ7sNAbOdwAuzjiPE6WW2ukKUCMODs=";
+    hash = "sha256-DAWc5G5YTydxHIuZkY7Nb3euejPn0aQy7D01xChFDeM=";
   };
 
   nativeBuildInputs = [

From ec9de6c4beba001b198504d272a8291bb0f31fbb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:50 +0100
Subject: [PATCH 710/953] python3Packages.tabulate: 0.8.10 -> 0.9.0

---
 .../python-modules/tabulate/default.nix       | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix
index 34e668339878..e1867c9ce76f 100644
--- a/pkgs/development/python-modules/tabulate/default.nix
+++ b/pkgs/development/python-modules/tabulate/default.nix
@@ -1,22 +1,39 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, nose
+, pythonOlder
+, setuptools-scm
+, setuptools
+, wcwidth
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  version = "0.8.10";
+  version = "0.9.0";
   pname = "tabulate";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bFfz8916wngncBVfOtstsLGiaWN+QvJ1mZJeZLEU9Rk=";
+    hash = "sha256-AJWxK/WWbeUpwP6x+ghnFnGzNo7sd9fverEUviwGizw=";
   };
 
-  checkInputs = [ nose ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
-  # Tests: cannot import common (relative import).
-  doCheck = false;
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  passthru.optional-dependencies = {
+    widechars = [ wcwidth ];
+  };
+
+  checkInputs = [
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   meta = {
     description = "Pretty-print tabular data";

From 0ee4e7b85c3eff599028206dc3082d1732320455 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:50 +0100
Subject: [PATCH 711/953] python3Packages.tempest: 32.0.0 -> 33.0.0

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

diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix
index 654c8a9e2ab0..0e24cbc03451 100644
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@@ -28,11 +28,11 @@
 
 buildPythonPackage rec {
   pname = "tempest";
-  version = "32.0.0";
+  version = "33.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MPaGhT2H8Hzk29qylQru9Z6QaRrHM+9I7N5qhe9Wts4=";
+    sha256 = "sha256-aEtBAE3p+HVw/macwZtKo20mSJctrsIN7idqWe6Dvtc=";
   };
 
   propagatedBuildInputs = [

From 30cbebb20567bb888338d77f23aa7122eb2fa88b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:50 +0100
Subject: [PATCH 712/953] python3Packages.tempora: 5.0.2 -> 5.1.0

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

diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 8b50406c7eac..2549fc234df2 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "tempora";
-  version = "5.0.2";
+  version = "5.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MfpbszsmQQJiEfI+gI64vTUZAZiLFn1F8yPI9FDs8hE=";
+    sha256 = "sha256-PnxKU2mheIyIqZtr46THTAx3KNO2L9dop+gb0L4OiN8=";
   };
 
   nativeBuildInputs = [

From 7f3b1755d7069e72eb3ea675d98fded3e6865cda Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:50 +0100
Subject: [PATCH 713/953] python3Packages.tensorboard: 2.10.0 -> 2.11.0

---
 .../python-modules/tensorboard/default.nix    | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix
index f42d1b3220b7..7a10279ce88f 100644
--- a/pkgs/development/python-modules/tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorboard/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , pythonOlder
 , pythonAtLeast
+, pythonRelaxDepsHook
 , numpy
 , wheel
 , werkzeug
@@ -23,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "tensorboard";
-  version = "2.10.0";
+  version = "2.11.0";
   format = "wheel";
   disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
@@ -31,23 +32,17 @@ buildPythonPackage rec {
     inherit pname version format;
     dist = "py3";
     python = "py3";
-    hash = "sha256-dskaXolZzSIIzDLLF6DLACutq7ZqBqwq8Cp4EPSaWeM=";
+    hash = "sha256-oOWS7oeWLhevPw3Of6rj+70jkDAVnp5iXM6BC341xT0=";
   };
 
-  postPatch = ''
-    chmod u+rwx -R ./dist
-    pushd dist
-    wheel unpack --dest unpacked ./*.whl
-    pushd unpacked/tensorboard-${version}
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
 
-    substituteInPlace tensorboard-${version}.dist-info/METADATA \
-      --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<1.0,>=0.4.1)" \
-      --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)"
-
-    popd
-    wheel pack ./unpacked/tensorboard-${version}
-    popd
-  '';
+  pythonRelaxDeps = [
+    "google-auth-oauthlib"
+    "protobuf"
+  ];
 
   propagatedBuildInputs = [
     absl-py

From de82fa8d7d91cc80ffec01a071414c6e9e9ebe51 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:51 +0100
Subject: [PATCH 714/953] python3Packages.tensorboard_plugin_profile: 2.8.0 ->
 2.11.1

---
 .../python-modules/tensorboard-plugin-profile/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix
index 2cb1629ffe67..158437a93d1f 100644
--- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix
+++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "tensorboard_plugin_profile";
-  version = "2.8.0";
+  version = "2.11.1";
   format = "wheel";
 
   src = fetchPypi {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     format = "wheel";
     dist = "py3";
     python = "py3";
-    hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto=";
+    hash = "sha256-t9AZg0BGjDcOxtoRBHZO0joIgLHpoKqEUY4pxmw8sjg=";
   };
 
   nativeBuildInputs = [

From 58e78ec5aff10987a86329da191ef71e5596fb21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:51 +0100
Subject: [PATCH 715/953] python3Packages.tensorflow-datasets: 4.6.0 -> 4.8.0

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

diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index 1afd6c55a3fb..b9639806b12f 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -42,13 +42,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-datasets";
-  version = "4.6.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "datasets";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-z52UZz9d1AaZklLOPbWuzByEl1hJ6ra4Hoz6eNGD+hg=";
+    sha256 = "sha256-YG0Abb5xdTaq+/0I45KU02wuZHyLKD5oMSINJOy7Nrk=";
   };
 
   patches = [

From eb12e0a3f6b9a731e48c039be50231eea626edd9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:51 +0100
Subject: [PATCH 716/953] python3Packages.tensorflow-metadata: 1.9.0 -> 1.12.0

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

diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix
index 994d821d9a25..f5008136f0b5 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/default.nix
+++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-metadata";
-  version = "1.9.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "metadata";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-6BtKHyVrprtEb2Bi7g2YuctUykWSRXmKwADfHzGkYjc=";
+    sha256 = "sha256-pgeQ9qMcz/DsdvF3THMZ4uPToLxtIM0No/kgRlBzU8A=";
   };
 
   patches = [

From 5583abe8e70777a47d710822ea81e94a36ef59b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:51 +0100
Subject: [PATCH 717/953] python3Packages.termcolor: 2.0.1 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix
index b1cfc0dc0461..e6bb7e3bafef 100644
--- a/pkgs/development/python-modules/termcolor/default.nix
+++ b/pkgs/development/python-modules/termcolor/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "termcolor";
-  version = "2.0.1";
+  version = "2.1.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ayz3aekzZKJnbh3lanwM/yz1vQfzfpzICw3WMg6/44g=";
+    sha256 = "sha256-Z87iAJrcZEnGUPa8873u0AyLpTqM2lNiczxT4KOftws=";
   };
 
   nativeBuildInputs = [

From bf2179d3f7dd76aa005a267147de8d84e8b3ebdb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:51 +0100
Subject: [PATCH 718/953] python3Packages.terminado: 0.15.0 -> 0.17.1

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

diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix
index ac5481e13a8e..92586f37243e 100644
--- a/pkgs/development/python-modules/terminado/default.nix
+++ b/pkgs/development/python-modules/terminado/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "terminado";
-  version = "0.15.0";
+  version = "0.17.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-q07u3M/MHmE0v+6GEGr5CFLGnWAohOo6Hoym1Ehum/4=";
+    sha256 = "sha256-bMu806T4olpewEmR85oLjbUt/NSH6g5XjZd+Z1I4AzM=";
   };
 
   nativeBuildInputs = [

From 7804423d769c2137300b8e3cd40e3c80d99cb6d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:51 +0100
Subject: [PATCH 719/953] python3Packages.tern: 2.10.1 -> 2.11.0

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

diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix
index 4769dc64e7ab..2e95c6acc2fc 100644
--- a/pkgs/development/python-modules/tern/default.nix
+++ b/pkgs/development/python-modules/tern/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "tern";
-  version = "2.10.1";
+  version = "2.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MMsq8/Obe3ogQSjiP8EebYseUJGcchMOczUrxE9jht4=";
+    hash = "sha256-MELPpz7UeOKSAW7hC2xDIog/bdLUflU00vvIbAePNBA=";
   };
 
   preBuild = ''

From 92fc29a8bc367acf53f13080fde7fb3fa132c237 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:52 +0100
Subject: [PATCH 720/953] python3Packages.texttable: 1.6.4 -> 1.6.7

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

diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix
index b104bd845962..9b492747bf22 100644
--- a/pkgs/development/python-modules/texttable/default.nix
+++ b/pkgs/development/python-modules/texttable/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "texttable";
-  version = "1.6.4";
+  version = "1.6.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9";
+    sha256 = "sha256-KQNI+2f3dGkxvN/VWsdYTs1OWwhGqxZDM/B5SxIXYPI=";
   };
 
   meta = with lib; {

From 73f51168cbe06c8797ca7f275493e5d545e58d27 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 15:35:25 +0100
Subject: [PATCH 721/953] python3Packages.nanoid: init at 2.0.0

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

diff --git a/pkgs/development/python-modules/nanoid/default.nix b/pkgs/development/python-modules/nanoid/default.nix
new file mode 100644
index 000000000000..495e7337f877
--- /dev/null
+++ b/pkgs/development/python-modules/nanoid/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "nanoid";
+  version = "2.0.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-WoDK1enG6a46Qfovs0rhiffLQgsqXY+CvZ0jRm5O+mg=";
+  };
+
+  doCheck = false; # tests not in sdist, git not tagged
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "nanoid"
+  ];
+
+  meta = with lib; {
+    description = "A tiny, secure, URL-friendly, unique string ID generator for Python";
+    homepage = "https://github.com/puyuan/py-nanoid";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da85f0e3352d..d2efbb0de3bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6088,6 +6088,8 @@ self: super: with self; {
 
   nampa = callPackage ../development/python-modules/nampa { };
 
+  nanoid = callPackage ../development/python-modules/nanoid { };
+
   nanoleaf = callPackage ../development/python-modules/nanoleaf { };
 
   nomadnet = callPackage ../development/python-modules/nomadnet { };

From 51dd1f3ed5a61a770718d5f5a479d61bf9b75752 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 15:42:48 +0100
Subject: [PATCH 722/953] python3Packages.syrupy: init at 3.0.6

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

diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
new file mode 100644
index 000000000000..c3430a2d6f90
--- /dev/null
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest
+, colored
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "syrupy";
+  version = "3.0.6";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tophat";
+    repo = "syrupy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  propagatedBuildInputs = [
+    colored
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}";
+    description = "Pytest Snapshot Test Utility";
+    homepage = "https://github.com/tophat/syrupy";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2efbb0de3bf..d05eba3a8407 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11007,6 +11007,8 @@ self: super: with self; {
 
   sysv_ipc = callPackage ../development/python-modules/sysv_ipc { };
 
+  syrupy = callPackage ../development/python-modules/syrupy { };
+
   tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
 
   tables = callPackage ../development/python-modules/tables { };

From 537fdd3167fdc9a2dcfc8475fe0769b68ff51886 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:52 +0100
Subject: [PATCH 723/953] python3Packages.textual: 0.1.18 -> 0.9.1

---
 .../python-modules/textual/default.nix        | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 5806b28e3490..4afe9220fa15 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -2,15 +2,24 @@
 , buildPythonPackage
 , fetchFromGitHub
 , poetry-core
+, importlib-metadata
+, nanoid
 , rich
 , typing-extensions
+, aiohttp
+, click
+, jinja2
+, msgpack
+, pytest-aiohttp
 , pytestCheckHook
 , pythonOlder
+, syrupy
+, time-machine
 }:
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "0.1.18";
+  version = "0.9.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,29 +27,38 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-a32H5X3VsfYuU1TkOH5uGn1eDLvGUDI6WhXEQ0AKwq8=";
   };
 
   nativeBuildInputs = [
     poetry-core
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'importlib-metadata = "^4.11.3"' 'importlib-metadata = "*"'
+  '';
+
   propagatedBuildInputs = [
+    importlib-metadata
+    nanoid
     rich
-  ] ++ lib.optionals (pythonOlder "3.9") [
+  ] ++ lib.optionals (pythonOlder "3.10") [
     typing-extensions
   ];
 
   checkInputs = [
+    aiohttp
+    click
+    jinja2
+    msgpack
+    pytest-aiohttp
     pytestCheckHook
+    syrupy
+    time-machine
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'rich = "^12.3.0"' 'rich = "*"'
-  '';
-
   pythonImportsCheck = [
     "textual"
   ];

From f1582b3c1d2b5cd1e5ec4de16c164d0118edb202 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:52 +0100
Subject: [PATCH 724/953] python3Packages.thinc: 8.1.1 -> 8.1.6

---
 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 1a43bcbbc4ed..64646c08cc65 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "8.1.1";
+  version = "8.1.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80=";
+    hash = "sha256-kkHDd2HwBP5oTmN9K02Lea3eurxk40OqHLoUT60sm0c=";
   };
 
   buildInputs = [

From efa9d8990df37ec49bb7ed3350c2721868319631 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:52 +0100
Subject: [PATCH 725/953] python3Packages.tifffile: 2022.8.12 -> 2022.10.10

---
 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 8e4bacad9aac..f2b841e22b47 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.8.12";
+  version = "2022.10.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PnTg/UiDhHfrz0Dgm3eAvQle5ZILIjj0heLGhGOj3LQ=";
+    hash = "sha256-ULYbqUO4ZtGRKVvDigAZHJ/asj7OBjVEx/GiZOP2qo4=";
   };
 
   propagatedBuildInputs = [

From 5192e51ab66a198906b5e7fade6b5fe3420c7c95 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:52 +0100
Subject: [PATCH 726/953] python3Packages.tiledb: 0.16.3 -> 0.19.0

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

diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index 99020f8d7ac1..ab5cf84d8697 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "tiledb";
-  version = "0.16.3";
+  version = "0.19.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB-Py";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-Tg2MHlLwwcpXoHoflaNWXmXr6s7dg3IJou4PZBahRzc=";
+    sha256 = "sha256-eha0I/SJmBGFdvJrNUBg/sx54UXdbjhEbyvI40Vngm4=";
   };
 
   nativeBuildInputs = [

From 3eb732b42e63c7f6a697e3984f3f3072f03632cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:52 +0100
Subject: [PATCH 727/953] python3Packages.timetagger: 22.10.1 -> 22.12.1

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

diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index c7775aa435d6..ee264c909323 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "timetagger";
-  version = "22.10.1";
+  version = "22.12.1";
 
   src = fetchFromGitHub {
     owner = "almarklein";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-+7PKYVZfX+zDBKpaFwEVftyp4yPL90X9HSQDvoNNFuA=";
+    sha256 = "sha256-yoDILEE/mUWkGPWp2xTKlkpmw1gZctaQmBsed8U7bHc=";
   };
 
   propagatedBuildInputs = [

From b7655b80d0533cb94bc6a264b612b9ea0981082a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:52 +0100
Subject: [PATCH 728/953] python3Packages.timezonefinder: 6.0.2 -> 6.1.9

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

diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix
index f5dc5f7c346f..c747cac05c02 100644
--- a/pkgs/development/python-modules/timezonefinder/default.nix
+++ b/pkgs/development/python-modules/timezonefinder/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "timezonefinder";
-  version = "6.0.2";
+  version = "6.1.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jannikmi";
     repo = pname;
-    rev = version;
-    hash = "sha256-jquaA/+alSRUaa2wXQ6YoDR4EY9OlZCAdcxS5TR0CAU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-A5s1npvgJGp6SvIqoXGRmFN3iE0pqMUl1ZTi07ix5b0=";
   };
 
   nativeBuildInputs = [

From ef92e33096d9de730d45305c14fb78a55c09100e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 729/953] python3Packages.torchinfo: 1.7.1 -> 1.64

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

diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix
index f751a046aeca..c18f1c68be98 100644
--- a/pkgs/development/python-modules/torchinfo/default.nix
+++ b/pkgs/development/python-modules/torchinfo/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "torchinfo";
-  version = "1.7.1";
+  version = "1.64";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "TylerYep";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-jiQ24gx3N9djvTTB6IthzxcuGWX2/php0Up3IdEDvm8=";
+    hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU=";
   };
 
   propagatedBuildInputs = [

From a3c6b213088d94613857131144464b9fa726aba9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 730/953] python3Packages.torchmetrics: 0.9.3 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix
index eee18b2cb7b3..8dbf0cd3cdf1 100644
--- a/pkgs/development/python-modules/torchmetrics/default.nix
+++ b/pkgs/development/python-modules/torchmetrics/default.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "torchmetrics";
-  version = "0.9.3";
+  version = "0.11.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -24,7 +24,7 @@ buildPythonPackage {
     owner = "PyTorchLightning";
     repo = "metrics";
     rev = "refs/tags/v${version}";
-    hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY=";
+    hash = "sha256-vHWW9TAIocU4g7++UQ0SWtOV/Cdtdq+tOV1x0MLwY7E=";
   };
 
   propagatedBuildInputs = [

From daf41758cf32c5c8f26d92c3e9a6e307635b1ddc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 731/953] python3Packages.tox: 4.0.16 -> 4.1.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 c60691c0674b..b0cf95cd3ae8 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "4.0.16";
+  version = "4.1.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "tox";
     rev = "refs/tags/${version}";
-    hash = "sha256-D53koe8XJLhEmDqfFOs2quDNVsC0jvr3/VzNCH4h8DY=";
+    hash = "sha256-ApJa7v1HJDca2jvZFKqOgKho4fI2tXFrjaFzLcS9Vfk=";
   };
 
   postPatch = ''

From 7e0f659543227170f28b4fb8c488571ffb280dd1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 732/953] python3Packages.trainer: 0.0.16 -> 0.0.20

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

diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix
index 627c21ee4bf0..1e0b177b8928 100644
--- a/pkgs/development/python-modules/trainer/default.nix
+++ b/pkgs/development/python-modules/trainer/default.nix
@@ -17,7 +17,7 @@
 
 let
   pname = "trainer";
-  version = "0.0.16";
+  version = "0.0.20";
 in
 buildPythonPackage {
   inherit pname version;
@@ -27,7 +27,7 @@ buildPythonPackage {
     owner = "coqui-ai";
     repo = "Trainer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-G2qFQEO5OOEI2jsb+zXsO8cbC13o7pqAC2xkFrhGkLc=";
+    hash = "sha256-se2Q2wJyynPc/3TkfEn4nEh+emqBJBwPGDSnOV+sH4I=";
   };
 
   postPatch = ''

From 79dec5e91081cab465561d5e308afd218bb20bca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 733/953] python3Packages.traitlets: 5.4.0 -> 5.8.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 30bff404032e..565730bd34da 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.4.0";
+  version = "5.8.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-PyxOQ14nFZL+Q5DxdG6laDbjoID4Tngz8PgB2WE/7Dk=";
+    sha256 = "sha256-bMV9bcKMhdU2WWFyb/0ZtThzk0d0nhPr404DMjoOj4Q=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 9e4c065d5855ac40648af9accf63fc91bdef2760 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 734/953] python3Packages.treex: 0.6.10 -> 0.6.11

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

diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
index 7f247bbdc07d..17f12cab5b07 100644
--- a/pkgs/development/python-modules/treex/default.nix
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "treex";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "cgarciae";
     repo = pname;
-    rev = version;
-    hash = "sha256-ZHfgmRNbFh8DFZkmilY0pmRNQhJFqT689I7Lu8FuFm4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ=";
   };
 
   # At the time of writing (2022-03-29), rich is currently at version 11.0.0.

From a0c4c05557ae6adc336445ebd7e36c3cb45333d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 735/953] python3Packages.trio: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 7bbfb6f2ca9c..ca262f773461 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.21.0";
+  version = "0.22.0";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Uj85t7ae73NQHOv+Gq/UAKmq1bA1Q6Dt7VKVJIj/HBM=";
+    sha256 = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8=";
   };
 
   propagatedBuildInputs = [

From 5f668e684a487cb4755be07dbfc1b0da579f0c49 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 736/953] python3Packages.trove-classifiers: 2022.12.1 ->
 2022.12.22

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

diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
index 4e87963e9e8d..c8e99f7971ec 100644
--- a/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "trove-classifiers";
-  version = "2022.12.1";
+  version = "2022.12.22";
 
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8eccd9c075038ef2ec73276e2422d0dbf4d632f9133f029632d0df35374caf77";
+    sha256 = "sha256-/g/j8IWYcWGu4qWoU8fMfN9kUVxZZdV62Wj92Mw7A2I=";
   };
 
   nativeBuildInputs = [

From a30b1a4ba084436d69e47ae4c1d76dfc814ec1df Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:53 +0100
Subject: [PATCH 737/953] python3Packages.trytond: 6.4.5 -> 6.6.1

---
 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 ce39ed5d1a05..35d0a9322d4a 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.5";
+  version = "6.6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-AF8LG68K+CvHpFOIoGbxD+lF7IVwBDk8K06I4uTNguI=";
+    sha256 = "sha256-fE1JBlvKIvDFjMat/lgOM22rIpMlqnxoo9p8VJF6szs=";
   };
 
   propagatedBuildInputs = [

From 8867ba18082bf29d2a7854df79937a54a7b507dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:54 +0100
Subject: [PATCH 738/953] python3Packages.ttp: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix
index afa66b288ab2..0301a8673165 100644
--- a/pkgs/development/python-modules/ttp/default.nix
+++ b/pkgs/development/python-modules/ttp/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "ttp";
-  version = "0.9.1";
+  version = "0.9.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "dmulyalin";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-FhuIYXktcNnOVX+KU5cDOd2Qk7AcWaSKvfB/BZYpsZo=";
+    hash = "sha256-KhQRC4zcLCnYUtQm08wJzb/YwBquOEGR5L0YUmnzheg=";
   };
 
   nativeBuildInputs = [

From 68db460e6fc0d771a21581265fe48729fab85429 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:54 +0100
Subject: [PATCH 739/953] python3Packages.turnt: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix
index a04d16a959fd..b6c0549c040a 100644
--- a/pkgs/development/python-modules/turnt/default.nix
+++ b/pkgs/development/python-modules/turnt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "turnt";
-  version = "1.8.0";
+  version = "1.9.0";
   format = "flit";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6cfcb68a3353032c4ce6fff352196e723d05f9cee23eaf4f36d4dcfd89b8e49";
+    sha256 = "sha256-X0uJmY2MVnvM50LDBXDn9hK4NuHAil4Kf39V/8b8OIQ=";
   };
 
   propagatedBuildInputs = [

From 8f899dbe485c35453ba8e6d520fa0fb29a5dad50 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:54 +0100
Subject: [PATCH 740/953] python3Packages.twill: 3.0.2 -> 3.1

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

diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
index f68ec91e1cbb..fdc750fa8962 100644
--- a/pkgs/development/python-modules/twill/default.nix
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "twill";
-  version = "3.0.2";
+  version = "3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk=";
+    hash = "sha256-tWcZRvBvkRyQ7gD5zjocBzFVlzQ0Mhf1unF3gUkhB94=";
   };
 
   propagatedBuildInputs = [

From fcbec3c53318137c723af2e4ced3d031e604727c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:54 +0100
Subject: [PATCH 741/953] python3Packages.twitchapi: 2.5.7.1 -> 3.2.1

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

diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix
index 9427d39c20af..96fdbd249746 100644
--- a/pkgs/development/python-modules/twitchapi/default.nix
+++ b/pkgs/development/python-modules/twitchapi/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "twitchapi";
-  version = "2.5.7.1";
+  version = "3.2.1";
 
   disabled = pythonOlder "3.7";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "twitchAPI";
     inherit version;
-    hash = "sha256-ZhmzrHWbwoHL+9FdkVoc+GGxH1v2j7rB/3ZiaWu9kjQ=";
+    hash = "sha256-E01LkuTnHy2R4Vdr2iLNi7f8KjsIRoDHokyjLAnWieM=";
   };
 
   propagatedBuildInputs = [

From 96994cfea89b1492662b1383448f1c6c314354b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:54 +0100
Subject: [PATCH 742/953] python3Packages.typed-settings: 1.1.1 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index 81ca0bfd0bf3..f866e631a089 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -13,13 +13,14 @@
 
 buildPythonPackage rec {
   pname = "typed-settings";
-  version = "1.1.1";
+  version = "2.0.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-fbo4oj84j7Vkz2V6B/EqoyRl9OutSpm5Ko9Tctu2DYM=";
+    pname = "typed_settings";
+    inherit version;
+    hash = "sha256-o0cPD/7/DS9aUtLDA1YhxKrxUDE7Elv4B7zlKVSsFJQ=";
   };
 
   nativeBuildInputs = [

From bc5b4286b00b52ff3aa32a3cb5b28aa1d9a7f4e2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:54 +0100
Subject: [PATCH 743/953] python3Packages.typer: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 35a946c6079b..0048109bccae 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -17,16 +17,21 @@
 
 buildPythonPackage rec {
   pname = "typer";
-  version = "0.6.1";
+  version = "0.7.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM=";
+    hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "rich >=10.11.0,<13.0.0" "rich"
+  '';
+
   nativeBuildInputs = [
     flit-core
   ];

From e935b52e4beac7084b2ce9c6c469f227c9c241a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:54 +0100
Subject: [PATCH 744/953] python3Packages.types-protobuf: 3.20.4.2 -> 4.21.0.2

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

diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix
index 92415fb04c61..862b8ff805c2 100644
--- a/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/pkgs/development/python-modules/types-protobuf/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "types-protobuf";
-  version = "3.20.4.2";
+  version = "4.21.0.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/WWrhQL5oI4InyytJtUvqwTNVzIs+JbFcKszkcp2C64=";
+    sha256 = "sha256-ffSD00rT/LH6f/8Qc1YNWWyawfQZz6hRsiDJqTOGyZg=";
   };
 
   propagatedBuildInputs = [

From 558997fbf384ac8794e489f379b0db729bcdd733 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 745/953] python3Packages.uamqp: 1.6.0 -> 1.6.3

---
 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 6fb474aefc2b..985a0af28f83 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.6.0";
+  version = "1.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LDG3ShCFbszyWNc8TQjlysTWBgo0uYNIkL/UK8sTg1A=";
+    sha256 = "sha256-fOA+tGANKKHeq0uGbzd9Tq5/yc3Gfj6I94jV8daD3IY=";
   };
 
   patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [

From 9d39427bd540c0472edaaccc05a91e7e4a08430c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 13:33:08 +0100
Subject: [PATCH 746/953] python3Packages.cu2qu: init at 1.6.7.post2

---
 .../python-modules/cu2qu/default.nix          | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/cu2qu/default.nix

diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix
new file mode 100644
index 000000000000..b62b4cb11a77
--- /dev/null
+++ b/pkgs/development/python-modules/cu2qu/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+
+# build
+, cython
+, setuptools-scm
+, setuptools
+
+# propagates
+, defcon
+, fonttools
+
+# tests
+, pytestCheckHook
+}:
+
+let
+  pname = "cu2qu";
+  version = "1.6.7.post2";
+in
+buildPythonPackage rec {
+  inherit pname version;
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-HfVi2ZvWBZImCI9ENwK/Uc/djMY2I/IxN0WaeNe/WAg=";
+    extension = "zip";
+  };
+
+  nativeBuildInputs = [
+    cython
+    setuptools
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    defcon
+    fonttools
+  ] ++ fonttools.optional-dependencies.ufo;
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/googlefonts/cu2qu/releases/tag/v${version}";
+    description = "Cubic-to-quadratic bezier curve conversion";
+    homepage = "https://github.com/googlefonts/cu2qu";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d05eba3a8407..fc30327e2d5f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2094,6 +2094,8 @@ self: super: with self; {
 
   csvw = callPackage ../development/python-modules/csvw { };
 
+  cu2qu = callPackage ../development/python-modules/cu2qu { };
+
   cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
 
   cufflinks = callPackage ../development/python-modules/cufflinks { };

From b0a1aac93a02eabfbf765b2f296c28e67a65771a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 747/953] python3Packages.ufo2ft: 2.28.0 -> 2.30.0

---
 .../python-modules/ufo2ft/default.nix         | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index 5a87bfd42c2b..5e20ffaafe67 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -1,45 +1,50 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+
+# build
 , setuptools-scm
-, fonttools
-, defcon
-, compreffor
+
+# runtime
 , booleanoperations
 , cffsubr
+, compreffor
+, cu2qu
+, defcon
+, fonttools
+, skia-pathops
 , ufoLib2
+
+# tests
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "ufo2ft";
-  version = "2.28.0";
-
+  version = "2.30.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pWHvjAvHNWlmJiQ75JRmFyrjYnzbJG7M8/DGoIWpEBk=";
+    hash = "sha256-ZpO55rNXkVbqMdGxsZn77gJnGBbM8c8GIAaQnTzVnf8=";
   };
 
-  patches = [
-    # Use cu2qu from fonttools.
-    # https://github.com/googlefonts/ufo2ft/pull/461
-    ./fonttools-cu2qu.patch
-  ];
-
   nativeBuildInputs = [
     setuptools-scm
   ];
 
   propagatedBuildInputs = [
+    cu2qu
     fonttools
     defcon
     compreffor
     booleanoperations
     cffsubr
     ufoLib2
-  ];
+    skia-pathops
+  ]
+  ++ fonttools.optional-dependencies.lxml
+  ++ fonttools.optional-dependencies.ufo;
 
   checkInputs = [
     pytestCheckHook

From d27ea37e462ad10a996d74b40eba7cc8d5854e21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 748/953] python3Packages.ufoLib2: 0.13.1 -> 0.14.0

---
 .../python-modules/ufoLib2/default.nix        | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix
index fab42e5169b8..e42b6766f439 100644
--- a/pkgs/development/python-modules/ufoLib2/default.nix
+++ b/pkgs/development/python-modules/ufoLib2/default.nix
@@ -4,35 +4,46 @@
 , attrs
 , fonttools
 , pytestCheckHook
-, fs
 , setuptools-scm
+
+# optionals
+, cattrs
+, lxml
+, orjson
+, msgpack
 }:
 
 buildPythonPackage rec {
   pname = "ufoLib2";
-  version = "0.13.1";
-
+  version = "0.14.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs=";
+    hash = "sha256-OdUJfNe3nOQyCf3nT9/5y/C8vZXnSAWiLHvZ8GXMViw=";
   };
 
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     attrs
     fonttools
-    # required by fonttools[ufo]
-    fs
-  ];
+  ] ++ fonttools.optional-dependencies.ufo;
 
-  nativeBuildInputs = [ setuptools-scm ];
+  passthru.optional-dependencies = {
+    lxml = [ lxml ];
+    converters = [ cattrs ];
+    json = [ cattrs orjson ];
+    msgpack = [ cattrs msgpack ];
+  };
 
   checkInputs = [
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
-pythonImportsCheck = [ "ufoLib2" ];
+  pythonImportsCheck = [ "ufoLib2" ];
 
   meta = with lib; {
     description = "Library to deal with UFO font sources";

From c09b2de6e828f1edcce7dfd88ec02f7fc6517992 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 749/953] python3Packages.u-msgpack-python: 2.7.1 -> 2.7.2

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

diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix
index 1a82fe4b70a8..a472cc1546cb 100644
--- a/pkgs/development/python-modules/u-msgpack-python/default.nix
+++ b/pkgs/development/python-modules/u-msgpack-python/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "u-msgpack-python";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551";
+    sha256 = "sha256-6G96xqoO9MbEnwBLT9Q1vOmcI+LdXXMAPz+YFgJMK9g=";
   };
 
   LC_ALL="en_US.UTF-8";

From 932c1971277db3f88fb1a508de1f3d497efae857 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 750/953] python3Packages.uncompyle6: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix
index 15c7322fb3c3..b22de9043ecb 100644
--- a/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/pkgs/development/python-modules/uncompyle6/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "uncompyle6";
-  version = "3.8.0";
+  version = "3.9.0";
   disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-YgYzYY9t/B8+eBh+Igk014/8Y5wOOdrsofxTWquBcBQ=";
+    sha256 = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0=";
   };
 
   checkInputs = [ nose pytest hypothesis six ];

From d362772c49ba0bfb2e0d2c53209d9b1cfcba45ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 751/953] python3Packages.upb-lib: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix
index 52b422c0e1d3..310480a49ab4 100644
--- a/pkgs/development/python-modules/upb-lib/default.nix
+++ b/pkgs/development/python-modules/upb-lib/default.nix
@@ -8,13 +8,14 @@
 
 buildPythonPackage rec {
   pname = "upb-lib";
-  version = "0.5.1";
+  version = "0.5.2";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0=";
+    pname = "upb_lib";
+    inherit version;
+    hash = "sha256-/TNKsno0JJtxBY9HCPQfp7OhlfkOP6sJI51rgp2ujDg=";
   };
 
   propagatedBuildInputs = [

From 6171fc94a14cc016dab803186980b183f69c7612 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 752/953] python3Packages.vallox-websocket-api: 2.12.0 -> 3.0.0

---
 .../python-modules/vallox-websocket-api/default.nix  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix
index 821dbb19e635..8e760921ba28 100644
--- a/pkgs/development/python-modules/vallox-websocket-api/default.nix
+++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, setuptools
 , construct
 , websockets
 , asynctest
@@ -10,19 +11,22 @@
 
 buildPythonPackage rec {
   pname = "vallox-websocket-api";
-  version = "2.12.0";
+  version = "3.0.0";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
-  format = "setuptools";
-
   src = fetchFromGitHub {
     owner = "yozik04";
     repo = "vallox_websocket_api";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ibp+oAd6q8Vu9V+TaLzlPbWIDheFUjCyW83Hg4Ztw20=";
+    hash = "sha256-iy5ipW7ldvLWhfxgPlWcsFeKrAXqtyypveAX74u8zmo=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     construct
     websockets

From 0e57d7d533b1dd48497bf7d43d8d4db38b15f116 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:55 +0100
Subject: [PATCH 753/953] python3Packages.vector: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix
index 706c6eb85ec8..04190a8eb4ba 100644
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "vector";
-  version = "0.10.0";
+  version = "0.11.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b785678f449de32476f427911248391ddcc7c3582a522a88cbbd50c92dcae490";
+    sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y=";
   };
 
   nativeBuildInputs = [

From f7b0e864b950568ec92c440d2744b3d90fe8c603 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 754/953] python3Packages.viv-utils: 0.7.5 -> 0.7.7

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

diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix
index 6b86123ade75..4df2ecd0ed94 100644
--- a/pkgs/development/python-modules/viv-utils/default.nix
+++ b/pkgs/development/python-modules/viv-utils/default.nix
@@ -12,13 +12,13 @@
 }:
 buildPythonPackage rec {
   pname = "viv-utils";
-  version = "0.7.5";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "williballenthin";
     repo = "viv-utils";
-    rev = "v${version}";
-    sha256 = "sha256-JDu+1n1wP2Vsp2V/bKdE+RFp6bE8RNmimi4wdsatwME=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE=";
   };
 
   postPatch = ''

From 7e3e0b42ac2d5885d267497cc6f5dbabae5f9f9d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 755/953] python3Packages.vowpalwabbit: 9.5.0 -> 9.6.0

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

diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index d87bbff3595e..40303c29f9c9 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "vowpalwabbit";
-  version = "9.5.0";
+  version = "9.6.0";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "sha256-LfEP0T/dYFuLPgz8cBtO6iajfnTt9GXCuor0NibP0qY=";
+    sha256 = "sha256-LHs98lccPjub5GDPB3dxtkOYCDxri04CVpSSsypa4xI=";
   };
 
   nativeBuildInputs = [

From 9170e9911c03545764a99c231325eef29640662e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 756/953] python3Packages.vsure: 1.8.1 -> 2.6.0

---
 .../development/python-modules/vsure/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix
index 4928c2adc40c..1551ab31183e 100644
--- a/pkgs/development/python-modules/vsure/default.nix
+++ b/pkgs/development/python-modules/vsure/default.nix
@@ -1,23 +1,31 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, click
 , requests
 }:
 
 buildPythonPackage rec {
   pname = "vsure";
-  version = "1.8.1";
+  version = "2.6.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Zh83t7yjZU2NjOgCkqPUHbqvEyEWXGITRgr5d2fLtRI=";
+    hash = "sha256-KMLW1270Xs9s2a4ROWTvwRpfr4n4RO9rIYlskNjGzFQ=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [
+    click
+    requests
+  ];
 
   # Project has no tests
   doCheck = false;
-  pythonImportsCheck = [ "verisure" ];
+
+  pythonImportsCheck = [
+    "verisure"
+  ];
 
   meta = with lib; {
     description = "Python library for working with verisure devices";

From bbc981ec236e05adc194eec578a6ed3b75821427 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 757/953] python3Packages.vulture: 2.5 -> 2.6

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

diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix
index 0062bbd9e415..bb5d1fd31b45 100644
--- a/pkgs/development/python-modules/vulture/default.nix
+++ b/pkgs/development/python-modules/vulture/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "vulture";
-  version = "2.5";
+  version = "2.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KDFpQFXrLjagnDt2gJNINxArm2wJaSBuOQLVE2Ehd8M=";
+    hash = "sha256-JRX6hIGBAB3Ipzq6agGhoXQG9dNy8k7H9xkYZvn0mX4=";
   };
 
   postPatch = ''

From 4d1ff9f6f1f9f1b54ded267ba30064359bdd0cda Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 758/953] python3Packages.wandb: 0.13.5 -> 0.13.7

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

diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index b649bd16880a..8925ea7f3476 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -39,7 +39,7 @@
 
 buildPythonPackage rec {
   pname = "wandb";
-  version = "0.13.5";
+  version = "0.13.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-1GoFmncG5bUWJOIUDLatopQMxCFsmlcj8aofJMGUTzQ=";
+    hash = "sha256-o9mIGSILztnHY3Eyb0MlznUEdMbCfA1BT6ux0UlesBc=";
   };
 
   patches = [

From 0896e7a96db2ad67e8c63607c123eddead6bdd6b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 759/953] python3Packages.wasabi: 0.10.1 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index 2f751e8105e4..6fc0f16bec4e 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -1,23 +1,31 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pytestCheckHook
 , pythonOlder
+
+# tests
+, ipykernel
+, nbconvert
+, pytestCheckHook
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "wasabi";
-  version = "0.10.1";
+  version = "1.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-yONyeBvhknKUI4KxTZkxTRdVGNeCIFfLepcBDEJZ0kk=";
+    sha256 = "sha256-RaYTplXhFKsnL1rxRMNR+VT92S2ym3z6buIQuCwZeeU=";
   };
 
   checkInputs = [
+    ipykernel
+    nbconvert
+    typing-extensions
     pytestCheckHook
   ];
 

From c335326b2faae55ae20c97fd84e84e1aaae90f23 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 760/953] python3Packages.weasyprint: 57.0 -> 57.2

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

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 71ae956d6df8..96b7ec489800 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "weasyprint";
-  version = "57.0";
+  version = "57.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "weasyprint";
-    hash = "sha256-e29cwTgZ6afYdIwdvw6NJET3pIGKmDOfgtzKqCK/kRs=";
+    hash = "sha256-uOnvLcvPvILpkhWs/Wj5R7K18ZmbWxVtt1+r44C6fpo=";
   };
 
   patches = [

From af3649d1e40d577ffeba75c7acce632a8fe0ddac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 761/953] python3Packages.whatthepatch: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix
index 9244e26520cd..5c6d0114d034 100644
--- a/pkgs/development/python-modules/whatthepatch/default.nix
+++ b/pkgs/development/python-modules/whatthepatch/default.nix
@@ -2,19 +2,25 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "whatthepatch";
-  version = "1.0.2";
+  version = "1.0.3";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "cscorley";
     repo = pname;
-    rev = version;
-    hash = "sha256-0l/Ebq7Js9sKFJ/RzkQ1aWEDCxt+COVd2qVnLSWwFx0=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-P4SYSMdDjwXOmre3hXKS4gQ0OS9pz0SWqBeD/WQMQFw=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];

From f129485c7150e72ed58b33baebe4729a96011bf3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:56 +0100
Subject: [PATCH 762/953] python3Packages.widgetsnbextension: 4.0.3 -> 4.0.5

---
 .../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 7b077d14c58e..65d5eebfeaa4 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "widgetsnbextension";
-  version = "4.0.3";
+  version = "4.0.5";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY=";
+    hash = "sha256-AD9xbZMNOFvj/Z3kLdm/AI4wBT9zvd3iNdFPvq7/Ga8=";
   };
 
   nativeBuildInputs = [

From 7021745d29b2e7a52a1dd4783c709f82bdb60e34 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 763/953] python3Packages.wordfreq: 2.5.1 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index 72a2f013928d..ce8c81b2ab94 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "wordfreq";
-  version = "2.5.1";
+  version = "3.0.2";
   disabled = isPy27;
 
    src = fetchFromGitHub {
     owner = "LuminosoInsight";
     repo = "wordfreq";
-    rev = "v${version}";
-    sha256 = "1lw7kbsydd89hybassnnhqnj9s5ch9wvgd6pla96198nrq9mj7fw";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE=";
    };
 
   propagatedBuildInputs = [

From b5f0b70c351a5afad3c324560d6772237b0c04fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 764/953] python3Packages.xarray: 2022.6.0 -> 2022.12.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 2d10f0ddb572..a24743ed2884 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.6.0";
+  version = "2022.12.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ECjRmEk/ZrsVvTXc/dEd79gxy+469lif/xb0G93WfoQ=";
+    sha256 = "sha256-CD0I5VKnZHx+zhNt+jpLahN5JWvrVbvti43fBfHhTsc=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION="${version}";

From d661aed24b3e801fd36f03d6d0343f89eec8f138 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 765/953] python3Packages.xarray-einstats: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix
index 244541f7d852..df8855cc7a2f 100644
--- a/pkgs/development/python-modules/xarray-einstats/default.nix
+++ b/pkgs/development/python-modules/xarray-einstats/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xarray-einstats";
-  version = "0.3.0";
+  version = "0.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "arviz-devs";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-N8ievasPaqusx51FCxcl1FGIjXooyBsRqsuRU73puRM=";
+    hash = "sha256-6Wf5pc8e36lMv1V115N6sQbmE4l3QT6kbO7izUws0zc=";
   };
 
   nativeBuildInputs = [

From 431617b025f7551be50e1f673b11a364cea59e04 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 766/953] python3Packages.xcffib: 0.11.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix
index cb9e1ddf921c..3f3a35edf1dc 100644
--- a/pkgs/development/python-modules/xcffib/default.nix
+++ b/pkgs/development/python-modules/xcffib/default.nix
@@ -3,17 +3,17 @@
 , fetchPypi
 , xorg
 , cffi
-, nose
 , six
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  version = "0.11.1";
+  version = "1.1.2";
   pname = "xcffib";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12949cfe2e68c806efd57596bb9bf3c151f399d4b53e15d1101b2e9baaa66f5a";
+    sha256 = "sha256-Wqc6wlUUUpfMeJmhEFmEf41TDz2zhLPeOqwT+GDgS6w=";
   };
 
   patchPhase = ''
@@ -25,7 +25,11 @@ buildPythonPackage rec {
 
   propagatedNativeBuildInputs = [ cffi ];
 
-  checkInputs = [ nose ];
+  checkInputs = [
+    pytestCheckHook
+    xorg.xeyes
+    xorg.xorgserver
+  ];
 
   pythonImportsCheck = [ "xcffib" ];
 

From 0a0a2908f0ad2a868bf08fb18a9402841366a17b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 767/953] python3Packages.xknx: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 2f3a3768331f..9d97d0268edc 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "xknx";
-  version = "2.1.0";
+  version = "2.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "XKNX";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-a8hC63G+FZBe6yePgrmzRsRTzpHWS+tBQmVUS/uHfzI=";
+    hash = "sha256-vz24saI0wuhax4/zCBDM3HB+ZjZI8bGOWr2va4V3zV8=";
   };
 
   propagatedBuildInputs = [

From 671ba422dd4652850a4ff2d53c8ca6c3ab3bce5e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 768/953] python3Packages.xlib: 0.31 -> 0.33

---
 .../python-modules/xlib/default.nix           | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix
index 05d5e095a163..29bab5e9b289 100644
--- a/pkgs/development/python-modules/xlib/default.nix
+++ b/pkgs/development/python-modules/xlib/default.nix
@@ -13,24 +13,29 @@
 
 buildPythonPackage rec {
   pname = "xlib";
-  version = "0.31";
+  version = "0.33";
 
   src = fetchFromGitHub {
     owner = "python-xlib";
     repo = "python-xlib";
-    rev = version;
-    sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06";
+    rev = "refs/tags/${version}";
+    hash = "sha256-u06OWlMIOUzHOVS4hvm72jGgTSXWUqMvEQd8bTpFog0=";
   };
 
-  patches = [
-    ./fix-no-protocol-specified.patch
+  nativeBuildInputs = [
+    setuptools-scm
   ];
 
-  nativeBuildInputs = [ setuptools-scm ];
-  buildInputs = [ xorg.libX11 ];
-  propagatedBuildInputs = [ six ];
+  buildInputs = [
+    xorg.libX11
+  ];
+
+  propagatedBuildInputs = [
+    six
+  ];
 
   doCheck = !stdenv.isDarwin;
+
   checkInputs = [
     pytestCheckHook
     mock
@@ -46,9 +51,11 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/python-xlib/python-xlib/releases/tag/${version}";
     description = "Fully functional X client library for Python programs";
-    homepage = "http://python-xlib.sourceforge.net/";
-    license = licenses.gpl2Plus;
+    homepage = "https://github.com/python-xlib/python-xlib";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ ];
   };
 
 }

From 70008b33766e9ecd09756b71ade843fc9baa177a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 769/953] python3Packages.xml2rfc: 3.15.1 -> 3.15.3

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

diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 28c9a856b3f8..5a9b839c3b57 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "3.15.1";
+  version = "3.15.3";
 
   disabled = pythonOlder "3.6";
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "ietf-tools";
     repo = "xml2rfc";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-/0Y49ZSaPM3IAFJGmWKiKD+mziA0LYQ3fvGFrkPkl9Y=";
+    sha256 = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc=";
   };
 
   postPatch = ''

From f0f59b94fea075e62f29816cdbeb415535799b14 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:57 +0100
Subject: [PATCH 770/953] python3Packages.xmlschema: 1.11.3 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 3dcfe8d7d026..b22f626d1a73 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "xmlschema";
-  version = "1.11.3";
+  version = "2.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "refs/tags/v${version}";
-    hash = "sha256-z6VgLRDp5PHaYstdV30gt6xGVd4uifz4LkYQ2z3ayk4=";
+    hash = "sha256-rt7QScg458ezDwktO1QRydmC3XqedX+kPpv6J+JvLzQ=";
   };
 
   propagatedBuildInputs = [

From 7be5ba8e83755c0c2bfcdebd6e3dd2457bb8dd0f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 771/953] python3Packages.xxhash: 3.1.0 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix
index 658784387354..00cc42ee56c2 100644
--- a/pkgs/development/python-modules/xxhash/default.nix
+++ b/pkgs/development/python-modules/xxhash/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.1.0";
+  version = "3.2.0";
   pname = "xxhash";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rCGx4h3G/f7ppXtT9Hd1OdU6hPLhVGo/gC8Vn5lmvcE=";
+    sha256 = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig=";
   };
 
   nativeBuildInputs = [

From a225fbc6911312aa5ed1b9f4804d1ade5731fcdd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 772/953] python3Packages.yangson: 1.4.14 -> 1.4.15

---
 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 42caebb92e8b..2978799699e6 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.14";
+  version = "1.4.15";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-OMqtZ/kPj7ge235nuyrfCzawG6AOAqfJPzQHF8cW4Ok=";
+    sha256 = "sha256-yw/LwWjHW4vgHp06E/DgqauTvdfLxerHw1avge91XLU=";
   };
 
   nativeBuildInputs = [

From 57123cd83b8a0ac74f013ddd0f310ed1023cea06 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 773/953] python3Packages.yfinance: 0.1.93 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index 7a76ebeb8f28..86d93a604990 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "yfinance";
-  version = "0.1.93";
+  version = "0.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "ranaroussi";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-AyuIngXReI4PX554SuGIgoQoklFieZiEZzeVBcvPvEk=";
+    hash = "sha256-1xO+zz+syuiWeZAxnRIV0va8WOIW2P9elRBtHDk7w1M=";
   };
 
   propagatedBuildInputs = [

From 79a6bfe31000d4908c398b21a697cd3a5ae40974 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 774/953] python3Packages.yoyo-migrations: 7.3.2 -> 8.2.0

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

diff --git a/pkgs/development/python-modules/yoyo-migrations/default.nix b/pkgs/development/python-modules/yoyo-migrations/default.nix
index 14c90dbd5f28..14aec06320d7 100644
--- a/pkgs/development/python-modules/yoyo-migrations/default.nix
+++ b/pkgs/development/python-modules/yoyo-migrations/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, importlib-metadata
 , setuptools
 , sqlparse
 , tabulate
@@ -8,14 +9,19 @@
 
 buildPythonPackage rec {
   pname = "yoyo-migrations";
-  version = "7.3.2";
+  version = "8.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RIQIKOGgFp9UHnAtWu3KgYWtpoCH57rUhQpvxdced6Q=";
+    sha256 = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q=";
   };
 
-  propagatedBuildInputs = [ setuptools sqlparse tabulate ];
+  propagatedBuildInputs = [
+    importlib-metadata
+    setuptools
+    sqlparse
+    tabulate
+  ];
 
   doCheck = false; # pypi tarball does not contain tests
 

From 43fce8b435ef6ee4732e0a16a62a952c1c13d5bc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 775/953] python3Packages.zarr: 2.12.0 -> 2.13.3

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

diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index 72cd251dcb31..dbe559724789 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "zarr";
-  version = "2.12.0";
+  version = "2.13.3";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-UVox7kuta7SK4FF4xYiuSaAqNd76Ad2aMpMwaQM2gWU=";
+    sha256 = "sha256-2ySwkGFsY49l4zprxdlW1kIiEYKWFRXMvCixf7DQtIw=";
   };
 
   nativeBuildInputs = [

From 0373076e2f8475418ea428004a82843c3c4a98e2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 776/953] python3Packages.zdaemon: 4.3 -> 4.4

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

diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix
index 23eae31057fc..738fbb075603 100644
--- a/pkgs/development/python-modules/zbaemon/default.nix
+++ b/pkgs/development/python-modules/zbaemon/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zdaemon";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72";
+    sha256 = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw=";
   };
 
   propagatedBuildInputs = [ zconfig ];

From 270672d8441c106493166d8bc06caa0517cc4d14 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 777/953] python3Packages.ZConfig: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 521bca4ece8c..22e4530674f3 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "ZConfig";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU=";
+    sha256 = "sha256-RCLH1mOvdizXeVd1NmvGpnq0QKGreW6w90JbDpA08HY=";
   };
 
   patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;

From 4c7d998638275cadbe96ebce1fc205b338e88231 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 778/953] python3Packages.zeep: 4.1.0 -> 4.2.1

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

diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 83ee3f37f7e4..033975ed5dbc 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -28,25 +28,17 @@
 
 buildPythonPackage rec {
   pname = "zeep";
-  version = "4.1.0";
+  version = "4.2.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "mvantellingen";
     repo = "python-zeep";
-    rev = version;
-    sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY=";
   };
 
-  patches = [
-    (fetchpatch {
-      # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293
-      url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch";
-      hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4=";
-    })
-  ];
-
   propagatedBuildInputs = [
     attrs
     cached-property

From a6b94a416a31491c7a1d758bc6c51251946e198a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:58 +0100
Subject: [PATCH 779/953] python3Packages.zeroconf: 0.39.4 -> 0.47.1

---
 .../python-modules/zeroconf/default.nix        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 6bc6b7888d8c..a65e485004a8 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -4,15 +4,17 @@
 , buildPythonPackage
 , fetchFromGitHub
 , ifaddr
+, poetry-core
 , pytest-asyncio
 , pythonOlder
 , pytestCheckHook
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.39.4";
-  format = "setuptools";
+  version = "0.47.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -20,9 +22,14 @@ buildPythonPackage rec {
     owner = "jstasiak";
     repo = "python-zeroconf";
     rev = "refs/tags/${version}";
-    hash = "sha256-CUHpTtCQBuuy8E8bjxfhGOIKr9n2Gdhg/RIyv6OWGvI=";
+    hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA=";
   };
 
+  nativeBuildInputs = [
+    poetry-core
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     async-timeout
     ifaddr
@@ -36,6 +43,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  preCheck = ''
+    sed -i '/addopts/d' pyproject.toml
+  '';
+
   disabledTests = [
     # tests that require network interaction
     "test_close_multiple_times"
@@ -58,6 +69,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}";
     description = "Python implementation of multicast DNS service discovery";
     homepage = "https://github.com/jstasiak/python-zeroconf";
     license = licenses.lgpl21Only;

From b4e0b24819fb543c1843db0279e2d65860937d8f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 780/953] python3Packages.zipp: 3.10.0 -> 3.11.0

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

diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix
index cdabed860c92..5a80489e8091 100644
--- a/pkgs/development/python-modules/zipp/default.nix
+++ b/pkgs/development/python-modules/zipp/default.nix
@@ -9,14 +9,14 @@
 
 let zipp = buildPythonPackage rec {
   pname = "zipp";
-  version = "3.10.0";
+  version = "3.11.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-enJi/ZML0+NsULmmSJeuw/r/89/e7JYjriK0DpP5m7g=";
+    sha256 = "sha256-p6IuBZKSkKZ0AUQLOWkK5lYyebztXzFGCdnQN5j1Z2Y=";
   };
 
   nativeBuildInputs = [

From b7af636eb45e0d00622eb998010a2c304f266d88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 781/953] python3Packages.zope.copy: 4.2 -> 4.3

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

diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix
index be4cdca72b65..ce9595ad537d 100644
--- a/pkgs/development/python-modules/zope_copy/default.nix
+++ b/pkgs/development/python-modules/zope_copy/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "zope.copy";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "47bb9d09ff06c600b446f220f47a742396598ac4828d738d3d85e6490629a71a";
+    sha256 = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc=";
   };
 
   propagatedBuildInputs = [ zope_interface ];

From 2dbaf9479de651ea79a70504c3cdd9e024dbb235 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 782/953] python3Packages.zope.event: 4.5.0 -> 4.6

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

diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix
index 118a3a2c44a3..fddf45ef0631 100644
--- a/pkgs/development/python-modules/zope_event/default.nix
+++ b/pkgs/development/python-modules/zope_event/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "zope.event";
-  version = "4.5.0";
+  version = "4.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330";
+    sha256 = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA=";
   };
 
   meta = with lib; {

From faff52cbc1f4beb3afc82863225b03b01dbccfd1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 783/953] python3Packages.zope.exceptions: 4.5 -> 4.6

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

diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix
index fb1eb07154a0..16da25903ea1 100644
--- a/pkgs/development/python-modules/zope_exceptions/default.nix
+++ b/pkgs/development/python-modules/zope_exceptions/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.exceptions";
-  version = "4.5";
+  version = "4.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4=";
+    sha256 = "sha256-YZ0kpMZb7Zez3QUV5zLoK2nxVdQsyUlV0b6MKCiGg80=";
   };
 
   propagatedBuildInputs = [ zope_interface ];

From c42766c56d5d8d3c26c7551b24fbd7c4befcc5b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 784/953] python3Packages.zope-hookable: 5.2 -> 5.4

---
 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 f1bc3bf72f74..20d810064b6d 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.2";
+  version = "5.4";
 
   src = fetchPypi {
     pname = "zope.hookable";
     inherit version;
-    sha256 = "sha256-TDAYvPKznPXMz0CCb3mbS4wUAFbbeA+WywyjMqJDvSk=";
+    sha256 = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw=";
   };
 
   checkInputs = [ zope_testing ];

From 4d7043ea4ec0cbb2e79db1e560882fd4a161865e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 785/953] python3Packages.zope.i18nmessageid: 5.0.1 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix
index 1155adc83e9e..3e89f05f60ff 100644
--- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix
+++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "zope.i18nmessageid";
-  version = "5.0.1";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9534142b684c986f5303f469573978e5a340f05ba2eee4f872933f1c38b1b059";
+    sha256 = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI=";
   };
 
   propagatedBuildInputs = [ six ];

From 1e07e713aa743838e4e44d73a7260d08f5ab2eae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 786/953] python3Packages.zope.interface: 5.4.0 -> 5.5.2

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

diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index c1f61a4cbee5..eea485ab2a58 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.interface";
-  version = "5.4.0";
+  version = "5.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e";
+    sha256 = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE=";
   };
 
   propagatedBuildInputs = [ zope_event ];

From d0fb184d06d84776f59e764c6e6fdabbee82754d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 787/953] python3Packages.zope.location: 4.2 -> 4.3

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

diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix
index 69fee2e338ff..f4fe420951dd 100644
--- a/pkgs/development/python-modules/zope_location/default.nix
+++ b/pkgs/development/python-modules/zope_location/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.location";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac";
+    sha256 = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU=";
   };
 
   propagatedBuildInputs = [ zope_proxy ];

From c7e7e791d172f0b1b4540c19afc114ebcfd329c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:13:59 +0100
Subject: [PATCH 788/953] python3Packages.zope.proxy: 4.5.0 -> 4.6.1

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

diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix
index 70e329cce9e9..24210e8c73cc 100644
--- a/pkgs/development/python-modules/zope_proxy/default.nix
+++ b/pkgs/development/python-modules/zope_proxy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.proxy";
-  version = "4.5.0";
+  version = "4.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1329846261cf6c552b05579f3cfad199b2d178510d0b4703eb5f7cdd6ebad01a";
+    sha256 = "sha256-+xUTt6jtc3oxI/1XHCRPB+7iRdYIGlY3CyBhHUAPCXQ=";
   };
 
   propagatedBuildInputs = [ zope_interface ];

From bbac79ab18a806f8ca2df5f7d9af5dd6a3a93ad7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:14:00 +0100
Subject: [PATCH 789/953] python3Packages.zope.schema: 6.2.0 -> 6.2.1

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

diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix
index 9472000f15d1..4dd97d94e43b 100644
--- a/pkgs/development/python-modules/zope_schema/default.nix
+++ b/pkgs/development/python-modules/zope_schema/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "zope.schema";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2201aef8ad75ee5a881284d7a6acd384661d6dca7bde5e80a22839a77124595b";
+    sha256 = "sha256-47M8i8i6nYWlZxOrjwo8JhXVSoCF8eQVzgyN+15UC+Y=";
   };
 
   propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ];

From 2f18aa4de898b894f6fbad9223a4d97b86f0b7b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:14:00 +0100
Subject: [PATCH 790/953] python3Packages.zope.testing: 4.10 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix
index f8ea4e83b15c..773209adcdf4 100644
--- a/pkgs/development/python-modules/zope_testing/default.nix
+++ b/pkgs/development/python-modules/zope_testing/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "zope.testing";
-  version = "4.10";
+  version = "5.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-O25ZBsrd0UjCP+lY5qrj+tyKCKilP3R9l5HC2BNe5W4=";
+    sha256 = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk=";
   };
 
   doCheck = !isPyPy;

From 25198fdf61e2db06b512b8e7f6854f5049aa6c01 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:14:00 +0100
Subject: [PATCH 791/953] python3Packages.zope.testrunner: 5.5.1 -> 5.6

---
 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 1b838354c4cf..a1f85a9d0f36 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.1";
+  version = "5.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ahDTg1RZ7tO8hDHyGq9gS8dU/4OSopeXzSDlqUHBQ74=";
+    sha256 = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q=";
   };
 
   propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];

From d693b569b87616a15e02fe49204abd20b2435905 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 20:17:33 +0100
Subject: [PATCH 792/953] python3Packages.wasserstein: normalize pname

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

diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix
index 79994a616951..391712828ecd 100644
--- a/pkgs/development/python-modules/wasserstein/default.nix
+++ b/pkgs/development/python-modules/wasserstein/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "Wasserstein";
+  pname = "wasserstein";
   version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "pkomiske";
-    repo = pname;
+    repo = "Wasserstein";
     rev = "89c2d6279a7e0aa3b56bcc8fb7b6009420f2563e"; # https://github.com/pkomiske/Wasserstein/issues/1
     hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE=";
   };

From c2c5defbbf59d1adc38115e9c2dab8cdafb8300a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 22:41:01 +0100
Subject: [PATCH 793/953] python3Packages.pytest-shutil: Disable failing test

and reformat and use a more recent formatting.
---
 .../python-modules/pytest-shutil/default.nix  | 57 +++++++++++++++----
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index e3b2277fa99b..64b0ff0c1d0d 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -1,14 +1,33 @@
-{ lib, isPyPy, buildPythonPackage, fetchPypi
-, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, path, execnet
-, contextlib2, termcolor, six }:
+{ lib
+, isPyPy
+, buildPythonPackage
+, fetchPypi
+
+# build
+, pytest
+
+# runtime
+, setuptools-git
+, mock
+, path
+, execnet
+, contextlib2
+, termcolor
+, six
+
+# tests
+, cmdline
+, pytestCheckHook
+ }:
 
 buildPythonPackage rec {
   pname = "pytest-shutil";
   version = "1.7.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq";
+    hash = "sha256-2BZSYd5251CFBcNB2UwCsRPclj8nRUOrynTb+r0CEmE=";
   };
 
   postPatch = ''
@@ -16,13 +35,31 @@ buildPythonPackage rec {
       --replace "path.py" "path"
   '';
 
-  buildInputs = [ pytest ];
-  checkInputs = [ cmdline pytest ];
-  propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor six ];
+  buildInputs = [
+    pytest
+  ];
 
-  checkPhase = ''
-    py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"}
-  '';
+  propagatedBuildInputs = [
+    setuptools-git
+    mock
+    path
+    execnet
+    contextlib2
+    termcolor
+    six
+  ];
+
+  checkInputs = [
+    cmdline
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    "test_pretty_formatter"
+  ] ++ lib.optionals isPyPy [
+    "test_run"
+    "test_run_integration"
+  ];
 
   meta = with lib; {
     description = "A goodie-bag of unix shell and environment tools for py.test";

From 86af3e680b9145a84ed5c9a02a0821f3909eef48 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Dec 2022 23:04:45 +0100
Subject: [PATCH 794/953] python3Packages.requests: relax charset-normalizer
 constraint

---
 .../python-modules/requests/default.nix       |  6 ++
 .../requests/relax-charset-normalizer.patch   | 55 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/python-modules/requests/relax-charset-normalizer.patch

diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index d7230c532eb2..26641f51a8ed 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -6,6 +6,7 @@
 , chardet
 , charset-normalizer
 , fetchPypi
+, fetchpatch
 , idna
 , pysocks
 , pytest-mock
@@ -18,6 +19,7 @@
 buildPythonPackage rec {
   pname = "requests";
   version = "2.28.1";
+  format = "setuptools";
   disabled = pythonOlder "3.7";
 
   __darwinAllowLocalNetworking = true;
@@ -27,6 +29,10 @@ buildPythonPackage rec {
     hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM=";
   };
 
+  patches = [
+    ./relax-charset-normalizer.patch
+  ];
+
   propagatedBuildInputs = [
     brotlicffi
     certifi
diff --git a/pkgs/development/python-modules/requests/relax-charset-normalizer.patch b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch
new file mode 100644
index 000000000000..ef14c09fffb8
--- /dev/null
+++ b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch
@@ -0,0 +1,55 @@
+From 54ae822ce968f49a4d5a10e30c5d75e76c887fe4 Mon Sep 17 00:00:00 2001
+From: deedy5 <65482418+deedy5@users.noreply.github.com>
+Date: Thu, 20 Oct 2022 18:26:18 +0000
+Subject: [PATCH] Allow charset normalizer >=2 and <4 (#6261)
+
+---
+ requests/__init__.py | 4 ++--
+ setup.cfg            | 2 +-
+ setup.py             | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/requests/__init__.py b/requests/__init__.py
+index 7ac8e29..22db3c1 100644
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
+     elif charset_normalizer_version:
+         major, minor, patch = charset_normalizer_version.split(".")[:3]
+         major, minor, patch = int(major), int(minor), int(patch)
+-        # charset_normalizer >= 2.0.0 < 3.0.0
+-        assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0)
++        # charset_normalizer >= 2.0.0 < 4.0.0
++        assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
+     else:
+         raise Exception("You need either charset_normalizer or chardet installed")
+ 
+diff --git a/setup.cfg b/setup.cfg
+index 93d1f99..ea45aaf 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -5,7 +5,7 @@ provides-extra =
+ 	use_chardet_on_py3
+ requires-dist = 
+ 	certifi>=2017.4.17
+-	charset_normalizer>=2,<3
++	charset_normalizer>=2,<4
+ 	idna>=2.5,<4
+ 	urllib3>=1.21.1,<1.27
+ 
+diff --git a/setup.py b/setup.py
+index 23977ed..092b40d 100755
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish":
+     sys.exit()
+ 
+ requires = [
+-    "charset_normalizer>=2,<3",
++    "charset_normalizer>=2,<4",
+     "idna>=2.5,<4",
+     "urllib3>=1.21.1,<1.27",
+     "certifi>=2017.4.17",
+-- 
+2.38.1
+

From 5e7a3f86397768951889fb5a29b5897424b060f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 02:42:08 +0100
Subject: [PATCH 795/953] python3Packages.sphinx-rtd-theme: relax sphinx
 constraint

---
 pkgs/development/python-modules/sphinx-rtd-theme/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
index 3259b47963fd..2820080e118c 100644
--- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
@@ -18,8 +18,9 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "docutils<0.18" "docutils"
+    substituteInPlace setup.cfg \
+      --replace "docutils <0.18" "docutils" \
+      --replace "sphinx >=1.6,<6" "sphinx"
   '';
 
   preBuild = ''

From 5d16d1bde192b4521842e5cb8a5200f6eb234fec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 02:51:24 +0100
Subject: [PATCH 796/953] python3Packages.graphql-core: Pass py as checkInput

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

diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
index 22372843bdb0..e4a2d5e937cb 100644
--- a/pkgs/development/python-modules/graphql-core/default.nix
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, py
 , pytest-benchmark
 , pytest-asyncio
 , pytestCheckHook
@@ -22,6 +23,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
+    py
     pytest-asyncio
     pytest-benchmark
     pytestCheckHook

From c89f79b5825ea2edbb015b2dfc9b188d7927fa8e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 02:59:44 +0100
Subject: [PATCH 797/953] python3Packages.pyhamcrest: Disable failing tests

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

diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index 8abf3b8ea44b..86467a66aa40 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -23,6 +23,11 @@ buildPythonPackage rec {
     hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
   nativeBuildInputs = [
     hatch-vcs
     hatchling
@@ -34,10 +39,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
-  '';
+  disabledTests = [
+    # Tests started failing with numpy 1.24
+    "test_numpy_numeric_type_complex"
+    "test_numpy_numeric_type_float"
+    "test_numpy_numeric_type_int"
+  ];
 
   pythonImportsCheck = [
     "hamcrest"

From 96649b692749e1fe14459e7809e8c50d9efa0dcb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 03:04:33 +0100
Subject: [PATCH 798/953] python3Packages.base58: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix
index 6fe7a111b5d4..416eba18dec3 100644
--- a/pkgs/development/python-modules/base58/default.nix
+++ b/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

From 98584cba4492fbb25b6a104e6329967f6c54016d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 03:31:08 +0100
Subject: [PATCH 799/953] python3Packages.pytest-describe: Pass py into
 checkInputs

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

diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix
index 7f5fbf361597..52e7764ce43b 100644
--- a/pkgs/development/python-modules/pytest-describe/default.nix
+++ b/pkgs/development/python-modules/pytest-describe/default.nix
@@ -6,6 +6,7 @@
 , pytest
 
 # tests
+, py
 , pytestCheckHook
 }:
 
@@ -27,6 +28,7 @@ buildPythonPackage {
   ];
 
   checkInputs = [
+    py
     pytestCheckHook
   ];
 

From adca32766a946870e1566cb1204ae9dfaf3fb5eb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 04:13:19 +0100
Subject: [PATCH 800/953] python3Packages.Flask-Limiter: 2.6.2 -> 3.1.0

https://github.com/alisaifee/flask-limiter/releases/tag/2.6.3
https://github.com/alisaifee/flask-limiter/releases/tag/2.7.0
https://github.com/alisaifee/flask-limiter/releases/tag/2.8.0
https://github.com/alisaifee/flask-limiter/releases/tag/2.8.1
https://github.com/alisaifee/flask-limiter/releases/tag/2.9.0
https://github.com/alisaifee/flask-limiter/releases/tag/2.9.1
https://github.com/alisaifee/flask-limiter/releases/tag/2.9.2
https://github.com/alisaifee/flask-limiter/releases/tag/3.0.0
https://github.com/alisaifee/flask-limiter/releases/tag/3.1.0
---
 .../python-modules/flask-limiter/default.nix  | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
index 275b4507fb3b..f2288c883b23 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -4,6 +4,7 @@
 
 , flask
 , limits
+, ordered-set
 , rich
 , typing-extensions
 
@@ -18,18 +19,30 @@
 
 buildPythonPackage rec {
   pname = "Flask-Limiter";
-  version = "2.6.2";
+  version = "3.1.0";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = "flask-limiter";
-    rev = version;
-    sha256 = "sha256-JjksKwSMWzcslXCs977/Wlq1wDMaACxm8e6Ub+r3wPg=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-eAJRqyAH1j1NHYfagRZM2fPE6hm9+tJHD8FMqvgvMBI=";
   };
 
+  postPatch = ''
+    substituteInPlace requirements/main.txt \
+      --replace "rich>=12,<13" "rich"
+
+    sed -i "/--cov/d" pytest.ini
+
+    # flask-restful is unmaintained and breaks regularly, don't depend on it
+    sed -i "/import flask_restful/d" tests/test_views.py
+  '';
+
   propagatedBuildInputs = [
     flask
     limits
+    ordered-set
     rich
     typing-extensions
   ];
@@ -44,13 +57,6 @@ buildPythonPackage rec {
     pymongo
   ];
 
-  postPatch = ''
-    sed -i "/--cov/d" pytest.ini
-
-    # flask-restful is unmaintained and breaks regularly, don't depend on it
-    sed -i "/import flask_restful/d" tests/test_views.py
-  '';
-
   disabledTests = [
     # flask-restful is unmaintained and breaks regularly
     "test_flask_restful_resource"

From 1b1a48f4b2aff57aec3f8c69b2af4e473f1a6bbc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 04:57:59 +0100
Subject: [PATCH 801/953] python3Packages.python-levenshtein: drop

Duplicate package, the correct name is just `levenshtein`.
---
 .../python-levenshtein/default.nix            | 29 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/python-levenshtein/default.nix

diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix
deleted file mode 100644
index 9795c27d9901..000000000000
--- a/pkgs/development/python-modules/python-levenshtein/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "python-levenshtein";
-  version = "0.12.2";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6";
-  };
-
-  # No tests included in archive
-  doCheck = false;
-
-  pythonImportsCheck = [
-    "Levenshtein"
-  ];
-
-  meta = with lib; {
-    description = "Functions for fast computation of Levenshtein distance and string similarity";
-    homepage = "https://github.com/ztane/python-Levenshtein";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ aske ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 75f5cf537a20..697b6bca59bc 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -178,6 +178,7 @@ mapAliases ({
   python_magic = python-magic; # added 2022-05-07
   python_mimeparse = python-mimeparse; # added 2021-10-31
   python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03
+  python-Levenshtein = levenshtein;
   python-subunit = subunit; # added 2021-09-10
   pytest_xdist = pytest-xdist; # added 2021-01-04
   python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc30327e2d5f..2d273ffd0c60 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9166,8 +9166,6 @@ self: super: with self; {
 
   python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
 
-  python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { };
-
   python-linux-procfs = callPackage ../development/python-modules/python-linux-procfs { };
 
   python-logstash = callPackage ../development/python-modules/python-logstash { };

From b7d5b405cdc919d3e4e3e3082fe8e0ba7a725339 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 05:00:20 +0100
Subject: [PATCH 802/953] python3Packages.levenshtein: fix meta.changelog

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

diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index afeeea52f33a..c79aee3bd390 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Functions for fast computation of Levenshtein distance and string similarity";
     homepage = "https://github.com/maxbachmann/Levenshtein";
-    changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md";
+    changelog = "https://github.com/maxbachmann/Levenshtein/blob/${version}/HISTORY.md";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ fab ];
   };

From d5aa5af5f301bbbe193c51e7d0a3fc088fd7cfe8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Dec 2022 10:54:34 +0100
Subject: [PATCH 803/953] python310Packages.devtools: add changelog to meta

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

diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix
index a6cc42dfe962..f8aa63d7a22f 100644
--- a/pkgs/development/python-modules/devtools/default.nix
+++ b/pkgs/development/python-modules/devtools/default.nix
@@ -60,6 +60,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python's missing debug print command and other development tools";
     homepage = "https://python-devtools.helpmanual.io/";
+    changelog = "https://github.com/samuelcolvin/python-devtools/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ jdahm ];
   };

From a2bc91cd9bce4f9742e4fc62cb99533cd00cc8e5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Dec 2022 11:06:00 +0100
Subject: [PATCH 804/953] python310Packages.littleutils: add changelog to meta

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

diff --git a/pkgs/development/python-modules/littleutils/default.nix b/pkgs/development/python-modules/littleutils/default.nix
index ea490f19fe5d..538f4dea0a67 100644
--- a/pkgs/development/python-modules/littleutils/default.nix
+++ b/pkgs/development/python-modules/littleutils/default.nix
@@ -1,24 +1,32 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
-, lib
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "littleutils";
   version = "0.2.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vwijrylppmk0nbddqvn527r9cg3zw8d6zk6r58hslry42jf7jp6";
+    hash = "sha256-5srjpCA+Uw1RyWZ+0xD/47GUjyh249aWBbPeS32WkW8=";
   };
 
-  # This tiny package has no unit tests at all
+  # Module has no tests
   doCheck = false;
-  pythonImportsCheck = [ "littleutils" ];
+
+  pythonImportsCheck = [
+    "littleutils"
+  ];
 
   meta = with lib; {
     description = "Small collection of Python utility functions";
     homepage = "https://github.com/alexmojaki/littleutils";
+    changelog = "https://github.com/alexmojaki/littleutils/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ jluttine ];
   };

From 06e855311a37989dd525ad13163c1817ea3631de Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Dec 2022 14:23:00 +0100
Subject: [PATCH 805/953] python310Packages.executing: reformat

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

diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index 0c7cbf276318..1201ffaff170 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -2,11 +2,12 @@
 , asttokens
 , buildPythonPackage
 , fetchFromGitHub
-, setuptools-scm
-, pytestCheckHook
 , littleutils
+, pytestCheckHook
 , pythonAtLeast
+, pythonOlder
 , rich
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
@@ -14,25 +15,25 @@ buildPythonPackage rec {
   version = "1.2.0";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M=";
+    hash = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   nativeBuildInputs = [
     setuptools-scm
   ];
 
-  preBuild = ''
-    export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
-  '';
-
   checkInputs = [
-    pytestCheckHook
     asttokens
     littleutils
+    pytestCheckHook
   ] ++ lib.optionals (pythonAtLeast "3.11") [
     rich
   ];

From aa4397fae050f001474400b961c4fb33194d7f6a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 19 Oct 2022 19:50:22 +0200
Subject: [PATCH 806/953] python310Packages.virtualenv: disable on older Python
 releases

---
 .../python-modules/virtualenv/default.nix     | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index e86ec5fa7da7..cb9f8ed989bc 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -1,9 +1,8 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , buildPythonPackage
 , pythonOlder
 , isPy27
-, backports-entry-points-selectable
 , cython
 , distlib
 , fetchPypi
@@ -18,7 +17,6 @@
 , pytest-timeout
 , pytestCheckHook
 , setuptools-scm
-, six
 }:
 
 buildPythonPackage rec {
@@ -26,6 +24,8 @@ buildPythonPackage rec {
   version = "20.17.1";
   format = "setuptools";
 
+  disabled = pythonOlder "3.6";
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-+LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg=";
@@ -36,13 +36,9 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    backports-entry-points-selectable
     distlib
     filelock
     platformdirs
-    six
-  ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [
-    pathlib2
   ] ++ lib.optionals (pythonOlder "3.7") [
     importlib-resources
   ] ++ lib.optionals (pythonOlder "3.8") [
@@ -66,8 +62,8 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  # Ignore tests which require network access
   disabledTestPaths = [
+    # Ignore tests which require network access
     "tests/unit/create/test_creator.py"
     "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
   ];
@@ -78,16 +74,16 @@ buildPythonPackage rec {
     "test_seed_link_via_app_data"
     # Permission Error
     "test_bad_exe_py_info_no_raise"
-  ] ++ lib.optionals isPy27 [
-    "test_python_via_env_var"
-    "test_python_multi_value_prefer_newline_via_env_var"
   ];
 
-  pythonImportsCheck = [ "virtualenv" ];
+  pythonImportsCheck = [
+    "virtualenv"
+  ];
 
   meta = with lib; {
     description = "A tool to create isolated Python environments";
     homepage = "http://www.virtualenv.org";
+    changelog = "https://github.com/pypa/virtualenv/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ goibhniu ];
   };

From 4553e6237ff3eb7ddb44897d4782d9d1314c4551 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 13:43:27 +0100
Subject: [PATCH 807/953] python3Packages.aiohttp: Relax charset-normalizer
 constraint

and set format.
---
 pkgs/development/python-modules/aiohttp/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 9a6f14f765e5..087e87ded21e 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/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 = [

From 1b4b5be9cabf223ccc81d798ffacee2075f2c133 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 14:05:14 +0100
Subject: [PATCH 808/953] python3Packages.anyio: disable failing tests

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

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 9d2e2a333590..3ad4d8495f06 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/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 = [

From a9125ee26186fd91eee791284ee24ceba17e3aab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 14:19:30 +0100
Subject: [PATCH 809/953] python3Packages.factory_boy: Disable failing tests

with latest flask-sqlalchemy.
---
 pkgs/development/python-modules/factory_boy/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix
index 407083e4f691..e3168c863bce 100644
--- a/pkgs/development/python-modules/factory_boy/default.nix
+++ b/pkgs/development/python-modules/factory_boy/default.nix
@@ -39,6 +39,11 @@ buildPythonPackage rec {
     "MongoEngineTestCase"
   ];
 
+  disabledTestPaths = [
+    # incompatible with latest flask-sqlalchemy
+    "examples/flask_alchemy/test_demoapp.py"
+  ];
+
   pythonImportsCheck = [
     "factory"
   ];

From f986c13814dc75dd6918d4fece378ca0d1dd69cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 14:21:53 +0100
Subject: [PATCH 810/953] python3Packages.autobahn: Stop testing with eth-abi

The dependency chain is broken on every bump and causes a major hassle
that is just not worth it.
---
 pkgs/development/python-modules/autobahn/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index c18d3b2bb84f..11bcb603f909 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/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;

From 2227593660cfbdad9d765655a46b24d6611f4e13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:01:28 +0100
Subject: [PATCH 811/953] python3Packages.pytest-aiohttp: Disable failing tests

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

diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix
index 728544bd2618..a1e43a28435a 100644
--- a/pkgs/development/python-modules/pytest-aiohttp/default.nix
+++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix
@@ -40,6 +40,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # pytest 7.2.0 incompatibilities
+    # https://github.com/aio-libs/pytest-aiohttp/issues/50
+    "tests/test_fixtures.py"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/aio-libs/pytest-aiohttp/";
     changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/v${version}/CHANGES.rst";

From 32461c69ea1bb81a3cbb1757115ae71885b0a229 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:12:27 +0100
Subject: [PATCH 812/953] python3Packages.fastdiff: Pass py into checkInputs,

reformat and disable benchmarks during check phase.
---
 .../python-modules/fastdiff/default.nix       | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix
index a790f1623817..9ad4c8296372 100644
--- a/pkgs/development/python-modules/fastdiff/default.nix
+++ b/pkgs/development/python-modules/fastdiff/default.nix
@@ -1,4 +1,13 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }:
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchPypi
+, wasmer
+, wasmer-compiler-cranelift
+, py
+, pytestCheckHook
+, pytest-benchmark
+}:
 
 buildPythonPackage rec {
   pname = "fastdiff";
@@ -16,11 +25,24 @@ buildPythonPackage rec {
       --replace "collect_ignore = ['setup.py']" ""
   '';
 
-  propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ];
+  propagatedBuildInputs = [
+    wasmer
+    wasmer-compiler-cranelift
+  ];
 
-  checkInputs = [ pytestCheckHook pytest-benchmark ];
+  checkInputs = [
+    py
+    pytestCheckHook
+    pytest-benchmark
+  ];
 
-  pythonImportsCheck = [ "fastdiff" ];
+  pytestFlagsArray = [
+    "--benchmark-skip"
+  ];
+
+  pythonImportsCheck = [
+    "fastdiff"
+  ];
 
   meta = with lib; {
     description = "A fast native implementation of diff algorithm with a pure Python fallback";

From f5c98592d0ffd318a59ac30c2915601c495c2149 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:16:10 +0100
Subject: [PATCH 813/953] python3Packages.markdown-it-py: Pass py into
 checkInputs

and disable benchmark tests.
---
 pkgs/development/python-modules/markdown-it-py/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix
index d408c0071003..afbe7b18d893 100644
--- a/pkgs/development/python-modules/markdown-it-py/default.nix
+++ b/pkgs/development/python-modules/markdown-it-py/default.nix
@@ -6,6 +6,7 @@
 , linkify-it-py
 , mdurl
 , psutil
+, py
 , pytest-benchmark
 , pytest-regressions
 , pytestCheckHook
@@ -41,11 +42,16 @@ buildPythonPackage rec {
 
   checkInputs = [
     psutil
+    py
     pytest-benchmark
     pytest-regressions
     pytestCheckHook
   ];
 
+  pytestFlagsArray = [
+    "--benchmark-skip"
+  ];
+
   pythonImportsCheck = [
     "markdown_it"
   ];

From f6eecc04eef5dbabba512acbd8480b2c02c25720 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:28:37 +0100
Subject: [PATCH 814/953] python3Packages.myst-parser: Relax sphinx constraint

and disable failing tests for now.
---
 pkgs/development/python-modules/myst-parser/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index a7a0ec69c8f5..f3efa9f85b2a 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -20,6 +20,7 @@
 buildPythonPackage rec {
   pname = "myst-parser";
   version = "0.18.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -32,11 +33,10 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "docutils>=0.15,<0.19" "docutils>=0.15"
+      --replace "docutils>=0.15,<0.19" "docutils>=0.15" \
+      --replace "sphinx>=4,<6" "sphinx"
   '';
 
-  format = "flit";
-
   nativeBuildInputs = [ flit-core ];
 
   propagatedBuildInputs = [
@@ -67,6 +67,8 @@ buildPythonPackage rec {
     "test_fieldlist_extension"
     # docutils 0.19 expectation mismatches
     "test_docutils_roles"
+    # sphinx 6.0 expectation mismatches
+    "test_sphinx_directives"
   ];
 
   meta = with lib; {

From f9dc9d540ac4bea5bebbfc94c13a2ddbc426cb15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:36:15 +0100
Subject: [PATCH 815/953] python3Packages.graphene: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index c6508cef7a7e..8e556fdd7c5d 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -5,6 +5,7 @@
 , graphql-core
 , graphql-relay
 , promise
+, py
 , pytest-asyncio
 , pytest-benchmark
 , pytest-mock
@@ -37,6 +38,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     promise
+    py
     pytestCheckHook
     pytest-asyncio
     pytest-benchmark

From 8e39086c7c39dc8798a9a3a7a5a3ba1a32c17d6c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:41:18 +0100
Subject: [PATCH 816/953] python3Packages.starlette: Ignore trio's deprecation
 warnings

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

diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 6d96df91c4f5..91ea2a8bdd01 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -71,6 +71,10 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
+  pytestFlagsArray = [
+    "-W" "ignore::trio.TrioDeprecationWarning"
+  ];
+
   disabledTests = [
     # asserts fail due to inclusion of br in Accept-Encoding
     "test_websocket_headers"

From 089c15835ed88db3a8d0dc73288f2d1836db308e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:41:47 +0100
Subject: [PATCH 817/953] awscli: 1.27.38 -> 1.27.40

Changelog: https://github.com/aws/aws-cli/blob/1.27.40/CHANGELOG.rst
---
 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 3438580c7f22..04c87d780cb9 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli";
-  version = "1.27.38"; # N.B: if you change this, change botocore and boto3 to a matching version too
+  version = "1.27.40"; # N.B: if you change this, change botocore and boto3 to a matching version too
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SjeFBWwfd+9sXcZL9NdqFyuBIQtql3KB3lnygeVVHU0=";
+    hash = "sha256-xP+ugapi6KJE+UokGKmG67ze5dH6nJuJk7BjIr6dtTE=";
   };
 
   # https://github.com/aws/aws-cli/issues/4837

From a08e69ffeb616fa3a212cd1eb3441048aa5a837d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 15:42:17 +0100
Subject: [PATCH 818/953] python3Packages.graphene-django: 2022-03-03 -> 3.0.0

---
 .../graphene-django/default.nix               |  18 +--
 .../graphene-django/graphene-3_2_0.patch      | 150 ------------------
 2 files changed, 5 insertions(+), 163 deletions(-)
 delete mode 100644 pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch

diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix
index f5d9b7904594..728d64ed1f08 100644
--- a/pkgs/development/python-modules/graphene-django/default.nix
+++ b/pkgs/development/python-modules/graphene-django/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, fetchpatch
 
 , graphene
 , graphql-core
@@ -13,6 +12,7 @@
 
 , django-filter
 , mock
+, py
 , pytest-django
 , pytest-random-order
 , pytestCheckHook
@@ -20,26 +20,17 @@
 
 buildPythonPackage rec {
   pname = "graphene-django";
-  version = "unstable-2022-03-03";
+  version = "3.0.0";
   format = "setuptools";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = pname;
-    rev = "f6ec0689c18929344c79ae363d2e3d5628fa4a2d";
-    hash = "sha256-KTZ5jcoeHYXnlaF47t8jIi6+7NyMyA4hDPv+il3bt+U=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-wSZm0hRukBmvrmU3bsqFuZSQRXBwwye9J4ojuSz1uzE=";
   };
 
-  patches = [
-    ./graphene-3_2_0.patch
-    (fetchpatch {
-      url = "https://github.com/graphql-python/graphene-django/commit/ca555293a4334c26cf9a390dd1e3d0bd4c819a17.patch";
-      excludes = [ "setup.py" ];
-      sha256 = "sha256-RxG1MRhmpBKnHhSg4SV+DjZ3uA0nl9oUeei56xjtUpw=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace setup.py \
       --replace '"pytest-runner"' ""
@@ -61,6 +52,7 @@ buildPythonPackage rec {
   checkInputs = [
     django-filter
     mock
+    py
     pytest-django
     pytest-random-order
     pytestCheckHook
diff --git a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch b/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch
deleted file mode 100644
index 0e8fa63464a3..000000000000
--- a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
-index 7d440f4..0aec6e4 100644
---- a/graphene_django/filter/tests/test_fields.py
-+++ b/graphene_django/filter/tests/test_fields.py
-@@ -1005,7 +1005,7 @@ def test_integer_field_filter_type():
- 
-     schema = Schema(query=Query)
- 
--    assert str(schema) == dedent(
-+    assert str(schema).rstrip() + "\n" == dedent(
-         """\
-         type Query {
-           pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection
-@@ -1074,7 +1074,7 @@ def test_other_filter_types():
- 
-     schema = Schema(query=Query)
- 
--    assert str(schema) == dedent(
-+    assert str(schema).rstrip() + "\n" == dedent(
-         """\
-         type Query {
-           pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection
-diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py
-index 70116b8..a4ab4db 100644
---- a/graphene_django/tests/test_command.py
-+++ b/graphene_django/tests/test_command.py
-@@ -49,7 +49,7 @@ def test_generate_graphql_file_on_call_graphql_schema():
-     assert handle.write.called_once()
- 
-     schema_output = handle.write.call_args[0][0]
--    assert schema_output == dedent(
-+    assert schema_output.rstrip() + "\n" == dedent(
-         """\
-         type Query {
-           hi: String
-diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
-index bde72c7..0b64440 100644
---- a/graphene_django/tests/test_types.py
-+++ b/graphene_django/tests/test_types.py
-@@ -247,7 +247,7 @@ def test_schema_representation():
-         }
-         """
-     )
--    assert str(schema) == expected
-+    assert str(schema).rstrip() + "\n" == expected
- 
- 
- def with_local_registry(func):
-@@ -515,7 +515,7 @@ class TestDjangoObjectType:
- 
-         schema = Schema(query=Query)
- 
--        assert str(schema) == dedent(
-+        assert str(schema).rstrip() + "\n" == dedent(
-             """\
-             type Query {
-               pet: Pet
-@@ -541,7 +541,7 @@ class TestDjangoObjectType:
- 
-         schema = Schema(query=Query)
- 
--        assert str(schema) == dedent(
-+        assert str(schema).rstrip() + "\n" == dedent(
-             """\
-             type Query {
-               pet: Pet
-@@ -576,7 +576,7 @@ class TestDjangoObjectType:
- 
-         schema = Schema(query=Query)
- 
--        assert str(schema) == dedent(
-+        assert str(schema).rstrip() + "\n" == dedent(
-             """\
-             type Query {
-               pet: Pet
-@@ -603,7 +603,7 @@ class TestDjangoObjectType:
- 
-         schema = Schema(query=Query)
- 
--        assert str(schema) == dedent(
-+        assert str(schema).rstrip() + "\n" == dedent(
-             """\
-             type Query {
-               pet: PetModelKind
-@@ -642,7 +642,7 @@ class TestDjangoObjectType:
- 
-         schema = Schema(query=Query)
- 
--        assert str(schema) == dedent(
-+        assert str(schema).rstrip() + "\n" == dedent(
-             """\
-             type Query {
-               pet: PetModelKind
-diff --git a/graphene_django/tests/test_views.py b/graphene_django/tests/test_views.py
-index 945fa87..e2e8b46 100644
---- a/graphene_django/tests/test_views.py
-+++ b/graphene_django/tests/test_views.py
-@@ -109,12 +109,10 @@ def test_reports_validation_errors(client):
-             {
-                 "message": "Cannot query field 'unknownOne' on type 'QueryRoot'.",
-                 "locations": [{"line": 1, "column": 9}],
--                "path": None,
-             },
-             {
-                 "message": "Cannot query field 'unknownTwo' on type 'QueryRoot'.",
-                 "locations": [{"line": 1, "column": 21}],
--                "path": None,
-             },
-         ]
-     }
-@@ -135,8 +133,6 @@ def test_errors_when_missing_operation_name(client):
-         "errors": [
-             {
-                 "message": "Must provide operation name if query contains multiple operations.",
--                "locations": None,
--                "path": None,
-             }
-         ]
-     }
-@@ -476,8 +472,7 @@ def test_handles_syntax_errors_caught_by_graphql(client):
-         "errors": [
-             {
-                 "locations": [{"column": 1, "line": 1}],
--                "message": "Syntax Error: Unexpected Name 'syntaxerror'.",
--                "path": None,
-+                "message": "Syntax Error: Unexpected Name 'syntaxerror'."
-             }
-         ]
-     }
-diff --git a/graphene_django/views.py b/graphene_django/views.py
-index c23b020..f533f70 100644
---- a/graphene_django/views.py
-+++ b/graphene_django/views.py
-@@ -11,7 +11,6 @@ from django.views.decorators.csrf import ensure_csrf_cookie
- from django.views.generic import View
- from graphql import OperationType, get_operation_ast, parse, validate
- from graphql.error import GraphQLError
--from graphql.error import format_error as format_graphql_error
- from graphql.execution import ExecutionResult
- 
- from graphene import Schema
-@@ -387,7 +386,7 @@ class GraphQLView(View):
-     @staticmethod
-     def format_error(error):
-         if isinstance(error, GraphQLError):
--            return format_graphql_error(error)
-+            return error.formatted
- 
-         return {"message": str(error)}
- 

From 00f55143d9328f931400cfdd5fb3bb60065fe756 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 Dec 2022 16:10:15 +0100
Subject: [PATCH 819/953] python3Packages.zxcvbn: use tagged release

---
 .../python-modules/zxcvbn/default.nix         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix
index 67f48f34731d..96568bcd56ba 100644
--- a/pkgs/development/python-modules/zxcvbn/default.nix
+++ b/pkgs/development/python-modules/zxcvbn/default.nix
@@ -1,22 +1,24 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "zxcvbn";
   version = "4.4.28";
+  format = "setuptools";
 
   # no tests included in PyPI tarball
   src = fetchFromGitHub {
     owner = "dwolfhub";
     repo = "zxcvbn-python";
-    rev = "45afdf0d3dd8477bc7e457629bb4bc9680794cd7"; # not tagged in repository
-    sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-etcST7pxlpOH5Q9KtOPGf1vmnkyjEp6Cd5QCmBjW9Hc=";
   };
 
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    pytest
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Python implementation of Dropbox's realistic password strength estimator";

From f7d835e5e92b97efe2fff24e8d1b2a303cb50eb5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 01:04:10 +0100
Subject: [PATCH 820/953] home-assistant: relax ciso8601, overrride astral

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

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c09ecc6fb49d..9b7f66f4a020 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -43,6 +43,22 @@ let
         };
       });
 
+      astral = super.astral.overridePythonAttrs (oldAttrs: rec {
+        pname = "astral";
+        version = "2.2";
+        src = self.fetchPypi {
+          inherit pname version;
+          hash = "sha256-5B2ZZ9XEi+QhNGVS8PTe2tQ/85qDV09f8q0ytmJ7b74=";
+        };
+        postPatch = ''
+          substituteInPlace pyproject.toml \
+            --replace "poetry.masonry" "poetry.core.masonry"
+        '';
+        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
+          self.pytz
+        ];
+      });
+
       caldav = super.caldav.overridePythonAttrs (old: rec {
         version = "0.9.1";
         src = fetchFromGitHub {
@@ -225,6 +241,7 @@ in python.pkgs.buildPythonApplication rec {
       "attrs"
       "awesomeversion"
       "bcrypt"
+      "ciso8601"
       "cryptography"
       "home-assistant-bluetooth"
       "httpx"

From 5da6234fe3a9aeeb81747620ede75021a5fe035c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 02:20:50 +0100
Subject: [PATCH 821/953] python311Packages.yarl: Disable failing test

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

diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 171f6569cfd8..3c0a218b8e89 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonAtLeast
 , pythonOlder
 , idna
 , multidict
@@ -41,6 +42,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = lib.optionals (pythonAtLeast "3.11") [
+    "test_not_a_scheme2"
+  ];
+
   postCheck = ''
     popd
   '';

From acbd70e2623b11d5dffaaf3969bc02511ca6135e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 02:39:28 +0100
Subject: [PATCH 822/953] python311Packages.jedi: Disable failing tests

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

diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 3c939195000d..e9a5faccd3b4 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -49,6 +49,10 @@ buildPythonPackage rec {
 
     # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved
     "test_interpreter"
+    "test_scanning_venvs"
+    "test_create_environment_venv_path"
+    "test_create_environment_executable"
+    "test_venv_and_pths"
   ];
 
   meta = with lib; {

From e62d70a79026881c31407324731235604852c34d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 03:37:56 +0100
Subject: [PATCH 823/953] python3Packages.pandas: Disable failing test with
 numpy 1.24

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 72e053c8a56a..a48d6b82d104 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -98,6 +98,8 @@ buildPythonPackage rec {
     "test_rolling_var_numerical_issues"
     # Requires mathplotlib
     "test_subset_for_boolean_cols"
+    # DeprecationWarning from numpy
+    "test_sort_values_sparse_no_warning"
   ] ++ lib.optionals stdenv.isDarwin [
     "test_locale"
     "test_clipboard"

From 109aabe2e804de94ef9ba8f32c86005de3b69b59 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sun, 1 Jan 2023 18:14:09 +0900
Subject: [PATCH 824/953] awsebcli: fixup, bump termcolor dependecy

---
 pkgs/tools/virtualization/awsebcli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index df6e76d63b8b..af784bce9817 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -52,7 +52,7 @@ with localPython.pkgs; buildPythonApplication rec {
       --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \
       --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \
       --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \
-      --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0"
+      --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.2.0"
   '';
 
   buildInputs = [

From 7bd043148707030431c72d55d6839b73d210e4ba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 16:01:14 +0100
Subject: [PATCH 825/953] python3Packages.sphinx: 5.1.1 -> 5.3.0

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

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 5a27f04bd0ee..d40416019b23 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -5,6 +5,9 @@
 , fetchFromGitHub
 , fetchpatch
 
+# nativeBuildInputs
+, flit-core
+
 # propagatedBuildInputs
 , babel
 , alabaster
@@ -34,8 +37,8 @@
 
 buildPythonPackage rec {
   pname = "sphinx";
-  version = "5.1.1";
-  format = "setuptools";
+  version = "5.3.0";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
@@ -43,7 +46,7 @@ buildPythonPackage rec {
     owner = "sphinx-doc";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-dTgQNMRIn7ETm+1HgviOkWWOCmLX7Ez6DM9ChlI32mY=";
+    hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ=";
     postFetch = ''
       cd $out
       mv tests/roots/test-images/testimäge.png \
@@ -52,13 +55,9 @@ buildPythonPackage rec {
     '';
   };
 
-  postPatch = ''
-    # remove impurity caused by date inclusion
-    # https://github.com/sphinx-doc/sphinx/blob/master/setup.cfg#L4-L6
-    substituteInPlace setup.cfg \
-      --replace "tag_build = .dev" "" \
-      --replace "tag_date = true" ""
-  '';
+  nativeBuildInputs = [
+    flit-core
+  ];
 
   propagatedBuildInputs = [
     babel

From c3bf8d1f5b736f3d4c0c89a465e5d996037bcb5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 17:55:07 +0100
Subject: [PATCH 826/953] python3Packages.pyu2f: Disable tests failing with
 pyfakefs 5.0

---
 .../python-modules/pyu2f/default.nix           | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix
index cf7b3eb2aeb0..41fbc08b0102 100644
--- a/pkgs/development/python-modules/pyu2f/default.nix
+++ b/pkgs/development/python-modules/pyu2f/default.nix
@@ -10,17 +10,29 @@
 buildPythonPackage rec {
   pname = "pyu2f";
   version = "0.1.5a";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = version;
+    rev = "refs/tags/${version}";
     sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [
+    six
+  ];
 
-  checkInputs = [ mock pyfakefs pytestCheckHook ];
+  checkInputs = [
+    mock
+    pyfakefs
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # API breakage with pyfakefs>=5.0
+    "pyu2f/tests/hid/linux_test.py"
+  ];
 
   meta = with lib; {
     description = "U2F host library for interacting with a U2F device over USB";

From fca5b85c63fcf52072567dcbe55edbc7118e7f36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 18:53:56 +0100
Subject: [PATCH 827/953] python3Packages.pypytools: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix
index e88891172deb..1828ede0a921 100644
--- a/pkgs/development/python-modules/pypytools/default.nix
+++ b/pkgs/development/python-modules/pypytools/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
   checkInputs = [
     freezegun
     numpy
+    py
     pytestCheckHook
   ];
 

From a25311986ed52dba824019dd2a6f16a9410653e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Jan 2023 23:15:32 +0100
Subject: [PATCH 828/953] python3Packages.getmac: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix
index 79f85ad95674..730d9cc3eb33 100644
--- a/pkgs/development/python-modules/getmac/default.nix
+++ b/pkgs/development/python-modules/getmac/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, py
 , pytest-benchmark
 , pytest-mock
 , pytestCheckHook
@@ -19,6 +20,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
+    py
     pytestCheckHook
     pytest-benchmark
     pytest-mock

From 5f65eb06cc642e90cdc942dc6a22fbaa31a855d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 16:57:45 +0100
Subject: [PATCH 829/953] python3Packages.pylint: 2.15.5 -> 2.15.9

https://github.com/PyCQA/pylint/releases/tag/v2.15.6
https://github.com/PyCQA/pylint/releases/tag/v2.15.7
https://github.com/PyCQA/pylint/releases/tag/v2.15.8
https://github.com/PyCQA/pylint/releases/tag/v2.15.9
---
 pkgs/development/python-modules/pylint/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index a8a0229f8621..60204d70ca64 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -16,6 +16,7 @@
 , tomlkit
 , typing-extensions
 , gitpython
+, py
 , pytest-timeout
 , pytest-xdist
 , pytestCheckHook
@@ -23,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "2.15.5";
+  version = "2.15.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7.2";
@@ -32,7 +33,7 @@ buildPythonPackage rec {
     owner = "PyCQA";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-dchzwMaUhHB1TqcaMZO9tCZ4KA5I1T+tdkGOxikm5AY=";
+    hash = "sha256-T+om5rrG0Gjyr05L5X4j82/S11Q7JBUDNOm4gVEQ494=";
   };
 
   patches = [
@@ -75,6 +76,7 @@ buildPythonPackage rec {
   checkInputs = [
     gitpython
     # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt
+    py
     pytest-timeout
     pytest-xdist
     pytestCheckHook

From abbc2c7810ad587726a577459006452a0f4babf9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 17:54:43 +0100
Subject: [PATCH 830/953] python3Packages.simpy: Pass py into checkInputs

and reformat
---
 .../python-modules/simpy/default.nix          | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix
index ff139523e1f4..6d805c68a850 100644
--- a/pkgs/development/python-modules/simpy/default.nix
+++ b/pkgs/development/python-modules/simpy/default.nix
@@ -1,9 +1,16 @@
-{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools-scm
+{ buildPythonPackage
+, fetchPypi
+, isPy27
+, lib
+, setuptools
+, setuptools-scm
+, py
 , pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "simpy";
   version = "4.0.1";
+  format = "setuptools";
 
   disabled = isPy27;
 
@@ -12,11 +19,18 @@ buildPythonPackage rec {
     sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [ setuptools ];
+  propagatedBuildInputs = [
+    setuptools
+  ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    py
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     homepage = "https://simpy.readthedocs.io/en/${version}/";

From b36007dd92daaada88cd0679d1c368f62f12cb9b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 18:12:36 +0100
Subject: [PATCH 831/953] python310Packages.snowflake-connector-python: Relax
 dep constraints

---
 .../snowflake-connector-python/default.nix         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 880eab4629c6..f0299b231b06 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -21,7 +21,7 @@
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
   version = "2.9.0";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -30,6 +30,12 @@ buildPythonPackage rec {
     hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "charset_normalizer>=2,<3" "charset_normalizer" \
+      --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL"
+  '';
+
   propagatedBuildInputs = [
     asn1crypto
     certifi
@@ -47,12 +53,6 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" \
-      --replace "charset-normalizer~=2.0.0" "charset_normalizer>=2"
-  '';
-
   # Tests require encrypted secrets, see
   # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters
   doCheck = false;

From 3262365f473356076ef85a3f152257552ec2e263 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 18:26:58 +0100
Subject: [PATCH 832/953] python3Packages.trio-asyncio: Ignore
 TrioDeprecationWarning

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

diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix
index 25caa3e965fb..2cbd32b910e8 100644
--- a/pkgs/development/python-modules/trio-asyncio/default.nix
+++ b/pkgs/development/python-modules/trio-asyncio/default.nix
@@ -40,8 +40,9 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [
     # https://github.com/python-trio/trio-asyncio/issues/112
-    "-W"
-    "ignore::DeprecationWarning"
+    "-W" "ignore::DeprecationWarning"
+    # trio.MultiError is deprecated since Trio 0.22.0; use BaseExceptionGroup (on Python 3.11 and later) or exceptiongroup.BaseExceptionGroup (earlier versions) instead (https://github.com/python-trio/trio/issues/2211)
+    "-W" "ignore::trio.TrioDeprecationWarning"
   ];
 
   disabledTestPaths = [

From 38aece2b446b011549fd7f8b0bd95c0c29ea8ffa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 18:31:04 +0100
Subject: [PATCH 833/953] python3Packages.extractcode: Disable failing test

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

diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix
index 0a8db8611921..2134c10f6154 100644
--- a/pkgs/development/python-modules/extractcode/default.nix
+++ b/pkgs/development/python-modules/extractcode/default.nix
@@ -58,6 +58,8 @@ buildPythonPackage rec {
     "test_get_extractor_qcow2"
     # WARNING  patch:patch.py:450 inconsistent line ends in patch hunks
     "test_patch_info_patch_patches_windows_plugin_explorer_patch"
+    # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]]
+    "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch"
   ];
 
   pythonImportsCheck = [

From eb46de5e35ba04a419ce2f7f9454dfbbc0baf911 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 18:37:50 +0100
Subject: [PATCH 834/953] python3Packages.quantities: Disable failing test

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

diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix
index 48cc70d5f2af..23ed3bb47414 100644
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/pkgs/development/python-modules/quantities/default.nix
@@ -23,10 +23,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # Tests don't work with current numpy
-    # https://github.com/python-quantities/python-quantities/pull/195
-    "test_arctan2"
-    "test_fix"
+    # test fails with numpy 1.24
+    "test_mul"
   ];
 
   pythonImportsCheck = [ "quantities" ];

From 15c22385d9c8a0fde6adf127bcdc23f331836946 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 18:42:25 +0100
Subject: [PATCH 835/953] python3Packages.meinheld: Relax greenlet constraint

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

diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix
index 0fced5f3e71e..c33aae4d20c4 100644
--- a/pkgs/development/python-modules/meinheld/default.nix
+++ b/pkgs/development/python-modules/meinheld/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   patchPhase = ''
     # Allow greenlet-1.0.0.
     # See https://github.com/mopemope/meinheld/pull/123
-    substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5,<2.0.0"
+    substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5"
   '';
 
   propagatedBuildInputs = [ greenlet ];
@@ -20,6 +20,10 @@ buildPythonPackage rec {
   # No tests
   doCheck = false;
 
+  pythonImportsCheck = [
+    "meinheld"
+  ];
+
   meta = with lib; {
     description = "High performance asynchronous Python WSGI Web Server";
     homepage = "https://meinheld.org/";

From 5fa62858e0fb3be3f8ed325f0322cc1a31b5c595 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 20:53:47 +0100
Subject: [PATCH 836/953] python3packages.starlette: 0.20.4 -> 0.23.1

https://github.com/encode/starlette/releases/tag/0.21.0
https://github.com/encode/starlette/releases/tag/0.22.0
https://github.com/encode/starlette/releases/tag/0.23.0
https://github.com/encode/starlette/releases/tag/0.23.1
---
 .../python-modules/starlette/default.nix      | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 91ea2a8bdd01..d23d83f7cf76 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -2,7 +2,10 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
+, hatchling
+
+# runtime
+, ApplicationServices
 , aiofiles
 , anyio
 , contextlib2
@@ -10,20 +13,22 @@
 , jinja2
 , python-multipart
 , pyyaml
+, typing-extensions
+
+# tests
 , requests
 , aiosqlite
 , databases
+, httpx
 , pytestCheckHook
 , pythonOlder
 , trio
-, typing-extensions
-, ApplicationServices
 }:
 
 buildPythonPackage rec {
   pname = "starlette";
-  version = "0.20.4";
-  format = "setuptools";
+  version = "0.23.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
@@ -31,15 +36,11 @@ buildPythonPackage rec {
     owner = "encode";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-vP2TJPn9lRGnLGkO8lUmnsoT6rSnhuWDD3WqNk76SM0=";
+    hash = "sha256-LcFrdaRgFBqcdylCzNlewj/papsg/sZ1FMVxBDLvQWI=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/encode/starlette/commit/ab70211f0e1fb7390668bf4891eeceda8d9723a0.diff";
-      excludes = [ "requirements.txt" ]; # conflicts
-      hash = "sha256-UHf4c4YUWp/1I1vD8J0hMewdlfkmluA+FyGf9ZsSv3Y=";
-    })
+  nativeBuildInputs = [
+    hatchling
   ];
 
   postPatch = ''
@@ -66,12 +67,14 @@ buildPythonPackage rec {
   checkInputs = [
     aiosqlite
     databases
+    httpx
     pytestCheckHook
     trio
     typing-extensions
   ];
 
   pytestFlagsArray = [
+    "-W" "ignore::DeprecationWarning"
     "-W" "ignore::trio.TrioDeprecationWarning"
   ];
 
@@ -86,6 +89,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/encode/starlette/releases/tag/${version}";
     homepage = "https://www.starlette.io/";
     description = "The little ASGI framework that shines";
     license = licenses.bsd3;

From f5336d2318adfb0e0f83d064e30ed0b17efc7208 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 21:04:20 +0100
Subject: [PATCH 837/953] python3Packages.fastapi: Disable failing test

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

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 5cfdeb6f4e9a..ed9e9c5aa216 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -84,6 +84,8 @@ buildPythonPackage rec {
     "test_head"
     "test_options"
     "test_trace"
+    # Unexpected number of warnings caught
+    "test_warn_duplicate_operation_id"
   ];
 
   pythonImportsCheck = [

From 257d72ba07e674420a2658ba54f8db0720326791 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 21:34:40 +0100
Subject: [PATCH 838/953] python3Packages.celery: Fix billiard 4.1 compat

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

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 67c3c58794d5..80b58dc69be6 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/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 = ''

From 9d7973e52fc8be01407af368cef1618d1beffc5a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 21:43:46 +0100
Subject: [PATCH 839/953] python3Packages.rply: Fix tests, refactor

---
 .../python-modules/rply/default.nix           | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index 33f8547496db..e05c08640ed9 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -1,21 +1,34 @@
-{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, appdirs
+, py
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "rply";
   version = "0.7.7";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "alex";
     repo = "rply";
     rev = "v${version}";
-    sha256 = "1qv37hn7hhxd388znri76g0zjxsbwhxhcaic94dvw9pq4l60vqp6";
+    hash = "sha256-5uINDCX4Jr4bSSwqBjvkS3f5wTMnZvsRGq1DeCw8Y+M=";
   };
 
-  propagatedBuildInputs = [ appdirs ];
+  propagatedBuildInputs = [
+    appdirs
+  ];
 
-  checkInputs = [ pytest ];
-  checkPhase = ''
-    HOME=$(mktemp -d) py.test tests
+  checkInputs = [
+    py
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
   '';
 
   meta = with lib; {

From 4244d1bd35db13895496ef93b12707fdb30dabe7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 21:44:46 +0100
Subject: [PATCH 840/953] python3Packages.smbus-cffi: Pass py into checkInputs

---
 pkgs/development/python-modules/smbus-cffi/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix
index ffb22d1c4b42..79f177b1f945 100644
--- a/pkgs/development/python-modules/smbus-cffi/default.nix
+++ b/pkgs/development/python-modules/smbus-cffi/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , cffi
+, py
 , pytestCheckHook
 , pyserial
 , fetchpatch
@@ -37,7 +38,7 @@ buildPythonPackage rec {
   # requires hardware access
   pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ];
 
-  checkInputs = [ pytestCheckHook pyserial ];
+  checkInputs = [ py pytestCheckHook pyserial ];
 
   meta = with lib; {
     description = "Python module for SMBus access through Linux I2C /dev interface";

From 9f4bff5a35f5592cb601766c03bfe8a4fedeaa0d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 21:56:42 +0100
Subject: [PATCH 841/953] python3Packages.cucumber-tag-expressions: Fix tests

---
 .../cucumber-tag-expressions/default.nix        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
index f286cd4a7f02..b2494e9c17f5 100644
--- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
@@ -1,4 +1,10 @@
-{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, py
+, pytestCheckHook
+, pytest-html
+ }:
 
 buildPythonPackage rec {
   pname = "cucumber-tag-expressions";
@@ -9,11 +15,14 @@ buildPythonPackage rec {
     sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960";
   };
 
-  checkInputs = [ pytest pytest-html ];
-  checkPhase = "pytest tests/*/*.py";
+  checkInputs = [
+    py
+    pytestCheckHook
+    pytest-html
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/cucumber/tag-expressions-python";
+    homepage = "https://github.com/cucumber/tag-expressions";
     description = "Provides tag-expression parser for cucumber/behave";
     license = licenses.mit;
     maintainers = with maintainers; [ maxxk ];

From 1b9872b497c326435fa25082a250f4c3542b897c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 22:03:57 +0100
Subject: [PATCH 842/953] python3Packages.matrix-nio: Pass py into checkInputs

---
 pkgs/development/python-modules/matrix-nio/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 45689c045168..a364b032ed9a 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -18,6 +18,7 @@
 , jsonschema
 , peewee
 , poetry-core
+, py
 , pycryptodome
 , pytest-aiohttp
 , pytest-benchmark
@@ -73,6 +74,7 @@ buildPythonPackage rec {
     aioresponses
     faker
     hypothesis
+    py
     pytest-aiohttp
     pytest-benchmark
     pytestCheckHook

From f6d5846ee01e99aa32d70f64e085599049f9b1c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 22:27:44 +0100
Subject: [PATCH 843/953] protobuf3_21: 3.21.8 -> 3.21.12

https://github.com/protocolbuffers/protobuf/blob/v21.12/CHANGES.txt
---
 pkgs/development/libraries/protobuf/3.21.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix
index 6ba9ca31aba6..f5797ea7f9fb 100644
--- a/pkgs/development/libraries/protobuf/3.21.nix
+++ b/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=";
 }

From 8aa83fea9045f13c39eafe9e8a11e4f61cfee29c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Jan 2023 23:49:01 +0100
Subject: [PATCH 844/953] python3Packages.setuptools-gettext: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix
new file mode 100644
index 000000000000..f8b5d45bbc7f
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools-gettext/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "setuptools-gettext";
+  version = "0.1.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "breezy-team";
+    repo = "setuptools-gettext";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-MifsEuWNTEDJa9RfIbM/EDMJg0cmHXX6oJxNskKEbY4=";
+  };
+
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "setuptools_gettext"
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/v${version}";
+    description = "setuptools plugin for building mo files";
+    homepage = "https://github.com/breezy-team/setuptools-gettext";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2d273ffd0c60..7798d2e68ce1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10285,6 +10285,8 @@ self: super: with self; {
 
   setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { };
 
+  setuptools-gettext = callPackage ../development/python-modules/setuptools-gettext { };
+
   setuptools-git = callPackage ../development/python-modules/setuptools-git { };
 
   setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };

From d5c2dae9776f79495601ea4457c20e7be4731fab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 00:15:55 +0100
Subject: [PATCH 845/953] python3Packages.cli-helpers: reformat

---
 .../python-modules/cli-helpers/default.nix    | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index 02b6c6fccda7..7d7930b4f8b8 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -1,37 +1,43 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
 , backports_csv
 , configobj
 , mock
-, pytest
+, pytestCheckHook
+, pygments
 , tabulate
 , terminaltables
 , wcwidth
 }:
 
 buildPythonPackage rec {
-  pname = "cli_helpers";
+  pname = "cli-helpers";
   version = "2.3.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc=";
+    pname = "cli_helpers";
+    inherit version;
+    hash = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc=";
   };
 
   propagatedBuildInputs = [
     configobj
-    terminaltables
     tabulate
-    wcwidth
-  ] ++ (lib.optionals isPy27 [ backports_csv ]);
+  ] ++ tabulate.optional-dependencies.widechars;
 
-  # namespace collision between backport.csv and backports.configparser
-  doCheck = !isPy27;
+  passthru.optional-dependencies = {
+    styles = [ pygments ];
+  };
 
-  checkInputs = [ pytest mock ];
-
-  checkPhase = ''
-    py.test
-  '';
+  checkInputs = [
+    pytestCheckHook
+    mock
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   meta = with lib; {
     description = "Python helpers for common CLI tasks";

From ff9f36a499fbd3f9a0798f68d6fb0dd0f448bbf9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 01:25:28 +0100
Subject: [PATCH 846/953] python3Packages.ical: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix
index 5ec01565e2d1..66e64270ad85 100644
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@@ -5,6 +5,7 @@
 , fetchFromGitHub
 , freezegun
 , tzdata
+, py
 , pyparsing
 , pydantic
 , pytest-asyncio
@@ -38,6 +39,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     freezegun
+    py
     pytest-asyncio
     pytest-benchmark
     pytest-golden

From ac88e1c2aa901cb79e10d0e318ffc62a7300c82b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 01:46:16 +0100
Subject: [PATCH 847/953] python3Packages.executor: reformat

---
 .../python-modules/executor/default.nix       | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix
index 610d9b0b096c..b54860cc8632 100644
--- a/pkgs/development/python-modules/executor/default.nix
+++ b/pkgs/development/python-modules/executor/default.nix
@@ -1,8 +1,21 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytestCheckHook, mock, virtualenv }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, coloredlogs
+, humanfriendly
+, property-manager
+, fasteners
+, six
+, pytestCheckHook
+, mock
+, virtualenv
+}:
 
 buildPythonPackage rec {
   pname = "executor";
   version = "23.2";
+  format = "setuptools";
   disabled = isPy27;
 
   src = fetchFromGitHub {
@@ -12,9 +25,19 @@ buildPythonPackage rec {
     sha256 = "1mr0662c5l5zx0wjapcprp8p2xawfd0im3616df5sgv79fqzwfqs";
   };
 
-  propagatedBuildInputs = [ coloredlogs property-manager fasteners ];
+  propagatedBuildInputs = [
+    coloredlogs
+    humanfriendly
+    property-manager
+    fasteners
+    six
+  ];
 
-  checkInputs = [ pytestCheckHook mock virtualenv ];
+  checkInputs = [
+    pytestCheckHook
+    mock
+    virtualenv
+  ];
 
   # ignore impure tests
   disabledTests = [
@@ -28,6 +51,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/xolox/python-executor/blob/${version}/CHANGELOG.rst";
     description = "Programmer friendly subprocess wrapper";
     homepage = "https://github.com/xolox/python-executor";
     license = licenses.mit;

From 856b1ac78b033bec0feedbe949c1c5056fa0b23e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 01:51:42 +0100
Subject: [PATCH 848/953] python3Packages.pytest-doctestplus: Propagate
 setuptools

---
 .../development/python-modules/pytest-doctestplus/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix
index 9f722ca92836..531e21fc4b50 100644
--- a/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix
@@ -5,13 +5,14 @@
 , pytest
 , pytestCheckHook
 , pythonOlder
+, setuptools
 , setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "pytest-doctestplus";
   version = "0.12.1";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -30,6 +31,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     packaging
+    setuptools
   ];
 
   checkInputs = [

From 510de5b6f97d690a3e9a708ce6a608794e155daa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 02:01:33 +0100
Subject: [PATCH 849/953] borgbackup: Pass py into checkInputs

---
 pkgs/tools/backup/borgbackup/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix
index 9bc3dfefd4ae..84083c0db2d8 100644
--- a/pkgs/tools/backup/borgbackup/default.nix
+++ b/pkgs/tools/backup/borgbackup/default.nix
@@ -77,6 +77,7 @@ python3.pkgs.buildPythonApplication rec {
 
   checkInputs = with python3.pkgs; [
     e2fsprogs
+    py
     python-dateutil
     pytest-benchmark
     pytest-xdist

From 348c4d480c80c4f41da39b6886702c141e697f54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 02:24:13 +0100
Subject: [PATCH 850/953] python3Packages.asyncclick: Ignore
 TrioDeprecationWarning

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

diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix
index f9b12e553420..3d16f7bfa48c 100644
--- a/pkgs/development/python-modules/asyncclick/default.nix
+++ b/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"

From fe6201630f43c65ede2b0dc78bd34bc5c35921dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 04:08:18 +0100
Subject: [PATCH 851/953] python3Packages.numpy: 1.23.3 -> 1.23.5

---
 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 6f13a90e2ec3..3a73b1bf3d55 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -40,14 +40,14 @@ let
   };
 in buildPythonPackage rec {
   pname = "numpy";
-  version = "1.23.3";
+  version = "1.23.5";
   format = "setuptools";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     extension = "tar.gz";
-    hash = "sha256-Ub9JwM0dUr4KJAqmbzRYr8S5XYmT0tBPDZH6YMEK9s0=";
+    hash = "sha256-Gxdm1vOXwYFT1AAV3fx53bcVyrrcBNLSKNTlqLxN7Ro=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [

From bed58295659c8b96b3c4e6286737862fc3370ea5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 04:10:05 +0100
Subject: [PATCH 852/953] python3Packages.mrjob: init at 0.7.4

Dependency for upgrading approvaltests.
---
 .../python-modules/mrjob/default.nix          | 81 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/python-modules/mrjob/default.nix

diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix
new file mode 100644
index 000000000000..f8029f9db6c8
--- /dev/null
+++ b/pkgs/development/python-modules/mrjob/default.nix
@@ -0,0 +1,81 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# propagates
+, pyyaml
+
+# optionals
+, boto3
+, botocore
+, google-cloud-dataproc
+, google-cloud-logging
+, google-cloud-storage
+, python-rapidjson
+, simplejson
+, ujson
+
+
+# tests
+, pyspark
+, unittestCheckHook
+, warcio
+}:
+
+buildPythonPackage rec {
+  pname = "mrjob";
+  version = "0.7.4";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "Yelp";
+    repo = "mrjob";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Yp4yUx6tkyGB622I9y+AWK2AkIDVGKQPMM+LtB/M3uo=";
+  };
+
+  propagatedBuildInputs = [
+    pyyaml
+  ];
+
+  passthru.optional-dependencies = {
+    aws = [
+      boto3
+      botocore
+    ];
+    google = [
+      google-cloud-dataproc
+      google-cloud-logging
+      google-cloud-storage
+    ];
+    rapidjson = [
+      python-rapidjson
+    ];
+    simplejson = [
+      simplejson
+    ];
+    ujson = [
+      ujson
+    ];
+  };
+
+  doCheck = false; # failing tests
+
+  checkInputs = [
+    pyspark
+    unittestCheckHook
+    warcio
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  unittestFlagsArray = [
+    "-v"
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/Yelp/mrjob/blob/v${version}/CHANGES.txt";
+    description = "Run MapReduce jobs on Hadoop or Amazon Web Services";
+    homepage = "https://github.com/Yelp/mrjob";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7798d2e68ce1..e3e041e8fb2e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5968,6 +5968,8 @@ self: super: with self; {
 
   mpyq = callPackage ../development/python-modules/mpyq { };
 
+  mrjob = callPackage ../development/python-modules/mrjob { };
+
   mrkd = callPackage ../development/python-modules/mrkd { };
 
   ms-active-directory = callPackage ../development/python-modules/ms-active-directory { };

From 5eb7ef5549c4732b2773f55b131a1741e2af122b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 04:37:57 +0100
Subject: [PATCH 853/953] sumo: Unpin python37

---
 pkgs/applications/science/networking/sumo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix
index 7c5794eb8e83..92f64fbfb916 100644
--- a/pkgs/applications/science/networking/sumo/default.nix
+++ b/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

From 50544dcce4f5c06acd944805aa02c8e0673d5819 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 04:52:38 +0100
Subject: [PATCH 854/953] python311Full: init

---
 pkgs/top-level/all-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b15f4a7b84a6..1f52831643b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16303,6 +16303,12 @@ with pkgs;
     bluezSupport = true;
     x11Support = true;
   };
+  python311Full = python310.override {
+    self = python311Full;
+    pythonAttr = "python311Full";
+    bluezSupport = true;
+    x11Support = true;
+  };
 
   pythonInterpreters = callPackage ./../development/interpreters/python { };
   inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython;

From 3df6d8d54d4a39f4e80efe8bc86fbf7dcd750081 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 05:26:58 +0100
Subject: [PATCH 855/953] aflplusplus: unpin python37

---
 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 1f52831643b9..776adbe300c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1246,7 +1246,7 @@ with pkgs;
   aflplusplus = callPackage ../tools/security/aflplusplus {
     clang = clang_9;
     llvm = llvm_9;
-    python = python37;
+    python = python3;
     wine = null;
   };
 

From 303517701e38ae80d52b633e4cfd0566d683ce1d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 05:35:53 +0100
Subject: [PATCH 856/953] python3Package.wand: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix
index 396642b0c13a..b0e943b433d4 100644
--- a/pkgs/development/python-modules/wand/default.nix
+++ b/pkgs/development/python-modules/wand/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , imagemagickBig
+, py
 , pytestCheckHook
 }:
 
@@ -22,6 +23,7 @@ buildPythonPackage rec {
   '';
 
   checkInputs = [
+    py
     pytestCheckHook
   ];
 

From 98d9e9f75d42f9946c0f534493fbcbda265fa951 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 05:43:45 +0100
Subject: [PATCH 857/953] cq-editor: Unpin python37Packages

THe package doesn't build anyway, so I won't invest any time fixing it.
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 776adbe300c4..81eda4102acb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28322,9 +28322,7 @@ with pkgs;
 
   cplay-ng = callPackage ../applications/audio/cplay-ng { };
 
-  cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor {
-    python3Packages = python37Packages;
-  };
+  cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { };
 
   cqrlog = callPackage ../applications/radio/cqrlog {
     hamlib = hamlib_4;

From 5185f467f396f3b1e9f4d3f5825bf649e219fa8a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 05:48:56 +0100
Subject: [PATCH 858/953] python3Packages.mixpanel: 4.5.0 -> 4.10.0

---
 .../python-modules/mixpanel/default.nix       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix
index fac1afe2c97b..692333e4daae 100644
--- a/pkgs/development/python-modules/mixpanel/default.nix
+++ b/pkgs/development/python-modules/mixpanel/default.nix
@@ -1,40 +1,41 @@
 
 { buildPythonPackage
 , fetchFromGitHub
-, isPy37
 , lib
 
 # Python Dependencies
-, mock
-, pytest
 , six
+, urllib3
+, requests
+
+# tests
+, pytestCheckHook
+, responses
 }:
 
 buildPythonPackage rec {
   pname = "mixpanel";
-  version = "4.5.0";
-  disabled = !isPy37;
+  version = "4.10.0";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "mixpanel";
     repo = "mixpanel-python";
-    rev = version;
-    sha256 = "1hlc717wcn71i37ngsfb3c605rlyjhsn3v6b5bplq00373r4d39z";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-jV2NLEc23uaI5Q7ZXDwGaZV9iAKQLMAETRTw8epZwQA=";
   };
 
   propagatedBuildInputs = [
+    requests
     six
+    urllib3
   ];
 
   checkInputs = [
-    mock
-    pytest
+    pytestCheckHook
+    responses
   ];
 
-  checkPhase = ''
-    py.test
-  '';
-
   meta = with lib; {
     homepage = "https://github.com/mixpanel/mixpanel-python";
     description = "Official Mixpanel Python library";

From e75f5e8efa13917e6aefed0a4e8451c5205a0259 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 06:09:33 +0100
Subject: [PATCH 859/953] python37: drop

The package set hasn't been working for a long time now, due to infinite
recursions, that nobody was going to fix.

The release is going to go EOL in 2023/06 and we don't want to ship it
in NixOS 23.05 anyway.
---
 pkgs/common-updater/scripts/mark-broken       |   1 -
 ...hardcoded-path-checking-for-rpmbuild.patch |  30 -----
 .../python/cpython/3.7/no-ldconfig.patch      | 108 ------------------
 .../python/cpython/3.7/profile-task.patch     |  21 ----
 .../interpreters/python/cpython/default.nix   |  12 --
 .../interpreters/python/default.nix           |  13 ---
 pkgs/top-level/all-packages.nix               |   9 +-
 7 files changed, 1 insertion(+), 193 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/profile-task.patch

diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken
index 73308bf8b39a..7035bee18604 100755
--- a/pkgs/common-updater/scripts/mark-broken
+++ b/pkgs/common-updater/scripts/mark-broken
@@ -48,7 +48,6 @@ denyFileList=(
 # to be conditionally disabled
 denyAttrList=(
         python27Packages
-        python37Packages
         linuxPackages_
         rubyPackages_
 )
diff --git a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch b/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
deleted file mode 100644
index bb3d992612d3..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
+++ /dev/null
@@ -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')
diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
deleted file mode 100644
index 4324fc5ea61f..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
+++ /dev/null
@@ -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
-
diff --git a/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch
deleted file mode 100644
index df55da3a4132..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch
+++ /dev/null
@@ -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
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 388802fca8c6..ffc89039146b 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/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
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 18282bc6d26c..b697062fbecf 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/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 = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81eda4102acb..58d88b021bc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16279,12 +16279,6 @@ with pkgs;
     bluezSupport = true;
     x11Support = true;
   };
-  python37Full = python37.override {
-    self = python37Full;
-    pythonAttr = "python37Full";
-    bluezSupport = true;
-    x11Support = true;
-  };
   python38Full = python38.override {
     self = python38Full;
     pythonAttr = "python38Full";
@@ -16311,13 +16305,12 @@ with pkgs;
   };
 
   pythonInterpreters = callPackage ./../development/interpreters/python { };
-  inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython;
+  inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython;
 
   # List of extensions with overrides to apply to all Python package sets.
   pythonPackagesExtensions = [ ];
   # Python package sets.
   python27Packages = python27.pkgs;
-  python37Packages = python37.pkgs;
   python38Packages = python38.pkgs;
   python39Packages = python39.pkgs;
   python310Packages = recurseIntoAttrs python310.pkgs;

From 4e7b8905ba4a86a5c98dde02836f14725fe8b08e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 06:14:11 +0100
Subject: [PATCH 860/953] pre-commit: Add pytest-forked

It was provided through pytest-xdist, which isn't the case after the 3.0
release.
---
 pkgs/tools/misc/pre-commit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix
index 06efbbfff449..e694106a0eaf 100644
--- a/pkgs/tools/misc/pre-commit/default.nix
+++ b/pkgs/tools/misc/pre-commit/default.nix
@@ -50,6 +50,7 @@ buildPythonPackage rec {
     go
     nodejs
     pytest-env
+    pytest-forked
     pytest-xdist
     pytestCheckHook
     re-assert

From c98f8fbbd11a2a97e7e68766e0b9116b5ddcb42c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 06:23:22 +0100
Subject: [PATCH 861/953] commitizen: fix hash, relax deps, fix tests

---
 .../version-management/commitizen/default.nix         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix
index 0ca00c0923b2..69b6c1bdcd16 100644
--- a/pkgs/applications/version-management/commitizen/default.nix
+++ b/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 { };

From 10a157b2ea64367d5810b7fbb231a38a7e915bb6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 06:49:10 +0100
Subject: [PATCH 862/953] python3Packages.pyshark: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index b33a1bd9f385..f3d2589d62e6 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  checkInputs = [ pytestCheckHook wireshark-cli ];
+  checkInputs = [ py pytestCheckHook wireshark-cli ];
 
   pythonImportsCheck = [ "pyshark" ];
 

From ca3f9b732663411712efadab930878ec9d09a885 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 15:48:28 +0100
Subject: [PATCH 863/953] rich-cli: Relax textual constraint

---
 pkgs/misc/rich-cli/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix
index 68996e4e457c..86e7e3048e74 100644
--- a/pkgs/misc/rich-cli/default.nix
+++ b/pkgs/misc/rich-cli/default.nix
@@ -29,7 +29,8 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'rich = "^12.4.0"' 'rich = "*"'
+      --replace 'rich = "^12.4.0"' 'rich = "*"' \
+      --replace 'textual = "^0.1.18"' 'textual = "*"'
   '';
 
   pythonImportsCheck = [

From a974783a79428959d54d552d15882d6e24adb536 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 16:04:57 +0100
Subject: [PATCH 864/953] python3Packages.logical-unification: Pass py into
 checkInputs

---
 pkgs/development/python-modules/logical-unification/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix
index b89fcb25339e..0762d3986cce 100644
--- a/pkgs/development/python-modules/logical-unification/default.nix
+++ b/pkgs/development/python-modules/logical-unification/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , toolz
 , multipledispatch
+, py
 , pytestCheckHook
 , pytest-html
 , pytest-benchmark
@@ -25,6 +26,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    py
     pytestCheckHook
     pytest-html
     pytest-benchmark  # Needed for the `--benchmark-skip` flag

From be2dded1f08d4a2febb51636b22647ae55d7b495 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 16:05:20 +0100
Subject: [PATCH 865/953] python3Packages.parametrize-from-file: Relax
 more-itertools constraint

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

diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix
index cacc75f3eb2c..bcdca9cf6470 100644
--- a/pkgs/development/python-modules/parametrize-from-file/default.nix
+++ b/pkgs/development/python-modules/parametrize-from-file/default.nix
@@ -16,6 +16,7 @@
 buildPythonPackage rec {
   pname = "parametrize-from-file";
   version = "0.17.0";
+  format = "flit";
 
   src = fetchPypi {
     inherit version;
@@ -23,18 +24,19 @@ buildPythonPackage rec {
     sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j";
   };
 
-  format = "flit";
-  pythonImportsCheck = [ "parametrize_from_file" ];
-
   # patch out coveralls since it doesn't provide us value
   preBuild = ''
     sed -i '/coveralls/d' ./pyproject.toml
+
+    substituteInPlace pyproject.toml \
+      --replace "more_itertools~=8.10" "more_itertools"
   '';
 
   checkInputs = [
     numpy
     pytestCheckHook
   ];
+
   propagatedBuildInputs = [
     contextlib2
     decopatch
@@ -45,6 +47,8 @@ buildPythonPackage rec {
     toml
   ];
 
+  pythonImportsCheck = [ "parametrize_from_file" ];
+
   meta = with lib; {
     description = "Read unit test parameters from config files";
     homepage = "https://github.com/kalekundert/parametrize_from_file";

From 9fa4837c2498f16d3abd94e35f27d420175dda0b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 16:06:17 +0100
Subject: [PATCH 866/953] python3Packages.cons: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix
index 2977051d87b2..03017a536155 100644
--- a/pkgs/development/python-modules/cons/default.nix
+++ b/pkgs/development/python-modules/cons/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , logical-unification
+, py
 , pytestCheckHook
 , pytest-html
 }:
@@ -22,6 +23,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    py
     pytestCheckHook
     pytest-html
   ];

From 70bc1fbeb74b0d8e2754ad7808756bad32c9b315 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 16:07:06 +0100
Subject: [PATCH 867/953] python3Packages.etuples: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix
index 31a3c9198c7d..d2785519bf84 100644
--- a/pkgs/development/python-modules/etuples/default.nix
+++ b/pkgs/development/python-modules/etuples/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , cons
 , multipledispatch
+, py
 , pytestCheckHook
 , pytest-html
 }:
@@ -24,6 +25,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    py
     pytestCheckHook
     pytest-html
   ];

From f89b878da594fd6ca5179f92753a472d7bbe3ee5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 16:11:58 +0100
Subject: [PATCH 868/953] python3Packages.minikanren: Pass py into checkInputs

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

diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix
index 7452148e8e47..929a9be81a9f 100644
--- a/pkgs/development/python-modules/minikanren/default.nix
+++ b/pkgs/development/python-modules/minikanren/default.nix
@@ -6,6 +6,7 @@
 , multipledispatch
 , etuples
 , logical-unification
+, py
 , pytestCheckHook
 , pytest-html
 }:
@@ -30,6 +31,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    py
     pytestCheckHook
     pytest-html
   ];

From afa8c47666496f2aa813e599bb7545e4c9ff2ab0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 16:30:51 +0100
Subject: [PATCH 869/953] python3Packages.python-http-client: Disable failing
 test

---
 .../python-modules/python-http-client/default.nix          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
index 78a3b018c7ea..b108de64dd21 100644
--- a/pkgs/development/python-modules/python-http-client/default.nix
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "python_http_client";
+  pname = "python-http-client";
   version = "3.3.7";
   format = "setuptools";
 
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # checks date in license file and subsequently fails after new years
+    "test_daterange"
+  ];
+
   pythonImportsCheck = [
     "python_http_client"
   ];

From 8fdb3b675cc993f3b12b22f9d74d30f60467a6b6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 16:40:38 +0100
Subject: [PATCH 870/953] python3Packages.pyliblo: Disable for python>=3.11

Uses removed functions in the inspect module and last development
happened in 2015.
---
 pkgs/development/python-modules/pyliblo/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix
index 64f8e62c2862..321507c3ce6e 100644
--- a/pkgs/development/python-modules/pyliblo/default.nix
+++ b/pkgs/development/python-modules/pyliblo/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchurl
 , isPyPy
+, pythonAtLeast
 , liblo
 , cython
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "pyliblo";
   version = "0.10.0";
-  disabled = isPyPy;
+  disabled = isPyPy || pythonAtLeast "3.11";
 
   src = fetchurl {
     url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";

From b86abf8880439b9dc059bbb79540767e1177060a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 17:42:22 +0100
Subject: [PATCH 871/953] python3Packages.sanic: Update disabled tests, cleanup

---
 .../python-modules/sanic/default.nix          | 55 ++++++++-----------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 36c20604852c..22d6d1777193 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -9,13 +9,12 @@
 , httptools
 , multidict
 , pytest-asyncio
-, pytest-benchmark
-, pytest-sugar
-, pytestCheckHook
+ ,pytestCheckHook
 , pythonOlder
 , pythonAtLeast
 , sanic-routing
 , sanic-testing
+, setuptools
 , ujson
 , uvicorn
 , uvloop
@@ -26,7 +25,7 @@
 buildPythonPackage rec {
   pname = "sanic";
   version = "22.12.0";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -37,6 +36,10 @@ buildPythonPackage rec {
     hash = "sha256-Vj780rP5rJ+YsMWlb3BR9LTKT/nTt0C2H3J0X9sysj8=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     aiofiles
     aioquic
@@ -76,44 +79,34 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [
     "--asyncio-mode=auto"
+    "-vvv"
   ];
 
   disabledTests = [
     # Require networking
     "test_full_message"
-    # Fails to parse cmdline arguments
-    "test_dev"
-    "test_auto_reload"
-    "test_host_port_ipv6_loopback"
+    # Server mode mismatch (debug vs production)
     "test_num_workers"
-    "test_debug"
-    "test_access_logs"
-    "test_noisy_exceptions"
-    # OSError: foo
-    "test_bad_headers"
-    "test_create_server_trigger_events"
-    "test_json_body_requests"
-    "test_missing_startup_raises_exception"
-    "test_no_body_requests"
-    "test_oserror_warning"
-    "test_running_multiple_offset_warning"
-    "test_streaming_body_requests"
-    "test_trigger_before_events_create_server"
-    "test_keep_alive_connection_context"
     # Racy tests
     "test_keep_alive_client_timeout"
     "test_keep_alive_server_timeout"
     "test_zero_downtime"
-    # TLS tests
-    "test_missing_sni"
-    "test_no_matching_cert"
-    "test_wildcards"
-    # They thtow execptions
+    # sanic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory
     "test_load_app_simple"
-    "worker/test_loader.py"
-    # broke with ujson 5.4 upgrade
-    # https://github.com/sanic-org/sanic/pull/2504
-    "test_json_response_json"
+    # create defunct python processes
+    "test_reloader_live"
+    "test_reloader_live_with_dir"
+    "test_reload_listeners"
+    # crash the python interpreter
+    "test_host_port_localhost"
+    "test_host_port"
+    "test_server_run"
+    # NoneType object is not subscriptable
+    "test_serve_app_implicit"
+    # AssertionError: assert [] == ['Restarting a process', 'Begin restart termination', 'Starting a process']
+    "test_default_reload_shutdown_order"
+    # App not found.
+    "test_input_is_dir"
   ];
 
   disabledTestPaths = [

From 4fbd48d2dcf7cda16feeb654f302e43d8b0c654d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 18:34:00 +0100
Subject: [PATCH 872/953] python3Packages.qutip: Pass ipython into checkInputs

and expose ipython extra.
---
 pkgs/development/python-modules/qutip/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 1b8c1b8bf382..1a96fc947b45 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -6,6 +6,7 @@
 , cython
 , doCheck ? true
 , fetchFromGitHub
+, ipython
 , matplotlib
 , numpy
 , packaging
@@ -43,7 +44,7 @@ buildPythonPackage rec {
   checkInputs = [
     pytestCheckHook
     pytest-rerunfailures
-  ] ++ passthru.optional-dependencies.graphics;
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   # Disabling OpenMP support on Darwin.
   setupPyGlobalFlags = lib.optionals (!stdenv.isDarwin) [
@@ -75,6 +76,9 @@ buildPythonPackage rec {
     graphics = [
       matplotlib
     ];
+    ipython = [
+      ipython
+    ];
     semidefinite = [
       cvxpy
       cvxopt

From 915fd5f93cd3ffbf0eb3f629b3dd2edfed56f5c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 22:33:31 +0100
Subject: [PATCH 873/953] python3Packages.sqlalchemy: 1.4.45 -> 1.4.46

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

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 989d0380f7a4..a517b3583687 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.4.45"; # TODO: check python3Packages.fastapi when updating to >= 1.4.42
+  version = "1.4.46";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/WmFCGAJOj9p/v4KtW0EHt/f4YUQtT2aLq7LovFfp5U=";
+    hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
   };
 
   nativeBuildInputs = lib.optionals (!isPyPy) [

From 0cee035e0706d9a34deeea0e3060e474442d929d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 22:47:03 +0100
Subject: [PATCH 874/953] python3Packages.pyunifiprotect: Fix version, fix
 tests

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

diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index 9d5a28994986..9cf127b506dc 100644
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -10,6 +10,7 @@
 , packaging
 , pillow
 , poetry-core
+, py
 , pydantic
 , pyjwt
 , pytest-aiohttp
@@ -22,6 +23,7 @@
 , pythonOlder
 , pytz
 , setuptools
+, setuptools-scm
 , termcolor
 , typer
 , ffmpeg
@@ -46,8 +48,11 @@ buildPythonPackage rec {
       --replace "--cov=pyunifiprotect --cov-append" ""
   '';
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
   ];
 
   propagatedBuildInputs = [
@@ -74,6 +79,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     ffmpeg # Required for command ffprobe
+    py
     pytest-aiohttp
     pytest-asyncio
     pytest-benchmark

From 6d0a0fda793828a3f51f281751c1ffe91c6b3d5b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jan 2023 22:54:24 +0100
Subject: [PATCH 875/953] python3Packages.pynndescent: Fix skbuild 1.2.0 compat

---
 .../python-modules/pynndescent/default.nix          | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix
index 725a2dbcf43b..18775d0facf5 100644
--- a/pkgs/development/python-modules/pynndescent/default.nix
+++ b/pkgs/development/python-modules/pynndescent/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , importlib-metadata
 , joblib
 , llvmlite
@@ -23,6 +24,18 @@ buildPythonPackage rec {
     hash = "sha256-p8VSVpv2BKEB/VS7odJ8EjieBllF3uOmd3pRjGOkbys=";
   };
 
+  patches = [
+    # Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207
+    (fetchpatch {
+      url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch";
+      hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c=";
+    })
+    (fetchpatch {
+      url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch";
+      hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y=";
+    })
+  ];
+
   propagatedBuildInputs = [
     joblib
     llvmlite

From 4469b2ad1a1b4f2884e53906f0a8cca351eba87f Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Wed, 4 Jan 2023 00:35:10 +0100
Subject: [PATCH 876/953] python3Packages.chia-rs: fix build

---
 .../python-modules/chia-rs/Cargo.lock         | 937 ++++++++++++++++--
 .../python-modules/chia-rs/default.nix        |   5 +
 .../python-modules/chia-rs/fix-build.patch    |  12 +
 3 files changed, 853 insertions(+), 101 deletions(-)
 create mode 100644 pkgs/development/python-modules/chia-rs/fix-build.patch

diff --git a/pkgs/development/python-modules/chia-rs/Cargo.lock b/pkgs/development/python-modules/chia-rs/Cargo.lock
index 96fc3236f142..ad3755638df3 100644
--- a/pkgs/development/python-modules/chia-rs/Cargo.lock
+++ b/pkgs/development/python-modules/chia-rs/Cargo.lock
@@ -2,6 +2,38 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anyhow"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
+
+[[package]]
+name = "atomic-polyfill"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
+dependencies = [
+ "critical-section",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -16,9 +48,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitvec"
-version = "0.22.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
  "radium",
@@ -36,10 +68,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "bls12_381"
-version = "0.5.0"
+name = "block-buffer"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bls12_381"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62250ece575fa9b22068b3a8d59586f01d426dd7785522efd97632959e71c986"
 dependencies = [
  "ff",
  "group",
@@ -49,10 +90,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "bumpalo"
-version = "3.10.0"
+name = "bls12_381_plus"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+checksum = "c7c681aa947677ec0c5ccfa6f14c0dd039ddbaa7b12952bf146bd5226a5f9880"
+dependencies = [
+ "digest 0.9.0",
+ "ff",
+ "group",
+ "heapless",
+ "pairing",
+ "rand_core",
+ "serde",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
 
 [[package]]
 name = "byteorder"
@@ -60,6 +118,12 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -68,31 +132,76 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chia"
-version = "0.1.5"
+version = "0.1.15"
 dependencies = [
+ "chia-protocol",
+ "clvm-utils",
  "clvmr",
  "hex",
  "num-traits",
  "pyo3",
- "serde",
+]
+
+[[package]]
+name = "chia-bls"
+version = "0.1.15"
+dependencies = [
+ "anyhow",
+ "bls12_381_plus",
+ "criterion",
+ "group",
+ "hex",
+ "hkdf",
+ "num-bigint",
+ "rand",
+ "sha2 0.9.9",
+ "tiny-bip39",
+]
+
+[[package]]
+name = "chia-protocol"
+version = "0.1.15"
+dependencies = [
+ "chia_py_streamable_macro",
+ "chia_streamable_macro",
+ "clvmr",
+ "hex",
+ "pyo3",
+ "sha2 0.10.2",
+]
+
+[[package]]
+name = "chia_py_streamable_macro"
+version = "0.1.2"
+dependencies = [
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "chia_rs"
-version = "0.1.5"
+version = "0.1.16"
 dependencies = [
  "chia",
+ "chia-protocol",
+ "chia_py_streamable_macro",
+ "chia_streamable_macro",
  "clvmr",
  "hex",
- "py_streamable",
  "pyo3",
- "serde",
- "sha2",
+]
+
+[[package]]
+name = "chia_streamable_macro"
+version = "0.2.3"
+dependencies = [
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "chia_wasm"
-version = "0.1.5"
+version = "0.1.15"
 dependencies = [
  "chia",
  "wasm-bindgen",
@@ -100,10 +209,65 @@ dependencies = [
 ]
 
 [[package]]
-name = "clvmr"
-version = "0.1.20"
+name = "ciborium"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d18d68c7f9e8e08ea66a6673bec83100bd53103a9d504fe279147bd0a79b260c"
+checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "3.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+dependencies = [
+ "bitflags",
+ "clap_lex",
+ "indexmap",
+ "textwrap",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "clvm-utils"
+version = "0.1.15"
+dependencies = [
+ "clvmr",
+]
+
+[[package]]
+name = "clvmr"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5e907612d322d0d7def6b0ecb3ad681f6af2db106bcfabe4153746c60ef9e4"
 dependencies = [
  "bls12_381",
  "hex",
@@ -111,10 +275,7 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "pyo3",
- "sha2",
- "wasm-bindgen",
- "wasm-bindgen-test",
+ "sha2 0.10.2",
 ]
 
 [[package]]
@@ -129,18 +290,123 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.1.5"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "ctor"
-version = "0.1.22"
+name = "criterion"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+dependencies = [
+ "anes",
+ "atty",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "critical-section"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "crypto-mac"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
 dependencies = [
  "quote",
  "syn",
@@ -156,10 +422,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "ff"
-version = "0.10.1"
+name = "digest"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+dependencies = [
+ "block-buffer 0.10.3",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "either"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+
+[[package]]
+name = "ff"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
  "bitvec",
  "rand_core",
@@ -168,25 +451,36 @@ dependencies = [
 
 [[package]]
 name = "funty"
-version = "1.2.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "generic-array"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
 dependencies = [
  "typenum",
  "version_check",
 ]
 
 [[package]]
-name = "ghost"
-version = "0.1.5"
+name = "getrandom"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93490550b1782c589a350f2211fff2e34682e25fed17ef53fc4fa8fe184975e"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "ghost"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -195,9 +489,9 @@ dependencies = [
 
 [[package]]
 name = "group"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912"
+checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d"
 dependencies = [
  "byteorder",
  "ff",
@@ -205,12 +499,94 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hash32"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "heapless"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
+dependencies = [
+ "atomic-polyfill",
+ "hash32",
+ "rustc_version",
+ "spin",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hkdf"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
+dependencies = [
+ "digest 0.9.0",
+ "hmac 0.11.0",
+]
+
+[[package]]
+name = "hmac"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+dependencies = [
+ "crypto-mac",
+ "digest 0.9.0",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
 [[package]]
 name = "indoc"
 version = "0.3.6"
@@ -265,6 +641,21 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+
 [[package]]
 name = "js-sys"
 version = "0.3.52"
@@ -282,15 +673,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -306,10 +697,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "num-bigint"
-version = "0.4.0"
+name = "memoffset"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -318,9 +718,9 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg",
  "num-traits",
@@ -328,18 +728,34 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.13.0"
+name = "num_cpus"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "opaque-debug"
@@ -348,10 +764,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
-name = "pairing"
-version = "0.20.0"
+name = "os_str_bytes"
+version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
+[[package]]
+name = "pairing"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b"
 dependencies = [
  "group",
 ]
@@ -369,9 +791,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
  "cfg-if",
  "instant",
@@ -400,6 +822,49 @@ dependencies = [
  "proc-macro-hack",
 ]
 
+[[package]]
+name = "pbkdf2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+dependencies = [
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "plotters"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.19"
@@ -408,21 +873,13 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.42"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "py_streamable"
-version = "0.1.0"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "pyo3"
 version = "0.15.1"
@@ -474,24 +931,70 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "radium"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
 
 [[package]]
 name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rayon"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
 
 [[package]]
 name = "redox_syscall"
@@ -503,10 +1006,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "scoped-tls"
-version = "1.0.0"
+name = "regex"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "scopeguard"
@@ -515,19 +1063,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
-name = "serde"
-version = "1.0.140"
+name = "semver"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
+checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+
+[[package]]
+name = "serde"
+version = "1.0.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.140"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -535,23 +1089,60 @@ dependencies = [
 ]
 
 [[package]]
-name = "sha2"
-version = "0.9.5"
+name = "serde_json"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
 dependencies = [
- "block-buffer",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
  "cfg-if",
  "cpufeatures",
- "digest",
+ "digest 0.9.0",
  "opaque-debug",
 ]
 
 [[package]]
-name = "smallvec"
-version = "1.9.0"
+name = "sha2"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "spin"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "subtle"
@@ -561,15 +1152,27 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-xid",
+]
+
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -577,22 +1180,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
-name = "typenum"
-version = "1.15.0"
+name = "textwrap"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+
+[[package]]
+name = "thiserror"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tiny-bip39"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
+dependencies = [
+ "anyhow",
+ "hmac 0.12.1",
+ "once_cell",
+ "pbkdf2",
+ "rand",
+ "rustc-hash",
+ "sha2 0.10.2",
+ "thiserror",
+ "unicode-normalization",
+ "wasm-bindgen",
+ "zeroize",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.2"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unindent"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44"
+checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112"
 
 [[package]]
 name = "version_check"
@@ -600,6 +1288,23 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "walkdir"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+dependencies = [
+ "same-file",
+ "winapi",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.75"
@@ -716,6 +1421,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -724,9 +1438,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "wyz"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 dependencies = [
  "tap",
 ]
+
+[[package]]
+name = "zeroize"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix
index 0e52842dce9e..36c62153b8b8 100644
--- a/pkgs/development/python-modules/chia-rs/default.nix
+++ b/pkgs/development/python-modules/chia-rs/default.nix
@@ -16,6 +16,11 @@ buildPythonPackage rec {
     sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8=";
   };
 
+  patches = [
+    # undo a hack from upstream that confuses our build hook
+    ./fix-build.patch
+  ];
+
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
   };
diff --git a/pkgs/development/python-modules/chia-rs/fix-build.patch b/pkgs/development/python-modules/chia-rs/fix-build.patch
new file mode 100644
index 000000000000..cf793f78a744
--- /dev/null
+++ b/pkgs/development/python-modules/chia-rs/fix-build.patch
@@ -0,0 +1,12 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -1,8 +1,5 @@
+-# the "wheel" crate is excluded from the workspace because pyo3 has problems with
+-# "cargo test" and "cargo bench"
+ [workspace]
+-members = ["wasm", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"]
+-exclude = ["wheel"]
++members = ["wasm", "wheel", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"]
+ 
+ [package]
+ name = "chia"

From ac5bf82d8e4df5f861f1928de5c1fbb9bf5aa785 Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Wed, 4 Jan 2023 00:20:37 +0100
Subject: [PATCH 877/953] python3Packages.blspy: 1.0.13 -> 1.0.16

---
 pkgs/development/python-modules/blspy/default.nix    |  4 ++--
 .../blspy/dont_fetch_dependencies.patch              | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix
index d4122dddc8bc..01200a2fae82 100644
--- a/pkgs/development/python-modules/blspy/default.nix
+++ b/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 = [
diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch
index 3184e3f0ea8e..6acc6f878f51 100644
--- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch
+++ b/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)

From f7498f56e134402fb97701edce38b83cc46307ad Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Wed, 4 Jan 2023 00:23:00 +0100
Subject: [PATCH 878/953] python3Packages.chiapos: 1.0.10 -> 1.0.11

---
 .../python-modules/chiapos/dont_fetch_dependencies.patch      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
index 05bd212e9a6c..86dfad747d85 100644
--- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
+++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5d7862b..c2d06a1 100644
+index d1dd25d..96abc65 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
@@ -7,7 +7,7 @@ index 5d7862b..c2d06a1 100644
  FetchContent_Declare(
    pybind11-src
 -  GIT_REPOSITORY https://github.com/pybind/pybind11.git
--  GIT_TAG        v2.7.1
+-  GIT_TAG        v2.10.0
 +  SOURCE_DIR @pybind11_src@
  )
  FetchContent_MakeAvailable(pybind11-src)

From 6946d7b09ca041f82b5e1906c1ee6a75e8ab3bdf Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Wed, 4 Jan 2023 00:23:50 +0100
Subject: [PATCH 879/953] python3Packages.chiavdf: 1.0.7 -> 1.0.8

---
 .../python-modules/chiavdf/dont_fetch_dependencies.patch      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch
index 9b49db81fcf5..1bcea2e68b31 100644
--- a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch
+++ b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c975128..a9f6910 100644
+index fb92c4d..9fa52ef 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -31,8 +31,7 @@ include(FetchContent)
@@ -7,7 +7,7 @@ index c975128..a9f6910 100644
  FetchContent_Declare(
    pybind11-src
 -  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-src)

From fa7dc79e26575ea267a8946447d5c53888c6a16f Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Wed, 4 Jan 2023 00:24:56 +0100
Subject: [PATCH 880/953] python3Packages.clvm-tools-rs: 0.1.19 -> 0.1.25

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

diff --git a/pkgs/development/python-modules/clvm-tools-rs/default.nix b/pkgs/development/python-modules/clvm-tools-rs/default.nix
index 3d88084169a1..0e82989caadb 100644
--- a/pkgs/development/python-modules/clvm-tools-rs/default.nix
+++ b/pkgs/development/python-modules/clvm-tools-rs/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "clvm-tools-rs";
-  version = "0.1.19";
+  version = "0.1.25";
   disabled = pythonOlder "3.7";
   format = "pyproject";
 
@@ -15,13 +15,13 @@ buildPythonPackage rec {
     owner = "Chia-Network";
     repo = "clvm_tools_rs";
     rev = version;
-    sha256 = "sha256-LQbFBZBLUAjyqIAWIn+N8tUrBMskRoKvMMg5gfTyVU8=";
+    sha256 = "sha256-s4AeXoLOtEIxCSnW5CWVZoZrAJ+wKQPklEehPAvnHMw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    sha256 = "sha256-LcDWpMM+PUElsXO82H6QVOp338+NduC/j3pXQKSni3I=";
+    sha256 = "sha256-4SjSpEMu6NAPn50u7iyAznTw4AL4+KmBvppMV4+w6Jk=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 87208cc09e19cee4a8d65e47de43f86258e9b5ca Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Wed, 4 Jan 2023 00:25:45 +0100
Subject: [PATCH 881/953] python3Packages.clvm-tools: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix
index 7de885cc7384..4d4f3631595c 100644
--- a/pkgs/development/python-modules/clvm-tools/default.nix
+++ b/pkgs/development/python-modules/clvm-tools/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "clvm_tools";
-  version = "0.4.5";
+  version = "0.4.6";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Chia-Network";
     repo = "clvm_tools";
     rev = version;
-    sha256 = "sha256-7FUZh9w6AM+7l7Br9V/ovS/1H62BLoas5gCrbeMvBAc=";
+    sha256 = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U=";
   };
 
   nativeBuildInputs = [

From 301620319bb54cbe41084095859ac04f4a4e3b1a Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Wed, 4 Jan 2023 00:27:15 +0100
Subject: [PATCH 882/953] chia: 1.6.0 -> 1.6.2

---
 .../applications/blockchains/chia/default.nix | 10 +++------
 .../blockchains/chia/dont_lock_in_store.patch | 21 -------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/chia/dont_lock_in_store.patch

diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix
index 33ce321cb4c6..bae0fc7988d9 100644
--- a/pkgs/applications/blockchains/chia/default.nix
+++ b/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
diff --git a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch b/pkgs/applications/blockchains/chia/dont_lock_in_store.patch
deleted file mode 100644
index f923b11801a1..000000000000
--- a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch
+++ /dev/null
@@ -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)

From 94a295ea7bc5410cf7bea6af2c35aa2719c34556 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 00:48:47 +0100
Subject: [PATCH 883/953] python3Packages.flask-restx: Add py to checkInputs

---
 pkgs/development/python-modules/flask-restx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix
index 6f7c83010eb1..f68b41e45b69 100644
--- a/pkgs/development/python-modules/flask-restx/default.nix
+++ b/pkgs/development/python-modules/flask-restx/default.nix
@@ -10,6 +10,7 @@
 , faker
 , mock
 , blinker
+, py
 , pytest-flask
 , pytest-mock
 , pytest-benchmark
@@ -43,6 +44,7 @@ buildPythonPackage rec {
     blinker
     faker
     mock
+    py
     pytest-benchmark
     pytest-flask
     pytest-mock

From 5790ed9ff54b736749232f13f40ce7a5c3086906 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 01:59:54 +0100
Subject: [PATCH 884/953] python3Packages.setuptools-scm: set format in
 passthru test

---
 pkgs/development/python-modules/setuptools-scm/tests.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/setuptools-scm/tests.nix b/pkgs/development/python-modules/setuptools-scm/tests.nix
index b90797abf7eb..c81323b27fa4 100644
--- a/pkgs/development/python-modules/setuptools-scm/tests.nix
+++ b/pkgs/development/python-modules/setuptools-scm/tests.nix
@@ -10,6 +10,7 @@
 buildPythonPackage rec {
   pname = "setuptools-scm-tests";
   inherit (setuptools-scm) version;
+  format = "other";
 
   src = setuptools-scm.src;
 

From 5a0ee9d54d29751a043ea0326694ea37f69d1c36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 02:03:36 +0100
Subject: [PATCH 885/953] home-assistant: pin pymodbus at 2.5.3

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

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 9b7f66f4a020..d8ca4527dda2 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -117,6 +117,16 @@ let
         };
       });
 
+      pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec {
+        version = "2.5.3";
+        src = fetchFromGitHub {
+          owner = "riptideio";
+          repo = "pymodbus";
+          rev= "refs/tags/v${version}";
+          hash = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4=";
+        };
+      });
+
       python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
         pname = "python-slugify";
         version = "4.0.1";

From 0c72b4a513a642157fe426efc9d75de3f9fd50d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 02:24:36 +0100
Subject: [PATCH 886/953] python3Packages.gipc: relax gevent constraint, enable
 tests

---
 .../python-modules/gipc/default.nix           | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index 85d17ee3ab8a..84743d8606c3 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -1,19 +1,34 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , gevent
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "gipc";
   version = "1.4.0";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo=";
+  src = fetchFromGitHub {
+    owner = "jgehrcke";
+    repo = "gipc";
+    rev = "refs/tags/${version}";
+    hash = "sha256-T5TqLanODyzJGyjDZz+75bbz3THxoobYnfJFQxAB76E=";
   };
 
-  propagatedBuildInputs = [ gevent ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "gevent>=1.5,<=21.12.0" "gevent>=1.5"
+  '';
+
+  propagatedBuildInputs = [
+    gevent
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "gevent-cooperative child processes and IPC";

From 62adfb854793ac10dc7ae209e672b34bae148d28 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 02:48:02 +0100
Subject: [PATCH 887/953] fixup! python3Packages.gremlinpython: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix
index 2248bc806b06..b62b73283097 100644
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@@ -6,7 +6,6 @@
 , importlib-metadata
 , isodate
 , nest-asyncio
-, six
 , pytestCheckHook
 , mock
 , pyhamcrest
@@ -31,19 +30,20 @@ buildPythonPackage rec {
     sed -i '/pytest-runner/d' setup.py
 
     substituteInPlace setup.py \
-      --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp'
+      --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \
+      --replace 'importlib-metadata<5.0.0' 'importlib-metadata'
   '';
 
   # setup-requires requirements
   nativeBuildInputs = [
     importlib-metadata
   ];
+
   propagatedBuildInputs = [
     aenum
     aiohttp
     isodate
     nest-asyncio
-    six
   ];
 
   checkInputs = [

From 556b0dbafd0c1534fbf7ad55b201613dc896a96b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 03:06:48 +0100
Subject: [PATCH 888/953] catt: Fix duplicate hashes

---
 pkgs/applications/video/catt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix
index 4a19121f34ad..7e1157fc4a67 100644
--- a/pkgs/applications/video/catt/default.nix
+++ b/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=";
         };
       });
     };

From 17ca33ffcc611f21daff4e646864bdd54a035ae3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 03:07:06 +0100
Subject: [PATCH 889/953] conan: Fix duplicate hash

---
 pkgs/development/tools/build-managers/conan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index a72106ace3c4..803476e3f98c 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -25,7 +25,7 @@ let newPython = python3.override {
       version = "1.5.0";
       src = oldAttrs.src.override {
         inherit version;
-        sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f";
+        hash = "sha256-Dlh1auOPvY/DAg1UutuOrhfFudy+04ixe7Vbilko35I=";
       };
     });
   };

From 355841cf36059e22a8636d9363240b260f3d736f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 15:24:04 +0100
Subject: [PATCH 890/953] python3Packages.pytoolconfig: init at 1.2.4

---
 .../python-modules/pytoolconfig/default.nix   | 99 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 101 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytoolconfig/default.nix

diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix
new file mode 100644
index 000000000000..c3d1d66f7bc6
--- /dev/null
+++ b/pkgs/development/python-modules/pytoolconfig/default.nix
@@ -0,0 +1,99 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pythonOlder
+
+# build
+, pdm-pep517
+
+# docs
+, docutils
+, sphinxHook
+, sphinx-rtd-theme
+, sphinx-autodoc-typehints
+
+# runtime
+, tomli
+, packaging
+
+# optionals
+, pydantic
+, platformdirs
+, sphinx
+, tabulate
+
+# tests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pytoolconfig";
+  version = "1.2.4";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "bagel897";
+    repo = "pytoolconfig";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-UdBPp9Ur3+hYn2CBY91jK1hT/GHyA8qbQ3w0OuLBrFU=";
+  };
+
+  outputs = [
+    "out"
+    "doc"
+  ];
+
+  PDM_PEP517_SCM_VERSION = version;
+
+  nativeBuildInputs = [
+    pdm-pep517
+
+    # docs
+    docutils
+    sphinx-autodoc-typehints
+    sphinx-rtd-theme
+    sphinxHook
+  ] ++ passthru.optional-dependencies.doc;
+
+  patches = [
+    (fetchpatch {
+      # Fix documentation build
+      url = "https://github.com/bagel897/pytoolconfig/commit/c8a010842d738242d6bb8deb28ecd62342a60e03.patch";
+      hash = "sha256-hYcPjQeHYGtSPy363RVS5YgQ+obJQuC+Q9ZuOGvKRAY=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "packaging>=22.0" "packaging"
+  '';
+
+  propagatedBuildInputs = [
+    packaging
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
+
+  passthru.optional-dependencies = {
+    validation = [ pydantic ];
+    global = [ platformdirs ];
+    doc = [ sphinx tabulate ];
+  };
+
+  pythonImportsCheck = [
+    "pytoolconfig"
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  meta = with lib; {
+    changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}";
+    description = "Python tool configuration";
+    homepage = "https://github.com/bagel897/pytoolconfig";
+    license = licenses.lgpl3Only;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3e041e8fb2e..868b6ff76c12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8461,6 +8461,8 @@ self: super: with self; {
 
   pypykatz = callPackage ../development/python-modules/pypykatz { };
 
+  pytoolconfig = callPackage ../development/python-modules/pytoolconfig { };
+
   pypytools = callPackage ../development/python-modules/pypytools { };
 
   pyqldb = callPackage ../development/python-modules/pyqldb { };

From 0d39ee269923df9021ba42bed67f0bf77f9d775a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 15:53:10 +0100
Subject: [PATCH 891/953] python3Packages.cherryp: Disable failing tests

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

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index b94f30a2c758..c438e9e12cf4 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/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"
   ];

From 4ce2a8eb26813da8c3d3cab64dcb9367556cc60a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 16:40:03 +0100
Subject: [PATCH 892/953] python3Packages.rope: 0.18.0 -> 1.6.0

---
 .../python-modules/rope/default.nix           | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index 21d5886efe21..89772638ae39 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -1,28 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytoolconfig
+, pytestCheckHook
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "rope";
-  version = "0.18.0";
+  version = "1.6.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";
+    hash = "sha256-kxrqFUNlVWp9qsAcvOzgycEYdVv/98ZaskK2lYUWfso=";
   };
 
-  patches = [
-    # Python 3.9 ast changes
-    (fetchpatch {
-      url = "https://github.com/python-rope/rope/pull/333.patch";
-      excludes = [ ".github/workflows/main.yml" ];
-      sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0";
-    })
+  nativeBuildInputs = [
+    setuptools
   ];
 
-  checkInputs = [ nose ];
-  checkPhase = ''
-    # tracked upstream here https://github.com/python-rope/rope/issues/247
-    NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest
-  '';
+  propagatedBuildInputs = [
+    pytoolconfig
+  ] ++ pytoolconfig.optional-dependencies.global;
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    "test_search_submodule"
+    "test_get_package_source_pytest"
+    "test_get_modname_folder"
+  ];
 
   meta = with lib; {
     description = "Python refactoring library";

From 7ecacc518fd046f877cb400639836ea28be44429 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 16:47:52 +0100
Subject: [PATCH 893/953] python3Packages.pyproject-hooks: init at 1.0.0

---
 .../pyproject-hooks/default.nix               | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyproject-hooks/default.nix

diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix
new file mode 100644
index 000000000000..dd882531105b
--- /dev/null
+++ b/pkgs/development/python-modules/pyproject-hooks/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flit-core
+, pytestCheckHook
+, pythonOlder
+, setuptools
+, testpath
+, tomli
+}:
+
+buildPythonPackage rec {
+  pname = "pyproject-hooks";
+  version = "1.0.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi rec {
+    pname = "pyproject_hooks";
+    inherit version;
+    hash = "sha256-8nGymLl/WVXVP7ErcsH7GUjCLBprcLMVxUztrKAmTvU=";
+  };
+
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  propagatedBuildInputs = [
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    setuptools
+    testpath
+  ];
+
+  disabledTests = [
+    # fail to import setuptools
+    "test_setup_py"
+    "test_issue_104"
+  ];
+
+  pythonImportsCheck = [
+    "pyproject_hooks"
+  ];
+
+  meta = with lib; {
+    description = "Low-level library for calling build-backends in `pyproject.toml`-based project ";
+    homepage = "https://github.com/pypa/pyproject-hooks";
+    changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 868b6ff76c12..a2e0a7d2f030 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6967,6 +6967,8 @@ self: super: with self; {
 
   pyproject-api = callPackage ../development/python-modules/pyproject-api { };
 
+  pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { };
+
   pypsrp = callPackage ../development/python-modules/pypsrp { };
 
   phpserialize = callPackage ../development/python-modules/phpserialize { };

From f3ed60d37bc13ad8a767ca0998d7ab9041633945 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 16:50:02 +0100
Subject: [PATCH 894/953] python3Packages.installer: 0.5.1 -> 0.6.0

Diff: https://github.com/pradyunsg/installer/compare/0.5.1...0.6.0
---
 pkgs/development/python-modules/installer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
index 8749ea16132d..e442e0d48d3f 100644
--- a/pkgs/development/python-modules/installer/default.nix
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "installer";
-  version = "0.5.1";
+  version = "0.6.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pradyunsg";
     repo = pname;
     rev = version;
-    sha256 = "sha256-vhZYUhUcD5fnjkyEqFMvggVGH9Ri8iNgqRgSBQTOCtM=";
+    sha256 = "sha256-IXznSrc/4LopgZDGFSC6cAOCbts+siKpdl5SvN1FFvA=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 0ad81bc718d197c4eae6e5a6a085c51cc6e5f3b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 16:50:56 +0100
Subject: [PATCH 895/953] pdm: 2.1.5 -> 2.3.4

https://github.com/pdm-project/pdm/releases/tag/2.2.0
https://github.com/pdm-project/pdm/releases/tag/2.2.1
https://github.com/pdm-project/pdm/releases/tag/2.3.0
https://github.com/pdm-project/pdm/releases/tag/2.3.1
https://github.com/pdm-project/pdm/releases/tag/2.3.2
https://github.com/pdm-project/pdm/releases/tag/2.3.3
https://github.com/pdm-project/pdm/releases/tag/2.3.4
---
 pkgs/tools/package-management/pdm/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index 5b98582a1dff..9af953d2365e 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -8,12 +8,12 @@ let
     # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738
     packageOverrides = self: super: {
       resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec {
-        version = "0.8.1";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "sarugaku";
           repo = "resolvelib";
-          rev = version;
-          sha256 = "sha256-QDHEdVET7HN2ZCKxNUMofabR+rxJy0erWhNQn94D7eI=";
+          rev = "/refs/tags/${version}";
+          hash = "sha256-xzu8sMNMihJ80vezMdGkOT5Etx08qy3T/TkEn5EAY48=";
         };
       });
     };
@@ -24,13 +24,13 @@ in
 with python.pkgs;
 buildPythonApplication rec {
   pname = "pdm";
-  version = "2.1.5";
+  version = "2.3.4";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-W+5B1JfOyTpJaT+le1zxyDNwGATrErxNNHw+x5VdfOc=";
+    hash = "sha256-zaSNM5Ey4oI2MtUPYBHG0PCMgJdasVatwkjaRBrT1RQ=";
   };
 
   propagatedBuildInputs = [
@@ -44,6 +44,7 @@ buildPythonApplication rec {
     pep517
     pip
     platformdirs
+    pyproject-hooks
     python-dotenv
     requests-toolbelt
     resolvelib

From 658b24a851f77c46bb11d8f515ee6962003f0462 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 17:05:51 +0100
Subject: [PATCH 896/953] python3Packages.cramjam: 2.4.0 -> 2.6.2.post1

---
 .../python-modules/cramjam/default.nix        | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix
index a88cc233ad56..b132a0d02a7b 100644
--- a/pkgs/development/python-modules/cramjam/default.nix
+++ b/pkgs/development/python-modules/cramjam/default.nix
@@ -5,9 +5,11 @@
 , stdenv
 , libiconv
 , brotli
+, hypothesis
 , lz4
 , memory_profiler
 , numpy
+, py
 , pytest-benchmark
 , pytestCheckHook
 , python-snappy
@@ -16,39 +18,52 @@
 
 buildPythonPackage rec {
   pname = "cramjam";
-  version = "2.4.0";
+  version = "2.6.2.post1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "milesgranger";
     repo = "pyrus-cramjam";
-    rev = "v${version}";
-    sha256 = "sha256-00KvbiTf8PxYWljLKTRZmPIAbb+PnBleDM4p0AzZhHw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-KU1JVNEQJadXNiIWTvI33N2NSq994xoKxcAGGezFjaI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    sha256 = "sha256-4y/jeEZjVUbaXtBx5l3Hrbnj3iNYX089K4xexRP+5v0=";
+    hash = "sha256-w1bEf+etLgR/YOyLmC3lFtO9fqAx8z2aul/XIKUQb5k=";
   };
 
   nativeBuildInputs = with rustPlatform; [
     cargoSetupHook
     maturinBuildHook
   ];
+
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 
   checkInputs = [
     brotli
+    hypothesis
     lz4
     memory_profiler
     numpy
+    py
     pytest-benchmark
     pytestCheckHook
     python-snappy
     zstd
   ];
-  pytestFlagsArray = [ "--benchmark-disable" ];
-  pythonImportsCheck = [ "cramjam" ];
+
+  pytestFlagsArray = [
+    "--benchmark-disable"
+  ];
+
+  disabledTestPaths = [
+    "benchmarks/test_bench.py"
+  ];
+
+  pythonImportsCheck = [
+    "cramjam"
+  ];
 
   meta = with lib; {
     description = "Thin Python bindings to de/compression algorithms in Rust";

From be0230a9d6e85994b9b34b3b0fac8f773751c037 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 18:13:11 +0100
Subject: [PATCH 897/953] python3Packages.authcaptureproxy: Remove outdated
 postPatch hook

---
 .../python-modules/authcaptureproxy/default.nix           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix
index d4a71d639c73..63bc42c5c4b2 100644
--- a/pkgs/development/python-modules/authcaptureproxy/default.nix
+++ b/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
   ];

From f411d20ab6c79309a8fbd5b23800f07e66d0ff59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 18:19:27 +0100
Subject: [PATCH 898/953] python3Packages.sqlalchemy-i18n: Propgate six

---
 pkgs/development/python-modules/sqlalchemy-i18n/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix
index 83d813b3dbd9..a17e7ada4522 100644
--- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , sqlalchemy
 , sqlalchemy-utils
+, six
 }:
 
 buildPythonPackage rec {
@@ -17,6 +18,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     sqlalchemy
     sqlalchemy-utils
+    six
   ];
 
   # tests require running a postgresql server

From 998f4d139c26ca2ae809dbe0f8f218f0a33e1304 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 18:40:31 +0100
Subject: [PATCH 899/953] python3Packages.hatch-jupyter-builder: init at 0.8.2

---
 .../hatch-jupyter-builder/default.nix         | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/hatch-jupyter-builder/default.nix

diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
new file mode 100644
index 000000000000..de962e6b9585
--- /dev/null
+++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, hatchling
+, hatch
+, pytest-mock
+, pytestCheckHook
+, tomli
+, twine
+}:
+
+buildPythonPackage rec {
+  pname = "hatch-jupyter-builder";
+  version = "0.8.2";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jupyterlab";
+    repo = "hatch-jupyter-builder";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Ns5jrVfTAA7NuvUok3/13nIpXSSVZ6WRkgHyTuxkSKA=";
+  };
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  checkInputs = [
+    hatch
+    pytest-mock
+    pytestCheckHook
+    tomli
+    twine
+  ];
+
+  disabledTests = [
+    # tests pip install, which unsuprisingly fails
+    "test_hatch_build"
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/jupyterlab/hatch-jupyter-builder/releases/tag/v${version}";
+    description = "hatch plugin to help build Jupyter packages";
+    homepage = "https://github.com/jupyterlab/hatch-jupyter-builder";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2e0a7d2f030..e376a310a0c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4187,6 +4187,8 @@ self: super: with self; {
 
   hatch-fancy-pypi-readme = callPackage ../development/python-modules/hatch-fancy-pypi-readme { };
 
+  hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { };
+
   hatch-vcs = callPackage ../development/python-modules/hatch-vcs { };
 
   hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { };

From d41ca8be7b46794b80e9a0b9cf665be2267f0063 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 23:49:54 +0100
Subject: [PATCH 900/953] python3Packages.rfc3986-validator: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/rfc3986-validator/default.nix b/pkgs/development/python-modules/rfc3986-validator/default.nix
new file mode 100644
index 000000000000..793eb2f9fe22
--- /dev/null
+++ b/pkgs/development/python-modules/rfc3986-validator/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, hypothesis
+, rfc3987
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "rfc3986-validator";
+  version = "0.1.1";
+  format = "setuptools";
+
+  src = fetchPypi {
+    pname = "rfc3986_validator";
+    inherit version;
+    hash = "sha256-PUS955IbO57Drk463KNwQ47M68Z2RWRJsUXVM7JA0FU=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'," ""
+  '';
+
+  checkInputs = [
+    hypothesis
+    pytestCheckHook
+    rfc3987
+  ];
+
+  meta = with lib; {
+    description = "Pure python rfc3986 validator";
+    homepage = "https://github.com/naimetti/rfc3986-validator";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e376a310a0c5..ad19b0a27071 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9876,6 +9876,8 @@ self: super: with self; {
 
   rfc3986 = callPackage ../development/python-modules/rfc3986 { };
 
+  rfc3986-validator = callPackage ../development/python-modules/rfc3986-validator { };
+
   rfc3987 = callPackage ../development/python-modules/rfc3987 { };
 
   rfc6555 = callPackage ../development/python-modules/rfc6555 { };

From 456cf812715ba11af7c7374171358b1cb2c7c619 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Jan 2023 23:53:12 +0100
Subject: [PATCH 901/953] python3Packages.jsonschema: Expose
 optional-dependencies

---
 .../python-modules/jsonschema/default.nix     | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index 833a76399edd..7ac7a40d32b0 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -11,6 +11,17 @@
 , pythonOlder
 , twisted
 , typing-extensions
+
+# optionals
+, fqdn
+, idna
+, isoduration
+, jsonpointer
+, rfc3339-validator
+, rfc3986-validator
+, rfc3987
+, uri-template
+, webcolors
 }:
 
 buildPythonPackage rec {
@@ -45,6 +56,29 @@ buildPythonPackage rec {
     importlib-resources
   ];
 
+  passthru.optional-dependencies = {
+    format = [
+      fqdn
+      idna
+      isoduration
+      jsonpointer
+      rfc3339-validator
+      rfc3987
+      uri-template
+      webcolors
+    ];
+    format-nongpl = [
+      fqdn
+      idna
+      isoduration
+      jsonpointer
+      rfc3339-validator
+      rfc3986-validator
+      uri-template
+      webcolors
+    ];
+  };
+
   checkInputs = [
     twisted
   ];

From 77c31a20189bb222218af762ef2f1e1840ac0b7d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jan 2023 00:09:29 +0100
Subject: [PATCH 902/953] python3Packages.jupyter-events: init at 0.5.0

---
 .../python-modules/jupyter-events/default.nix | 73 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/development/python-modules/jupyter-events/default.nix

diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix
new file mode 100644
index 000000000000..0bdf4dbf5f78
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-events/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# build
+, hatchling
+
+# runtime
+, jsonschema
+, python-json-logger
+, pyyaml
+, traitlets
+
+# optionals
+, click
+, rich
+
+# tests
+, pytest-asyncio
+, pytest-console-scripts
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter-events";
+  version = "0.5.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jupyter";
+    repo = "jupyter_events";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ak5JNMitxMvXaHPmjMhB58y8Fy8N1oLtqNMNZ9lgpnM=";
+  };
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    jsonschema
+    python-json-logger
+    pyyaml
+    traitlets
+  ]
+  ++ jsonschema.optional-dependencies.format
+  ++ jsonschema.optional-dependencies.format-nongpl;
+
+  passthru.optional-dependencies = {
+    cli = [
+      click
+      rich
+    ];
+  };
+
+  checkInputs = [
+    pytest-asyncio
+    pytest-console-scripts
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  preCheck = ''
+    export PATH="$out/bin:$PATH"
+  '';
+
+  meta = with lib; {
+    changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}";
+    description = "Configurable event system for Jupyter applications and extensions";
+    homepage = "https://github.com/jupyter/jupyter_events";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad19b0a27071..cb4fe047eddd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4936,6 +4936,8 @@ self: super: with self; {
 
   jupyter_core = callPackage ../development/python-modules/jupyter_core { };
 
+  jupyter-events = callPackage ../development/python-modules/jupyter-events { };
+
   jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { };
 
   jupyter_server = callPackage ../development/python-modules/jupyter_server { };

From 6bf557fc682235614949ca833205d5b4de7774d2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jan 2023 00:25:47 +0100
Subject: [PATCH 903/953] python3Packages.jupyter-core: rename from
 jupyter_core

---
 pkgs/applications/editors/jupyter-kernels/octave/default.nix  | 2 +-
 pkgs/applications/science/math/sage/sagelib.nix               | 4 ++--
 pkgs/development/python-modules/ilua/default.nix              | 4 ++--
 pkgs/development/python-modules/jupyter-client/default.nix    | 4 ++--
 .../python-modules/{jupyter_core => jupyter-core}/default.nix | 2 +-
 .../tests_respect_pythonpath.patch                            | 0
 pkgs/development/python-modules/metakernel/default.nix        | 4 ++--
 pkgs/development/python-modules/nbclassic/default.nix         | 4 ++--
 pkgs/development/python-modules/nbconvert/default.nix         | 4 ++--
 pkgs/development/python-modules/nbformat/default.nix          | 4 ++--
 pkgs/development/python-modules/notebook/default.nix          | 4 ++--
 pkgs/development/python-modules/qtconsole/default.nix         | 4 ++--
 pkgs/development/python-modules/vega/default.nix              | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 2 +-
 15 files changed, 24 insertions(+), 23 deletions(-)
 rename pkgs/development/python-modules/{jupyter_core => jupyter-core}/default.nix (97%)
 rename pkgs/development/python-modules/{jupyter_core => jupyter-core}/tests_respect_pythonpath.patch (100%)

diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
index c5265aa255c2..cb814ddbc95a 100644
--- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix
+++ b/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
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 8f864d136928..143e5a2a22b3 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/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
diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix
index 5b5c129c2749..28bc7524fa9e 100644
--- a/pkgs/development/python-modules/ilua/default.nix
+++ b/pkgs/development/python-modules/ilua/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , jupyter_console
-, jupyter_core
+, jupyter-core
 , pygments
 , termcolor
 , txzmq
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jupyter_console
-    jupyter_core
+    jupyter-core
     pygments
     termcolor
     txzmq
diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix
index 11c41677b5ac..23a1f35d2de8 100644
--- a/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , entrypoints
-, jupyter_core
+, jupyter-core
 , hatchling
 , nest-asyncio
 , python-dateutil
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     entrypoints
-    jupyter_core
+    jupyter-core
     nest-asyncio
     python-dateutil
     pyzmq
diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix
similarity index 97%
rename from pkgs/development/python-modules/jupyter_core/default.nix
rename to pkgs/development/python-modules/jupyter-core/default.nix
index 1e540ff6a584..761db23a5ef8 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter-core/default.nix
@@ -9,7 +9,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "jupyter_core";
+  pname = "jupyter-core";
   version = "5.1.1";
   disabled = pythonOlder "3.7";
 
diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch
similarity index 100%
rename from pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch
rename to pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch
diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix
index b7cecc3ba3da..748de6f67541 100644
--- a/pkgs/development/python-modules/metakernel/default.nix
+++ b/pkgs/development/python-modules/metakernel/default.nix
@@ -4,7 +4,7 @@
 , hatchling
 , ipykernel
 , jedi
-, jupyter_core
+, jupyter-core
 , pexpect
 , pythonOlder
 }:
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     ipykernel
     jedi
-    jupyter_core
+    jupyter-core
     pexpect
   ];
 
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index 7065191b1ad1..294898fc4a62 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -6,7 +6,7 @@
 , ipython_genutils
 , jinja2
 , jupyter-client
-, jupyter_core
+, jupyter-core
 , jupyter_server
 , nbconvert
 , nbformat
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     ipython_genutils
     jinja2
     jupyter-client
-    jupyter_core
+    jupyter-core
     jupyter_server
     nbconvert
     nbformat
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 7f994b4682d8..79386e02740b 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -9,7 +9,7 @@
 , importlib-metadata
 , ipywidgets
 , jinja2
-, jupyter_core
+, jupyter-core
 , jupyterlab-pygments
 , lib
 , markupsafe
@@ -66,7 +66,7 @@ in buildPythonPackage rec {
     bleach
     defusedxml
     jinja2
-    jupyter_core
+    jupyter-core
     jupyterlab-pygments
     markupsafe
     mistune
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index c9c66ca33a64..a9dae6b06348 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -6,7 +6,7 @@
 , hatch-nodejs-version
 , fastjsonschema
 , jsonschema
-, jupyter_core
+, jupyter-core
 , traitlets
 , pep440
 , pytestCheckHook
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     fastjsonschema
     jsonschema
-    jupyter_core
+    jupyter-core
     traitlets
   ];
 
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 4e16aa3bdd0f..33e2886606f8 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -12,7 +12,7 @@
 , tornado
 , ipython_genutils
 , traitlets
-, jupyter_core
+, jupyter-core
 , jupyter-client
 , nbformat
 , nbconvert
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
 
   propagatedBuildInputs = [
-    jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
+    jinja2 tornado ipython_genutils traitlets jupyter-core send2trash
     jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
     prometheus-client argon2-cffi
   ];
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 5c618b418931..6eb47d0fd5f1 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ipykernel
-, jupyter_core
+, jupyter-core
 , jupyter-client
 , pygments
 , pyqt5
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     ipykernel
-    jupyter_core
+    jupyter-core
     jupyter-client
     pygments
     pyqt5
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index 9bc875963163..989a26c11d98 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage , fetchPypi, pythonOlder
-, jupyter_core, pandas, ipywidgets, jupyter }:
+, jupyter-core, pandas, ipywidgets, jupyter }:
 
 buildPythonPackage rec {
   pname = "vega";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80=";
   };
 
-  propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ];
+  propagatedBuildInputs = [ jupyter jupyter-core pandas ipywidgets ];
 
   # currently, recommonmark is broken on python3
   doCheck = false;
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 697b6bca59bc..d69cabc379ea 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -107,6 +107,7 @@ mapAliases ({
   itanium_demangler = itanium-demangler; # added 2022-1017
   jinja2_time = jinja2-time; # added 2022-11-07
   jupyter_client = jupyter-client; # added 2021-10-15
+  jupyter_core = jupyter-core; # added 2023-01-05
   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
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb4fe047eddd..f4f81c61ca9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4934,7 +4934,7 @@ self: super: with self; {
 
   jupyter_console = callPackage ../development/python-modules/jupyter_console { };
 
-  jupyter_core = callPackage ../development/python-modules/jupyter_core { };
+  jupyter-core = callPackage ../development/python-modules/jupyter-core { };
 
   jupyter-events = callPackage ../development/python-modules/jupyter-events { };
 

From d97e53aeb0b677964a0b34a5f70ddb4010da6466 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jan 2023 00:42:20 +0100
Subject: [PATCH 904/953] python3Packages.pytest-jupyter: init at 0.6.2

---
 .../python-modules/pytest-jupyter/default.nix | 77 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-jupyter/default.nix

diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix
new file mode 100644
index 000000000000..39a9e7500e61
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-jupyter/default.nix
@@ -0,0 +1,77 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# build
+, hatchling
+, pytest
+
+# runtime
+, jupyter-core
+
+# optionals
+, jupyter-client
+, ipykernel
+, jupyter_server
+, nbformat
+
+# tests
+, pytest-timeout
+, pytestCheckHook
+}:
+
+let self = buildPythonPackage rec {
+  pname = "pytest-jupyter";
+  version = "0.6.2";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jupyter-server";
+    repo = "pytest-jupyter";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-kY4QHrlj0opEBywe4SpwE4Ck6l6JIzEosx6uuXh+yCQ=";
+  };
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  propagatedBuildInputs = [
+    jupyter-core
+  ];
+
+  passthru.optional-dependencies = rec {
+    client = [
+      jupyter-client
+      ipykernel
+    ];
+    server = [
+      jupyter_server
+      nbformat
+    ] ++ client;
+  };
+
+  doCheck = false; # infinite recursion with jupyter-server
+
+  checkInputs = [
+    pytest-timeout
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  passthru.tests = {
+    check = self.overridePythonAttrs (_: { doCheck = false; });
+  };
+
+  meta = with lib; {
+    changelog = "https://github.com/jupyter-server/pytest-jupyter/releases/tag/v${version}";
+    description = "pytest plugin for testing Jupyter core libraries and extensions";
+    homepage = "https://github.com/jupyter-server/pytest-jupyter";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+};
+in self
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4f81c61ca9b..abc96c8a36a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8935,6 +8935,8 @@ self: super: with self; {
 
   pytest-json-report = callPackage ../development/python-modules/pytest-json-report { };
 
+  pytest-jupyter = callPackage ../development/python-modules/pytest-jupyter { };
+
   pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { };
 
   pytest-localserver = callPackage ../development/python-modules/pytest-localserver { };

From fdc2e9f4ce2eb72432e19d7784c072a15f6d65ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jan 2023 00:44:53 +0100
Subject: [PATCH 905/953] python3Packages.jupyter-server-terminals: init at
 0.4.3

---
 .../jupyter-server-terminals/default.nix      | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/jupyter-server-terminals/default.nix

diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
new file mode 100644
index 000000000000..dfd6dc3164e5
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# build
+, hatchling
+
+# runtime
+, terminado
+
+# tests
+, pytest-jupyter
+, pytest-timeout
+, pytestCheckHook
+}:
+
+let self = buildPythonPackage rec {
+  pname = "jupyter-server-terminals";
+  version = "0.4.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jupyter-server";
+    repo = "jupyter_server_terminals";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-swFMuKP/JIHJJ0zr3Dqv71Ne4WaP7GbzeNQ2tzEBpRU=";
+  };
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    terminado
+  ];
+
+  doCheck = false; # infinite recursion
+
+  checkInputs = [
+    pytest-jupyter
+    pytest-timeout
+    pytestCheckHook
+  ] ++ pytest-jupyter.optional-dependencies.server;
+
+  passthru.tests = {
+    check = self.overridePythonAttrs (_: { doCheck = true; });
+  };
+
+  meta = with lib; {
+    changelog = "https://github.com/jupyter-server/jupyter_server_terminals/releases/tag/v${version}";
+    description = "A Jupyter Server Extension Providing Support for Terminals";
+    homepage = "https://github.com/jupyter-server/jupyter_server_terminals";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+};
+in self
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abc96c8a36a5..26a7b67e2ed9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4942,6 +4942,9 @@ self: super: with self; {
 
   jupyter_server = callPackage ../development/python-modules/jupyter_server { };
 
+  jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { };
+
+
   jupyterhub = callPackage ../development/python-modules/jupyterhub { };
 
   jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };

From ea3e3d0d4be7da7283c812f8e5ed65cf648e9947 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jan 2023 00:48:20 +0100
Subject: [PATCH 906/953] python3Packages.jupyter-server: Rename from
 jupyter_server

---
 pkgs/development/python-modules/jupyter-lsp/default.nix      | 4 ++--
 .../python-modules/jupyter-server-mathjax/default.nix        | 4 ++--
 .../{jupyter_server => jupyter-server}/default.nix           | 5 +++--
 pkgs/development/python-modules/jupyterlab-git/default.nix   | 4 ++--
 .../development/python-modules/jupyterlab_server/default.nix | 4 ++--
 pkgs/development/python-modules/nbclassic/default.nix        | 4 ++--
 pkgs/development/python-modules/notebook-shim/default.nix    | 4 ++--
 pkgs/development/python-modules/pytest-jupyter/default.nix   | 4 ++--
 pkgs/top-level/python-aliases.nix                            | 1 +
 pkgs/top-level/python-packages.nix                           | 2 +-
 10 files changed, 19 insertions(+), 17 deletions(-)
 rename pkgs/development/python-modules/{jupyter_server => jupyter-server}/default.nix (96%)

diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix
index ffcde4a5b216..342e0233eb76 100644
--- a/pkgs/development/python-modules/jupyter-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyter-lsp/default.nix
@@ -2,7 +2,7 @@
 , lib
 , buildPythonPackage
 , fetchPypi
-, jupyter_server
+, jupyter-server
 }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    jupyter_server
+    jupyter-server
   ];
   # tests require network
   doCheck = false;
diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
index 73797f8fd0d8..b6201769f86b 100644
--- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , jupyter-packaging
-, jupyter_server
+, jupyter-server
 , pytest-tornasync
 , pytestCheckHook
 }:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    jupyter_server
+    jupyter-server
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
similarity index 96%
rename from pkgs/development/python-modules/jupyter_server/default.nix
rename to pkgs/development/python-modules/jupyter-server/default.nix
index 7d948f7b52f1..5af8bbe7e248 100644
--- a/pkgs/development/python-modules/jupyter_server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -34,13 +34,14 @@
 }:
 
 buildPythonPackage rec {
-  pname = "jupyter_server";
+  pname = "jupyter-server";
   version = "2.0.6";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "jupyter_server";
+    inherit version;
     hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8=";
   };
 
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index 666de2d89395..6fac2db61bd6 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , fetchPypi
 , git
-, jupyter_server
+, jupyter-server
 , jupyter-packaging
 , jupyterlab
 , nbdime
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    jupyter_server
+    jupyter-server
     nbdime
     git
     nbformat
diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index b891d9e0e7ea..1aeeef157283 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -8,7 +8,7 @@
 , pytestCheckHook
 , json5
 , babel
-, jupyter_server
+, jupyter-server
 , tomli
 , openapi-core
 , pytest-timeout
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     jsonschema
     json5
     babel
-    jupyter_server
+    jupyter-server
     tomli
   ] ++ lib.optionals (pythonOlder "3.10") [
     importlib-metadata
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index 294898fc4a62..b2554c3f473a 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -7,7 +7,7 @@
 , jinja2
 , jupyter-client
 , jupyter-core
-, jupyter_server
+, jupyter-server
 , nbconvert
 , nbformat
 , nest-asyncio
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     jinja2
     jupyter-client
     jupyter-core
-    jupyter_server
+    jupyter-server
     nbconvert
     nbformat
     nest-asyncio
diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix
index 4f606a415709..2ca5d0e44fa7 100644
--- a/pkgs/development/python-modules/notebook-shim/default.nix
+++ b/pkgs/development/python-modules/notebook-shim/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, jupyter_server
+, jupyter-server
 , pytestCheckHook
 , pytest-tornasync
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s=";
   };
 
-  propagatedBuildInputs = [ jupyter_server ];
+  propagatedBuildInputs = [ jupyter-server ];
 
   preCheck = ''
     mv notebook_shim/conftest.py notebook_shim/tests
diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix
index 39a9e7500e61..def50bf46d65 100644
--- a/pkgs/development/python-modules/pytest-jupyter/default.nix
+++ b/pkgs/development/python-modules/pytest-jupyter/default.nix
@@ -12,7 +12,7 @@
 # optionals
 , jupyter-client
 , ipykernel
-, jupyter_server
+, jupyter-server
 , nbformat
 
 # tests
@@ -50,7 +50,7 @@ let self = buildPythonPackage rec {
       ipykernel
     ];
     server = [
-      jupyter_server
+      jupyter-server
       nbformat
     ] ++ client;
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index d69cabc379ea..ed7a8427484a 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -108,6 +108,7 @@ mapAliases ({
   jinja2_time = jinja2-time; # added 2022-11-07
   jupyter_client = jupyter-client; # added 2021-10-15
   jupyter_core = jupyter-core; # added 2023-01-05
+  jupyter_server = jupyter-server; # added 2023-01-05
   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
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 26a7b67e2ed9..30ab7f4a0581 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4940,7 +4940,7 @@ self: super: with self; {
 
   jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { };
 
-  jupyter_server = callPackage ../development/python-modules/jupyter_server { };
+  jupyter-server = callPackage ../development/python-modules/jupyter-server { };
 
   jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { };
 

From 6159128386733bb2be24f983bbccd772c0e721bc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 5 Jan 2023 21:36:46 +0300
Subject: [PATCH 907/953] qt5: 5.15.7 -> 5.15.8

---
 .../libraries/qt-5/5.15/srcs-generated.json   | 164 +++++++++---------
 pkgs/development/libraries/qt-5/5.15/srcs.nix |   2 +-
 2 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
index 4639bf53a52f..229bfabbece2 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
+++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
@@ -1,207 +1,207 @@
 {
   "qt3d": {
     "url": "https://invent.kde.org/qt/qt/qt3d.git",
-    "rev": "0ff905d194e273e04e95b72dbbfd4e58193ecbaa",
-    "sha256": "1jv4xjxdr6xbm4q8fk0ijhl845qnnhxqmwkzqg2ssxdn015iabj9"
+    "rev": "c3c7e6ebc29cce466d954f72f340a257d76b5ec2",
+    "sha256": "0lh05j21acs8wz72g4cs092m1yglpbjkhh55ww1351fjrp5gbzrg"
   },
   "qtactiveqt": {
     "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
-    "rev": "80b43bfe4109820fb7feddb4a16e227a03bc1c4e",
-    "sha256": "1m3c0znrm63b2wbz7vghxrh22lxdp1s7bwc00qfwhgjn1ajyrp71"
+    "rev": "2334cafc110c4e63bec3a5c7abdcd67e5e5ee754",
+    "sha256": "0p7pydqsrws5x9l74y37ldffd3yz4riyizl8669x6y6hj6177yd3"
   },
   "qtandroidextras": {
     "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
-    "rev": "3f8c9f144acbe921a759d261e1314614793f89e0",
-    "sha256": "1k680n1gvj55i0yb7zrlbai4w3mvhhcbbpmcgm1wlv29rg268gi4"
+    "rev": "7ede0a6c555518a3fecba8930d5e4d9c58875d0d",
+    "sha256": "0nvdrbqm469iikkvzwjni3zb7dxwpy3x161m9yly4irklixhxkzh"
   },
   "qtbase": {
     "url": "https://invent.kde.org/qt/qt/qtbase.git",
-    "rev": "51258629f2cf37fff8406bf705d79c07fc7135ca",
-    "sha256": "0wsjw7wc493kx6w954plmd5y8qsshbd5wqxdwj350gnv48n63g2k"
+    "rev": "9cf586d629a04040c9414c4f9e17abbc65c644eb",
+    "sha256": "1jvm92m3jz34yvzyn4vnihga2phpgszb2wqk0y7pr0ww6vs9kaf6"
   },
   "qtcharts": {
     "url": "https://invent.kde.org/qt/qt/qtcharts.git",
-    "rev": "055c6d6e49c5ea369990e7078fd534392a0ba6b9",
-    "sha256": "0r07yjdlxzk34br905da5kcm6xda50907nrffkw99683ix9y64ag"
+    "rev": "e30be213e483f2d6f3c40af0cbdc11a8e92e2026",
+    "sha256": "0vn1xh40lxa6vi87vr6qpskli2vh47mxi3d5srhf8rark0m51lf4"
   },
   "qtconnectivity": {
     "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
-    "rev": "6796953f92a1d3af30d0676e56ec5dfd82199611",
-    "sha256": "16zh10rm2b4sk9mn4r4sfp2mzvrxlz4nqj8bpiy055mplz5day39"
+    "rev": "056294c0493f814c3951ef57e5d0656efe643fb5",
+    "sha256": "0byzmd7azrx06xmd8dsapjljpc9wwnsr39jjccbapjl5rfxywipw"
   },
   "qtdatavis3d": {
     "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
-    "rev": "8e1a57efa1ba3eabbf44098ce6ede3d130c57b5d",
-    "sha256": "19v7la492414d0qzqdqnbhpxpg0hsqll6ixhv4jrckvdaqv7iqxz"
+    "rev": "9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005",
+    "sha256": "151650nqq29m99cbf7ac02vxzw4ivm4spr4kd2ss3gwhfxby3zgj"
   },
   "qtdeclarative": {
     "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
-    "rev": "959b1ac3b7c699ef67ec81155e6e1e579d4e1df7",
-    "sha256": "0f8l214x38hdn768jjfy31pqdjgya6221k38vidnfap522qs1fcm"
+    "rev": "8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9",
+    "sha256": "0xzdnrhqalsrc52a326c5baf3si815a4rb2p1a4djyf8anp9wcai"
   },
   "qtdoc": {
     "url": "https://invent.kde.org/qt/qt/qtdoc.git",
-    "rev": "e3e926a66f0a4ffbf82f0df1a5f570d759faad4f",
-    "sha256": "1ji5qn9bhyz30z12dvh97xxi3ga9b4lymdc7kmzmcd37y56q9s5c"
+    "rev": "79d6ef693b6241db4a86a90943c02180c4944214",
+    "sha256": "0ldskh9dd8qwa96nz1q5sbb8r2jdfcxvq589dyw87m3gpb8v16qq"
   },
   "qtgamepad": {
     "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
-    "rev": "ce0202d67bf1ab2bb887f58122b20eab5b6c1d5d",
-    "sha256": "11c24b2pzjcv14xix96fghyx3j3kw6rmhh499wqwc0qy5mjb6kpw"
+    "rev": "ad63dc64f4bdafb503f7015d04e8849cef5d99b4",
+    "sha256": "06ag3cmg56f4z9pc3ix9lddz5ydx48pf438xc2l1z3x4wxbkfbsy"
   },
   "qtgraphicaleffects": {
     "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
-    "rev": "a2b1600300cda89804d48ec90e0068a075fecc8b",
-    "sha256": "0ca666260mvvlf551076840pvh9r67v2bhmf0yf1xp06rxc205zq"
+    "rev": "4119e4e6dc94447d773a01c1d6e4de0fefb9235a",
+    "sha256": "0sdywxrbjzz9qmrywd54hqqssv59b9mlvra16hjxfd0di50brab2"
   },
   "qtimageformats": {
     "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
-    "rev": "adbc372b890ed90f006a6c4f3ca56bf0cba477ef",
-    "sha256": "05v47ba06lmhrmm9ivnfnxzv9qdhyx2bbx2lkqjfwax2czmnf81j"
+    "rev": "abe44c0f526e499668b1131c5990d9b571f99c46",
+    "sha256": "0llw5lsw368vzsc7dnjy3ahxny8qzb7yz3aakgsbd5glk3dgr4i4"
   },
   "qtlocation": {
     "url": "https://invent.kde.org/qt/qt/qtlocation.git",
-    "rev": "f920a6cc2931402023840c223fce2fed321e28ea",
-    "sha256": "08r6h5d120x6lnzrjwscvv1dbjf720mg508wkyf8f999xncmp0yi"
+    "rev": "f991e28cb0a670597f1955585c76ce8a26ce9e4b",
+    "sha256": "1vflnscqc0jidr68v5ikxr579rx7k5yhdik8dcmnfgvmz3fq4jlz"
   },
   "qtlottie": {
     "url": "https://invent.kde.org/qt/qt/qtlottie.git",
-    "rev": "8bb9237e4e1462f405d931a8a513ed4c27632d9e",
-    "sha256": "1qd86wrvf3487s3f39m6pvcipa5s7zhn99kbfnmrhg0q35cr2816"
+    "rev": "56f94cb8e2da9801ada7aa06f86ccf807f5a4ed8",
+    "sha256": "1pyshl395qmf84h5lyw3rgn3gmz98sm1dq003jvr74w9i746hszf"
   },
   "qtmacextras": {
     "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
-    "rev": "e7d4c37810976b6a1730d842cbca04b66ca7de30",
-    "sha256": "01kxc4185kb3pq2dfcjyl3n765gjwpf9l2r4q6gncy5v75a2y700"
+    "rev": "bc397be87f9b02e8279cfe2fc9b893c9f95219b9",
+    "sha256": "1dr8a7sv00dmk1hc6kzs93rhvjk2wkxx0mxl7riafdzxzyajcl7n"
   },
   "qtmultimedia": {
     "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
-    "rev": "f3dc18968c437c993886d3bfb668b62344a10860",
-    "sha256": "0li29bvvjcck1y4zhhc6imxa8ip3988yv2zz5k6anyasb0ywbip8"
+    "rev": "0d7cc33ac1404758886acef4f804b788c6774e98",
+    "sha256": "1ra9iv4pjcgz98927lkbpw494qf1jxsg4vbzxsxi247q2d1dkwzi"
   },
   "qtnetworkauth": {
     "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
-    "rev": "f34ac77b5955126be60faa2b801be2d19dff896f",
-    "sha256": "1ip0sp70q4mircngs77p2m8njh8aw6f1q1w6f7nm0i2vkydpqfy2"
+    "rev": "f082a4c84c54e888b8d023ba68b7085551403425",
+    "sha256": "03sd0a58b8z340in4avk6lqqa9qzkzkaxnk2yn1a270sxrsq6y0l"
   },
   "qtpurchasing": {
     "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
-    "rev": "25ead89b0834f669e0a193e6d6cf2da25d33a452",
-    "sha256": "1jx44zr8kpjjg92by6sb9p5nqkadsqdhprngdbzyvxzhh1bplg1h"
+    "rev": "9dfea35b04dcb52d02d7a2883df88d89ba9999ef",
+    "sha256": "0swliqwzz3b297z7y6sr79ijgv3914s2g9ymq77plxglfdrnm74j"
   },
   "qtquick3d": {
     "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
-    "rev": "95f52cb212f66e6022661fb7f2eb81a8c21e9f22",
-    "sha256": "0j508pc4fyz7gi9bjmyq4i0q9kmfhcckgwp38wcvgr6xm83f224n"
+    "rev": "47defc8b33b7bdf1dbf289b65b301fba2def9b1c",
+    "sha256": "1w4f02kch7p2jhn6dlzks6jpfcsm9ik04jnnaw6qvpxpsxwvcaah"
   },
   "qtquickcontrols": {
     "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
-    "rev": "c7dae5f6041d6c076311f2d8ed13fcfe3598be70",
-    "sha256": "1fxvhrikjywh7gbz4lyivkvmsfnlqb7sd7r5rzqg6xi61x7i3fm4"
+    "rev": "18977875d16e22ad68a1dc2d7ee0a9c9f873c941",
+    "sha256": "0n3930zzvp4s6m715rvx1bjh2s2fg7cadjs2hq6bc8k9mwlqibk1"
   },
   "qtquickcontrols2": {
     "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
-    "rev": "5465566a4ad9f6f9758bed304153f0c7fec3437b",
-    "sha256": "03qayykxd07fwp5m1s7dwjvdcv45m3v6zia9k6ipif2bbjbi4dyd"
+    "rev": "56ce8233382a091a8476c831edd416b5f704ae4f",
+    "sha256": "1h68s2fdgn1pbf5hsk6c8v4icz8c4cpbxv8iirz22yhlzabc3hdm"
   },
   "qtquicktimeline": {
     "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
-    "rev": "e2438e010a98d731317c10a64c095e0282b51ab0",
-    "sha256": "0bbj0blxz3zbz03a85drwysshl0qib0fl46ln22ll52819qw111v"
+    "rev": "4cd0142a30bfa5eef47c720ac24dd73e12764806",
+    "sha256": "13vhlgxq8ap796p3y9c3kj645p0370bqjwm5hkz13pazm15sbc9z"
   },
   "qtremoteobjects": {
     "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
-    "rev": "5f2a598a9134167a0da2efcbf1249fc167ae3750",
-    "sha256": "1c3cg8fq681wrqk2xhajym1l9f8vfsffc8g0xp06m7lp11hr9bmq"
+    "rev": "929c7ad0676f084b9ecc469cd47a307596923cb3",
+    "sha256": "0l94k9fdzk96j40gab2l5n4lmadzaqhvbg8s3m5f3v4im00xa2x9"
   },
   "qtscript": {
     "url": "https://invent.kde.org/qt/qt/qtscript.git",
-    "rev": "b169b3e6ac1f9d66834ad61fbe35d3e25ff204bc",
-    "sha256": "01nfg53ixlggam5id16n1lc9n2anclrk6prvawi2fhpcnw4dpdza"
+    "rev": "4d8e4bd20b7100b0b7192547b19c3c239aaf7034",
+    "sha256": "1pvihbjjmczby4934lir3h3kq0rqcvxnbw2vdkl9lhkds3lm0qhf"
   },
   "qtscxml": {
     "url": "https://invent.kde.org/qt/qt/qtscxml.git",
-    "rev": "e1faea1db52b91d90ef64dd57eb6529e323b5526",
-    "sha256": "1j1ckm2jca0h8zyfyq3kzf0dwp8jw9xwlpg7f7qi5dd8wd9dncmi"
+    "rev": "0c93f94a44e2dce7eed9d17d4976b0c1e14be7bb",
+    "sha256": "1vvzvin23ws6njhyg93s2dlkxb9p50mkipc611lsx7971gv1wih0"
   },
   "qtsensors": {
     "url": "https://invent.kde.org/qt/qt/qtsensors.git",
-    "rev": "5f1f73fdba8906f58c4554cbef9c1a72edcf0230",
-    "sha256": "0y7zyx9br4scbgkja5smkmyhlb6snqhir8mypsgdc4kllnbr4wkh"
+    "rev": "6add85fa1a234a7e1943ba175c6fc799ccbae48e",
+    "sha256": "1k02x3wzczwg7cqh6hav31akdsz9kk8s0vryd3q7zfrhqy9m88sh"
   },
   "qtserialbus": {
     "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
-    "rev": "180cb13048a24510f9a1b20796772d27da762bdd",
-    "sha256": "1s7y7rdicb50aa2kfsl74y0dm1qd2kd6fncyqaq55w0rn95fks87"
+    "rev": "ced5c7223d037aece1e7f37d4314f388252de025",
+    "sha256": "009ajdry6lvf9pifzm2zl0w5zhkmrrxm53mjf9s76jqrsi6yqk30"
   },
   "qtserialport": {
     "url": "https://invent.kde.org/qt/qt/qtserialport.git",
-    "rev": "966cf2a2077a8470715894363ad46ea7df0665fa",
-    "sha256": "1a3f3fhwblifgsn3x6qhx4fmpxp458q4x8vp3jdxmynnkfiigafp"
+    "rev": "e2851096dc6f6a7cfa635d69ea950b382e3658ab",
+    "sha256": "071g8d9i3wi8rqqy4lxpp3z25a55pd2xwsy3r8v0a6s6y5g5lcpf"
   },
   "qtspeech": {
     "url": "https://invent.kde.org/qt/qt/qtspeech.git",
-    "rev": "d32f4a479d38a11f547598004b975f4356424a16",
-    "sha256": "1n0f2pym6kl0fh5iqrln7z45hwmw8bha5s7bzswsihrq6zxkca4f"
+    "rev": "255845e2b2e605363762be25932d92fc10d32749",
+    "sha256": "0apyk2z9r7i54sh0zgbs8vfncc4jrcrzzvi3q14d105pkhrschp9"
   },
   "qtsvg": {
     "url": "https://invent.kde.org/qt/qt/qtsvg.git",
-    "rev": "83296f10ebdb9a666b11dc69f3a148c38b9c425c",
-    "sha256": "0gifl43lnddp0shbyhmijlm2qpqj6fp2xip96nxn1ql3g70f9kyv"
+    "rev": "a7a0f2491334e8cb4ef5731f5eb741f3f7b9af76",
+    "sha256": "13zpzvwqv61dsd74s92nf46rhaw2rw3hl8m6d313wjlaaqi95ln6"
   },
   "qttools": {
     "url": "https://invent.kde.org/qt/qt/qttools.git",
-    "rev": "c4750dd02070ce246ff98cc5d137193825043912",
-    "sha256": "0zryql6g77hdqsh10gzmw9n8ibki35b5jvh96gjl29yrvan9w5v7"
+    "rev": "090e526e713d01eac34c64e4a09ad961c612febf",
+    "sha256": "1zrxv9wdnqayn5hhblwyqyrdn8mj7x2ks2f4qsr2w3cdidcjjz7y"
   },
   "qttranslations": {
     "url": "https://invent.kde.org/qt/qt/qttranslations.git",
-    "rev": "c38edd3a5501bcd53132e1e4abb7d25a98e0e1a9",
-    "sha256": "0if1mx6jic67pzv1p0xqb5fknfbawvzxw7fx90hc4kkrwjm73q7m"
+    "rev": "af8cd030fed6a47cc1e8727e7ee5445e037bf712",
+    "sha256": "14fx3r9s3p16rhv9fyrwnv6bn24nvh5xnjwcw1mb04c44ddb9r86"
   },
   "qtvirtualkeyboard": {
     "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
-    "rev": "8aebadb96c1e57ba89bba2e5962399f676207a32",
-    "sha256": "0hygidp8l580d10c1g6pgdxd3g6lza0dkgfm6bd2kjrigg71fzh0"
+    "rev": "5f66c9571303170f07954f73b09cad4cee1ce5d0",
+    "sha256": "0jzl7a2zr83nd9sskmz9fk2w2spn3v821j0l7kcp2hxydgyhk8v3"
   },
   "qtwayland": {
     "url": "https://invent.kde.org/qt/qt/qtwayland.git",
-    "rev": "4b43f2dc58e71732ebdbe1eaf4392272bc692e6d",
-    "sha256": "157wqyh9wv9kn8671l7dhnv3a4glmqpisqk0vdgnx19b6jdxymvj"
+    "rev": "f6a1e838e371dc90272c62daeea597fe487dec3e",
+    "sha256": "0v8vcs4jl24h754ilg9dm4qq1q24fk9mmnanpqk1q102ymmz2rac"
   },
   "qtwebchannel": {
     "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
-    "rev": "4e35fe9429920067c17596986b486fb1c1e95db0",
-    "sha256": "1j74hfrrrb1irchlgqclbk3zjgg98clndfw576psa3zm8xg3szin"
+    "rev": "f8949655ccfacc2d34cfb0af23c540db84a2b9e5",
+    "sha256": "1303hghvk6avshb7imnkv24qv1ij5d3nbljba20l6v6dsr7zg7ba"
   },
   "qtwebglplugin": {
     "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
-    "rev": "3087cdd0758258163299602550f7d4e72edf2a80",
-    "sha256": "19gsc842njdgmiqhkl7xqqry1d40phjwixzajzphv4s5vmcbxn5w"
+    "rev": "655be6c5406f8ba42acaca363fc55d78a6198733",
+    "sha256": "08biydqk1lhjzvrgl3zhbrrgnjcy611pmh9scyw42avdvj2qzpc2"
   },
   "qtwebsockets": {
     "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
-    "rev": "594477769ecac4032ba116196493f3ba3db1aaed",
-    "sha256": "102r5jam8kc46bjlxf3jdjsr1jzdj5vfwmf4yypbhihwz436z791"
+    "rev": "63fb8da1ecf8e48262cd515690cf71a425f92bf5",
+    "sha256": "0kjw5dsgn67897laana4h06czr9g8555jiqf1k3pkzv4fxzcqypn"
   },
   "qtwebview": {
     "url": "https://invent.kde.org/qt/qt/qtwebview.git",
-    "rev": "b1605fea61a6bbb599b720c54282bc8ddb0aacf0",
-    "sha256": "158hiqrshblw3axpryv0lqk74691njdc8qmdxbz28hzaaq6rxj5n"
+    "rev": "dfd86e07019488954cddcf2ba314df3cd0c01c0c",
+    "sha256": "1crph9sdmxxs0787il86j2dv6k3qylmy8a83hfzczcjcx3pwcf7a"
   },
   "qtwinextras": {
     "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
-    "rev": "2a04b162451460ffc208c2c27acce16a18f763ce",
-    "sha256": "17h5bd94jhwqgzlb5w75rfgb3v0jkg6fm79kd0byzp7bvp7i7ibj"
+    "rev": "48318520a4031167c4c0ad559e1a11b2f4c053d6",
+    "sha256": "04smnp9pl3szizdp05dz7qmdgg8sk57d3r40sdy7v9zwi4lwaqi4"
   },
   "qtx11extras": {
     "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
-    "rev": "9134cdba9386e408ce2ffe515ca0c3f6f6c66685",
-    "sha256": "03qs1griqx3bccaqas8mifbj4f4bhwfzc3f6knws3zy3mc9l8qzq"
+    "rev": "e44c85e8643f2724109993a7b9eaf0dff3530fec",
+    "sha256": "1vs1013zxw54xfmkpid99p5f38hlqds172vija7xjyjaww7j7y3b"
   },
   "qtxmlpatterns": {
     "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
-    "rev": "b798a0f0265538a9dd12b5c7e4dad84ba8e1db4e",
-    "sha256": "1lh9rci7bqrjw912blns369qs76c7lywnxmmmlhchrhk9l89ailk"
+    "rev": "3199d91de3f38e5ece3d36bcefe2c33b2c014f3f",
+    "sha256": "1hjw5ymbc1fl4r4lym7n7ilmb953izmvyp6z8g5l8l7cz9sjz4ka"
   }
 }
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index f566c621f249..36cab60e97b4 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -1,7 +1,7 @@
 { lib, fetchgit, fetchFromGitHub }:
 
 let
-  version = "5.15.7";
+  version = "5.15.8";
   overrides = {};
 
   mk = name: args:

From cd890b9b5e85d3b33875fd02081eea985abc3f59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@users.noreply.github.com>
Date: Thu, 5 Jan 2023 19:45:40 +0100
Subject: [PATCH 908/953] nixos/iay: Fix iay package option (#209188)

---
 nixos/modules/programs/iay.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/iay.nix b/nixos/modules/programs/iay.nix
index 1fa00e43795a..4f8e256c78e9 100644
--- a/nixos/modules/programs/iay.nix
+++ b/nixos/modules/programs/iay.nix
@@ -6,7 +6,7 @@ let
 in {
   options.programs.iay = {
     enable = mkEnableOption (lib.mdDoc "iay");
-    package = mkPackageOption pkgs "iay" {};
+    package = mkPackageOptionMD pkgs "iay" {};
 
     minimalPrompt = mkOption {
       type = types.bool;

From 0a8bfb520cb32174cd15591dab8cc5e567b2cec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Thu, 5 Jan 2023 19:48:27 +0100
Subject: [PATCH 909/953] nixos/iay: put `mkPackageOptionMD` in scope

---
 nixos/modules/programs/iay.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/iay.nix b/nixos/modules/programs/iay.nix
index 4f8e256c78e9..9164f5cb6486 100644
--- a/nixos/modules/programs/iay.nix
+++ b/nixos/modules/programs/iay.nix
@@ -2,7 +2,7 @@
 
 let
   cfg = config.programs.iay;
-  inherit (lib) mkEnableOption mkIf mkOption mkPackageOption optionalString types;
+  inherit (lib) mkEnableOption mkIf mkOption mkPackageOptionMD optionalString types;
 in {
   options.programs.iay = {
     enable = mkEnableOption (lib.mdDoc "iay");

From 0e5839cbc7fcadfd7e1798132288fdb91750150d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 6 Jan 2023 01:55:10 +0100
Subject: [PATCH 910/953] gcsfuse: fix src rev

---
 pkgs/tools/filesystems/gcsfuse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index f45d4cd95b69..c0cd784aed47 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
-    rev = "refs/tags/${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc=";
   };
 

From f9c1e638449a1069835cc05aa4001695f03b02e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 6 Jan 2023 02:49:33 +0100
Subject: [PATCH 911/953] python3Packages.chalice: 1.27.1 -> 1.27.3

https://github.com/aws/chalice/blob/1.27.3/CHANGELOG.rst
---
 .../development/python-modules/chalice/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index 052120d893d0..735337e43d6f 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -16,7 +16,6 @@
 , requests
 , setuptools
 , six
-, typing
 , watchdog
 , websocket-client
 , wheel
@@ -24,20 +23,21 @@
 
 buildPythonPackage rec {
   pname = "chalice";
-  version = "1.27.1";
+  version = "1.27.3";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-Qz8kYXu2NmcgtW8GbmLPfB4BOearEycE6EMmQRXmWeI=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-izzoYxzkaQqcEM5e8BhZeZIxtAGRDNH/qvqwvrx250s=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
       --replace "attrs>=19.3.0,<21.5.0" "attrs" \
-      --replace "pip>=9,<22.2" "pip" \
-      --replace "typing==3.6.4" "typing"
+      --replace "inquirer>=2.7.0,<3.0.0" "inquirer" \
+      --replace "pip>=9,<22.3" "pip" \
   '';
 
   propagatedBuildInputs = [
@@ -53,8 +53,6 @@ buildPythonPackage rec {
     six
     wheel
     watchdog
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    typing
   ];
 
   checkInputs = [

From 8a4e6b7e1bd466289e2201fabd53d6a3e564527d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 6 Jan 2023 06:48:35 +0000
Subject: [PATCH 912/953] stdenv/darwin: rebuild gawk earlier: in stage4
 instead of final stage

`gawk-5.1.1 -> 5.2.1` update (https://github.com/NixOS/nixpkgs/pull/207478)
started failing `stdenv` reference checks as `gawk` now leaks
`bootstrapTools` reference:

    `gawk` -> `gettext` -> `libiconv` -> `bootstrapTools`.

The change rebuild `gawk` in `stage4` to pull rebuilt tools.
---
 pkgs/stdenv/darwin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 76c44870f4ad..113aa9462761 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -582,7 +582,7 @@ rec {
     let
       persistent = self: super: with prevStage; {
         inherit
-          gnumake gzip gnused bzip2 gawk ed xz patch bash python3
+          gnumake gzip gnused bzip2 ed xz patch bash python3
           ncurses libffi zlib gmp pcre gnugrep cmake
           coreutils findutils diffutils patchutils ninja libxml2;
 

From bf0e89d7d5ece94a02d29ab1a8921a751f4467c9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 6 Jan 2023 14:17:33 +0100
Subject: [PATCH 913/953] python3Packages.clevercsv: Fix build with setuptools
 65.6.0

---
 .../python-modules/clevercsv/default.nix       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index c70350a543de..0760fb36c6fb 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , cchardet
 , chardet
 , pandas
@@ -18,10 +19,19 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "CleverCSV";
-    rev = "v${version}";
-    sha256 = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Fixes compat with setuptools>=65.6.0
+      # https://github.com/alan-turing-institute/CleverCSV/issues/77
+      url = "https://github.com/alan-turing-institute/CleverCSV/commit/0614fe16fa0e8e08c4c916efc956209fe2aa8ce6.patch";
+      hash = "sha256-ZL0cc5Si8ga6kd3JhfaIUOWXdnEgep9tvHBVpXjsI+w=";
+    })
+  ];
+
   propagatedBuildInputs = [
     cchardet
     chardet
@@ -30,7 +40,9 @@ buildPythonPackage rec {
     tabview
   ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "clevercsv"

From 63e977acd181070881268b71828c736122173c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sat, 7 Jan 2023 16:21:11 -0600
Subject: [PATCH 914/953] python3Packages.breathe: fix build after dependency
 upgrade

More information: https://github.com/breathe-doc/breathe/pull/865
---
 pkgs/development/python-modules/breathe/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index a53af25bd888..9c763e22c696 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , docutils
 , fetchFromGitHub
+, fetchpatch
 , pytestCheckHook
 , pythonOlder
 , sphinx
@@ -21,6 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-OOc3XQjqQa0cVpA+/HHco+koL+0whUm5qC7x3xiEdwQ=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/breathe-doc/breathe/commit/de3504c81c7cefc87c8229743f93232ca00a685d.patch";
+      hash = "sha256-UGld5j0F/hnTuS7KUFvgQL52xCUdaJ3/NeuEuHhpCxI=";
+    })
+  ];
+
   propagatedBuildInputs = [
     docutils
     sphinx

From 08d449ce6df035fcf7a5c6efb525c32ac0a9e355 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 8 Jan 2023 16:27:42 +0100
Subject: [PATCH 915/953] python3Packages.cffi: Disable failing test on darwin

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

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 266c3deb5642..07c76f81a4b3 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -82,6 +82,12 @@ if isPyPy then null else buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
+  disabledTests = lib.optionals stdenv.isDarwin [
+    # AssertionError: cannot seem to get an int[10] not completely cleared
+    # https://foss.heptapod.net/pypy/cffi/-/issues/556
+    "test_ffi_new_allocator_1"
+  ];
+
   meta = with lib; {
     maintainers = with maintainers; [ domenkozar lnl7 ];
     homepage = "https://cffi.readthedocs.org/";

From 923d489a22712d9efe73b78c7df60bd5d123a916 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 9 Jan 2023 01:13:29 +0100
Subject: [PATCH 916/953] python3Packages.trio: Propagate exceptiongroup for
 python<3.11

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

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index ca262f773461..c38011978d0f 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -2,6 +2,7 @@
 , attrs
 , sortedcontainers
 , async_generator
+, exceptiongroup
 , idna
 , outcome
 , pytestCheckHook
@@ -18,11 +19,12 @@
 buildPythonPackage rec {
   pname = "trio";
   version = "0.22.0";
+  format = "setuptools";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8=";
+    hash = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8=";
   };
 
   propagatedBuildInputs = [
@@ -32,6 +34,8 @@ buildPythonPackage rec {
     idna
     outcome
     sniffio
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
   ];
 
   # tests are failing on Darwin

From 55fbb9e25789204ffe7460443cbb366b81adee11 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 9 Jan 2023 01:19:46 +0100
Subject: [PATCH 917/953] python3Packages.meson-python: Provide
 typing-extensions for python<3.10

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

diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index 69cfa50f8fd4..d4064e55cb5c 100644
--- a/pkgs/development/python-modules/meson-python/default.nix
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -7,6 +7,8 @@
 , ninja
 , pyproject-metadata
 , tomli
+, typing-extensions
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -25,6 +27,8 @@ buildPythonPackage rec {
     ninja
     pyproject-metadata
     tomli
+  ] ++ lib.optionals (pythonOlder "3.10") [
+    typing-extensions
   ];
 
   propagatedBuildInputs = [
@@ -42,8 +46,9 @@ buildPythonPackage rec {
   '';
 
   meta = {
+    changelog = "https://github.com/mesonbuild/meson-python/blob/${version}/CHANGELOG.rst";
     description = "Meson Python build backend (PEP 517)";
-    homepage = "https://github.com/FFY00/meson-python";
+    homepage = "https://github.com/mesonbuild/meson-python";
     license = [ lib.licenses.mit ];
     maintainers = [ lib.maintainers.fridh ];
   };

From b3241be75d40fe2deac28ecfb30824914195970c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 9 Jan 2023 06:07:03 -0800
Subject: [PATCH 918/953] python310Packages.levenshtein: don't use alias

---
 pkgs/applications/audio/sublime-music/default.nix             | 2 +-
 pkgs/applications/editors/apostrophe/default.nix              | 2 +-
 pkgs/applications/misc/ulauncher/default.nix                  | 2 +-
 pkgs/applications/office/paperless-ngx/default.nix            | 2 +-
 pkgs/applications/office/paperwork/paperwork-backend.nix      | 4 ++--
 pkgs/applications/science/biology/truvari/default.nix         | 2 +-
 pkgs/development/python-modules/fire/default.nix              | 4 ++--
 pkgs/development/python-modules/fuzzywuzzy/default.nix        | 4 ++--
 pkgs/development/python-modules/thefuzz/default.nix           | 4 ++--
 pkgs/development/python-modules/trytond/default.nix           | 4 ++--
 pkgs/development/python-modules/videocr/default.nix           | 4 ++--
 .../tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix
index a9329c34212d..2386708c552c 100644
--- a/pkgs/applications/audio/sublime-music/default.nix
+++ b/pkgs/applications/audio/sublime-music/default.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     mpv
     peewee
     pygobject3
-    python-Levenshtein
+    levenshtein
     python-dateutil
     requests
     semver
diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix
index fc6ddd93567c..674b27330802 100644
--- a/pkgs/applications/editors/apostrophe/default.nix
+++ b/pkgs/applications/editors/apostrophe/default.nix
@@ -7,7 +7,7 @@
 
 let
   pythonEnv = pythonPackages.python.withPackages(p: with p; [
-    regex setuptools python-Levenshtein pyenchant
+    regex setuptools levenshtein pyenchant
     pygobject3 pycairo pypandoc chardet
   ]);
 
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index c82bdcc6001e..a67ba0eff700 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec {
     dbus-python
     pygobject3
     pyinotify
-    python-Levenshtein
+    levenshtein
     pyxdg
     pycairo
     requests
diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix
index feda51e4f665..309c5812e4ea 100644
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@@ -155,7 +155,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
     python-dateutil
     python-dotenv
     python-gnupg
-    python-Levenshtein
+    levenshtein
     python-magic
     pytz
     pyyaml
diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix
index b9e78246609b..814ae5e51f5f 100644
--- a/pkgs/applications/office/paperwork/paperwork-backend.nix
+++ b/pkgs/applications/office/paperwork/paperwork-backend.nix
@@ -7,7 +7,7 @@
 , pycountry
 , whoosh
 , termcolor
-, python-Levenshtein
+, levenshtein
 , pygobject3
 , pyocr
 , natsort
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     pygobject3
     pyocr
     pypillowfight
-    python-Levenshtein
+    levenshtein
     poppler_gi
     scikit-learn
     termcolor
diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix
index 31c1fc50ee3e..412642f523f2 100644
--- a/pkgs/applications/science/biology/truvari/default.nix
+++ b/pkgs/applications/science/biology/truvari/default.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     pyvcf
-    python-Levenshtein
+    levenshtein
     progressbar2
     pysam
     pyfaidx
diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix
index bec959979353..b85f82d6115a 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/pkgs/development/python-modules/fire/default.nix
@@ -4,7 +4,7 @@
 , six
 , hypothesis
 , mock
-, python-Levenshtein
+, levenshtein
 , pytestCheckHook
 , termcolor
 , pythonOlder
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   checkInputs = [
     hypothesis
     mock
-    python-Levenshtein
+    levenshtein
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix
index 9059ba977b7b..81d6b0ade107 100644
--- a/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }:
+{ lib, buildPythonPackage, fetchPypi, levenshtein, pycodestyle, hypothesis, pytest }:
 
 buildPythonPackage rec {
   pname = "fuzzywuzzy";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5";
   };
 
-  propagatedBuildInputs = [ python-Levenshtein ];
+  propagatedBuildInputs = [ levenshtein ];
   checkInputs = [ pycodestyle hypothesis pytest ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix
index e521182a395a..2f203e74b313 100644
--- a/pkgs/development/python-modules/thefuzz/default.nix
+++ b/pkgs/development/python-modules/thefuzz/default.nix
@@ -4,7 +4,7 @@
 , pythonOlder
 , pytestCheckHook
 , hypothesis
-, python-Levenshtein
+, levenshtein
 }:
 
 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0=";
   };
 
-  propagatedBuildInputs = [ python-Levenshtein ];
+  propagatedBuildInputs = [ levenshtein ];
 
   # Skip linting
   postPatch = ''
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 35d0a9322d4a..9f13bbe53da8 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -13,7 +13,7 @@
 , wrapt
 , passlib
 , pydot
-, python-Levenshtein
+, levenshtein
 , html2text
 , weasyprint
 , gevent
@@ -49,7 +49,7 @@ buildPythonPackage rec {
 
     # extra dependencies
     pydot
-    python-Levenshtein
+    levenshtein
     html2text
     weasyprint
     gevent
diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix
index a6ac156b7063..1158d9fa9171 100644
--- a/pkgs/development/python-modules/videocr/default.nix
+++ b/pkgs/development/python-modules/videocr/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, python-Levenshtein
+, levenshtein
 , pytesseract
 , opencv4
 , fuzzywuzzy
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    python-Levenshtein
+    levenshtein
     pytesseract
     opencv4
     fuzzywuzzy
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index f78d52f5b679..4c202939e722 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -11,7 +11,7 @@ let
     pygobject3
     (toPythonModule ibus)
     pyxdg
-    python-Levenshtein
+    levenshtein
   ]);
 in stdenv.mkDerivation rec {
   pname = "ibus-uniemoji";

From 5804b37991e7600ff968653d8bcd9777336afdca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 9 Jan 2023 07:54:35 -0800
Subject: [PATCH 919/953] python311Packages.http-parser: cythonize before
 building

---
 pkgs/development/python-modules/http-parser/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix
index d0fc242c9896..1ca7c73ef2f2 100644
--- a/pkgs/development/python-modules/http-parser/default.nix
+++ b/pkgs/development/python-modules/http-parser/default.nix
@@ -19,9 +19,14 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
+    cython
     setuptools
   ];
 
+  preBuild = ''
+    # re-run cython
+    make -B
+  '';
 
   pythonImportsCheck = [
     "http_parser"

From 32a8d42f3d57940e51932aa36247bebf8b953b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 9 Jan 2023 07:57:57 -0800
Subject: [PATCH 920/953] python311Packages.anyio: 3.5.0 -> 3.6.2

https://github.com/agronholm/anyio/blob/3.6.2/docs/versionhistory.rst
---
 pkgs/development/python-modules/anyio/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 3ad4d8495f06..927956a49f6d 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "3.5.0";
+  version = "3.6.2";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
@@ -29,17 +29,9 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = pname;
     rev = version;
-    sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs=";
+    hash = "sha256-bootaulvx9zmobQGDirsMz5uxuLeCD9ggAvYkPaKnWo=";
   };
 
-  patches = [
-    (fetchpatch {
-      # Pytest 7.0 compatibility
-      url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch";
-      sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw=";
-    })
-  ];
-
   preBuild = ''
     export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
   '';
@@ -95,6 +87,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "anyio" ];
 
   meta = with lib; {
+    changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst";
     description = "High level compatibility layer for multiple asynchronous event loop implementations on Python";
     homepage = "https://github.com/agronholm/anyio";
     license = licenses.mit;

From 2b671e96a88ff40c0a519a0ae24c66c61f0d36e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 9 Jan 2023 08:15:05 -0800
Subject: [PATCH 921/953] autoflake: move to pythonPackages

It is imported by pydantic.
---
 .../autoflake/default.nix                           | 13 ++++++++-----
 pkgs/top-level/all-packages.nix                     |  2 +-
 pkgs/top-level/python-packages.nix                  |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)
 rename pkgs/development/{tools/analysis => python-modules}/autoflake/default.nix (77%)

diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix
similarity index 77%
rename from pkgs/development/tools/analysis/autoflake/default.nix
rename to pkgs/development/python-modules/autoflake/default.nix
index adc861588dd5..2eebefa5c11d 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/python-modules/autoflake/default.nix
@@ -1,21 +1,24 @@
 { lib
-, python3
+, buildPythonPackage
+, fetchPypi
+, pyflakes
+, pytestCheckHook
 }:
 
-python3.pkgs.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "autoflake";
   version = "1.4";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-YaNTASz/arlMoGKCPR+y9pLErNpRx2/4Oo13kV+6Ueo=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     pyflakes
   ];
 
-  checkInputs = with python3.pkgs; [
+  checkInputs = [
     pytestCheckHook
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0aabf7a24d2..89f95690f485 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2644,7 +2644,7 @@ with pkgs;
 
   authenticator = callPackage ../applications/misc/authenticator { };
 
-  autoflake = callPackage ../development/tools/analysis/autoflake { };
+  autoflake = with python3.pkgs; toPythonApplication autoflake;
 
   autospotting = callPackage ../applications/misc/autospotting { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 22b9f25bc400..4b89b98c0dc2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -780,6 +780,8 @@ self: super: with self; {
 
   autofaiss = callPackage ../development/python-modules/autofaiss { };
 
+  autoflake = callPackage ../development/python-modules/autoflake { };
+
   autograd = callPackage ../development/python-modules/autograd { };
 
   autoit-ripper = callPackage ../development/python-modules/autoit-ripper { };

From 588d78bba7beea93119ed99ecf2e996f2b4b9820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 9 Jan 2023 08:16:14 -0800
Subject: [PATCH 922/953] python311Packages.pydantic: autoflake is only used at
 build time

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

diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index e0f342f72217..7ccd400326ae 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -54,6 +54,7 @@ buildPythonPackage rec {
     cython
   ] ++ lib.optionals withDocs [
     # dependencies for building documentation
+    autoflake
     ansi2html
     markdown-include
     mdx-truly-sane-lists
@@ -67,7 +68,6 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    autoflake
     devtools
     email-validator
     pyupgrade

From 70dfd49f7152ee49b4a6b3c203b54f07a0c8e7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 10 Jan 2023 16:50:00 +0100
Subject: [PATCH 923/953] dejagnu: no tests on aarch64-darwin

https://hydra.nixos.org/log/4ilhqfxwbsdj49ywq9qna93aj1nilc06-dejagnu-1.6.3.drv
---
 pkgs/development/tools/misc/dejagnu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 45edeb89a9c7..6c2799cfadf7 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
   configureScript = "../configure";
 
-  doCheck = true;
+  doCheck = !(with stdenv; isDarwin && isAarch64);
 
   # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
   # the build daemon when building in a chroot.  See

From 21dbce8f83082309da8c00f4d36e1863e4138fb6 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Tue, 10 Jan 2023 20:05:35 -0500
Subject: [PATCH 924/953] rustc: 1.66.0 -> 1.66.1

https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1661-2023-01-10

Fixes CVE-2022-46176.
---
 pkgs/development/compilers/rust/1_66.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/1_66.nix b/pkgs/development/compilers/rust/1_66.nix
index ada9054973fa..6aee98bdba06 100644
--- a/pkgs/development/compilers/rust/1_66.nix
+++ b/pkgs/development/compilers/rust/1_66.nix
@@ -20,8 +20,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.66.0";
-  rustcSha256 = "sha256-OzzT6lqCombnXQs18LVMFgIVdtnreNOEBSF1p3KTWkg=";
+  rustcVersion = "1.66.1";
+  rustcSha256 = "sha256-WzyTOpTHIYdwXU7ikxmLq/3QlEL1k3+9aF2zqB9JWbo=";
 
   llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; };

From 3758641dd44cb05b4c67cb12f165a2e97b374a1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Jan 2023 16:05:47 +0100
Subject: [PATCH 925/953] python3Packages.pybind11: Disable failing test on
 darwin

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

diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index 146ffce784fa..7b35cbb3008b 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -78,6 +78,12 @@ buildPythonPackage rec {
     "tests/extra_setuptools/test_setuphelper.py"
   ];
 
+  disabledTests = lib.optionals (stdenv.isDarwin) [
+    # expects KeyError, gets RuntimeError
+    # https://github.com/pybind/pybind11/issues/4243
+    "test_cross_module_exception_translator"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/pybind/pybind11";
     changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst";

From 1729975ffc93affec069edb099a3127e7759e19a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 11 Jan 2023 00:43:44 +0000
Subject: [PATCH 926/953] gawk: disable PIE

PIE is incompatible with gawk's new persistent memory feature.
This fixes pkgsMusl.gawk.

Fixes: 3fba3bf53f2 ("gawk: 5.1.1 -> 5.2.1")
Fixes: https://github.com/NixOS/nixpkgs/pull/210124
---
 pkgs/tools/text/gawk/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f07da96aa48b..a85e91b1a0c1 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -16,7 +16,7 @@
 
 assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   pname = "gawk" + lib.optionalString interactive "-interactive";
   version = "5.2.1";
 
@@ -83,4 +83,8 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix ++ platforms.windows;
     maintainers = [ ];
   };
-}
+} // lib.optionalAttrs stdenv.hostPlatform.isMusl {
+  # PIE is incompatible with the "persistent malloc" ("pma") feature.
+  # FIXME: make unconditional in staging (added to avoid rebuilds in staging-next)
+  hardeningDisable = [ "pie" ];
+})

From e091693f131b3e23ff8debf943f1606e79ca1232 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Wed, 11 Jan 2023 21:06:22 +0100
Subject: [PATCH 927/953] cargo: fix cross-compilation by adding missing zlib
 dependency

Previously it was failing with:

   Compiling cargo v0.67.1 (/build/rustc-1.66.1-src/src/tools/cargo)
error: linking with `/nix/store/gcc-wrapper-11.3.0/bin/cc` failed: exit status: 1
  |
  = note: /nix/store/binutils-2.39/bin/ld: skipping incompatible /nix/store/zlib-aarch64-unknown-linux-gnu-1.2.13/lib/libz.so when searching for -lz
          /nix/store/binutils-2.39/bin/ld: cannot find -lz: No such file or directory
          /nix/store/binutils-2.39/bin/ld: skipping incompatible /nix/store/zlib-aarch64-unknown-linux-gnu-1.2.13/lib/libz.so when searching for -lz
          collect2: error: ld returned 1 exit status
---
 pkgs/development/compilers/rust/cargo.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 291a64f2210c..9b10767e5bff 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -26,6 +26,7 @@ rustPlatform.buildRustPackage {
   nativeBuildInputs = [
     pkg-config cmake installShellFiles makeWrapper
     (lib.getDev pkgsHostHost.curl)
+    zlib
   ];
   buildInputs = [ cacert file curl python3 openssl zlib ]
     ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ];

From dcf630c172df2a9ecaa47c77f868211e61ae8e52 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 11 Jan 2023 23:24:12 +0300
Subject: [PATCH 928/953] mesa: 22.3.2 -> 22.3.3

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index ea290ed03317..c853c172d240 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -41,7 +41,7 @@ with lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "22.3.2";
+  version = "22.3.3";
   branch  = versions.major version;
 
   withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm;
@@ -64,7 +64,7 @@ self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b";
+    sha256 = "sha256-vteZeIvyvZ7wedl82OCTSL9TywhoGFeOQHc7KxeBKSI=";
   };
 
   # TODO:

From 2b06f2a986fa922265e5eb05ab49633b9a961449 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 11 Jan 2023 11:42:45 +0300
Subject: [PATCH 929/953] darwin/apple-sdk-11.0: expose xcodebuild directly

---
 pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
index 4565f698d26c..42109062b72d 100644
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
@@ -58,17 +58,18 @@ let
     configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration;
     IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit;
 
-    callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec {
+    xcodebuild = pkgs.xcbuild.override {
       inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
+      inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO;
+    };
+
+    callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec {
+      inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild;
       darwin = pkgs.darwin.overrideScope (_: prev: {
         inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security;
         apple_sdk = prev.darwin.apple_sdk_11_0;
         CF = prev.darwin.apple_sdk_11_0.CoreFoundation;
       });
-      xcodebuild = pkgs.xcbuild.override {
-        inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO;
-        inherit stdenv;
-      };
       xcbuild = xcodebuild;
     });
 

From 5802c306876a217179b0448613fbde4af8af1fae Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Jan 2023 19:22:15 +0300
Subject: [PATCH 930/953] qt5: build with SDK 11.0 on all Darwins (hopefully)

---
 .../libraries/qt-5/5.15/default.nix           |  29 +--
 .../0001-qtbase-mkspecs-mac.patch             |  43 ++--
 .../0011-fix-header_module.patch              |   7 +-
 .../0013-define-kiosurfacesuccess.patch       |  16 --
 .../qtbase.patch.d/0014-aarch64-darwin.patch  |  12 --
 ...g-set-image-only-on-the-first-drag-i.patch |  47 -----
 ...g-drag-make-sure-clipboard-is-ours-a.patch |  40 ----
 ...g-maybeDragMultipleItems-fix-erroneo.patch |  27 ---
 ...g-avoid-using-the-deprecated-API-if-.patch | 194 ------------------
 ...cOS-Fix-use-of-deprecated-NSOffState.patch |  26 ---
 ...15.0-src-plugins-platforms-cocoa-qco.patch |  77 -------
 .../qtbase.patch.d/qtbase-sdk-10.12-mac.patch |  77 -------
 ...qtwebengine-darwin-no-platform-check.patch |  25 ---
 .../libraries/qt-5/modules/qtwebengine.nix    |  10 -
 pkgs/top-level/all-packages.nix               |   3 +-
 15 files changed, 46 insertions(+), 587 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 178150e26549..177cafbd6fc9 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -30,16 +30,6 @@ let
     qtbase = lib.optionals stdenv.isDarwin [
       ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
 
-      # Downgrade minimal required SDK to 10.12
-      ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
-      ./qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
-      ./qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
-      ./qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
-      ./qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
-      ./qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
-      ./qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
-      ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
-
       # Patch framework detection to support X.framework/X.tbd,
       # extending the current support for X.framework/X.
       ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
@@ -136,9 +126,10 @@ let
         inherit bison cups harfbuzz libGL;
         withGtk3 = !stdenv.isDarwin; inherit dconf gtk3;
         inherit developerBuild decryptSslTraffic;
-        inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth
+        inherit (darwin.apple_sdk_11_0.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth
           CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit;
-        inherit (darwin) libobjc;
+        libobjc = darwin.apple_sdk_11_0.objc4;
+        xcbuild = darwin.apple_sdk_11_0.xcodebuild;
       };
 
       qt3d = callPackage ../modules/qt3d.nix {};
@@ -147,7 +138,7 @@ let
       qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
       qtdoc = callPackage ../modules/qtdoc.nix {};
       qtgamepad = callPackage ../modules/qtgamepad.nix {
-        inherit (darwin.apple_sdk.frameworks) GameController;
+        inherit (darwin.apple_sdk_11_0.frameworks) GameController;
       };
       qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
       qtimageformats = callPackage ../modules/qtimageformats.nix {};
@@ -181,19 +172,21 @@ let
           rm -r src/3rdparty/chromium/third_party/catapult
           cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult
         '';
-        inherit (darwin) cctools libobjc libunwind xnu;
-        inherit (darwin.apple_sdk.libs) sandbox;
-        inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
+        inherit (darwin) cctools xnu;
+        inherit (darwin.apple_sdk_11_0) libunwind;
+        inherit (darwin.apple_sdk_11_0.libs) sandbox;
+        inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
           ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication;
+        libobjc = darwin.apple_sdk_11_0.objc4;
       };
       qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
       qtwebkit = callPackage ../modules/qtwebkit.nix {
         inherit (darwin) ICU;
-        inherit (darwin.apple_sdk.frameworks) OpenGL;
+        inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
       };
       qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
       qtwebview = callPackage ../modules/qtwebview.nix {
-        inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit;
+        inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation WebKit;
       };
       qtx11extras = callPackage ../modules/qtx11extras.nix {};
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
index faf0b643fdba..9d2a47c7c348 100644
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
+++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@@ -27,7 +27,7 @@ index 61bea952b2..9909dae726 100644
  
  QMAKE_LFLAGS_REL_RPATH  =
 diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
-index 92a9112bca..b80ec1e801 100644
+index abc6d82ade..59b94fe5b6 100644
 --- a/mkspecs/features/mac/default_post.prf
 +++ b/mkspecs/features/mac/default_post.prf
 @@ -1,9 +1,5 @@
@@ -62,7 +62,7 @@ index 92a9112bca..b80ec1e801 100644
 -
 -        !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) {
 -            warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\
--                    "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.")
+-                    "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.")
 -            warning("This is an unsupported configuration. You may experience build issues," \
 -                    "and by using")
 -            warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \
@@ -77,7 +77,7 @@ index 92a9112bca..b80ec1e801 100644
  }
  
  !no_objective_c:CONFIG += objective_c
-@@ -73,212 +39,6 @@ qt {
+@@ -73,230 +39,6 @@ qt {
      }
  }
  
@@ -103,6 +103,19 @@ index 92a9112bca..b80ec1e801 100644
 -    QMAKE_LFLAGS              += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
 -}
 -
+-macos {
+-    !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) {
+-        # If the user has requested a specific set of architectures,
+-        # build all of those by default, but limited to only those.
+-        CONFIG -= only_active_arch
+-    } else {
+-        # Otherwise allow building all of the architectures available
+-        # in Qt, but only build the active arch (unless the user has
+-        # manually overridden this via CONFIG -= only_active_arch).
+-        QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS
+-    }
+-}
+-
 -macx-xcode {
 -    qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO
 -    !isEmpty(QMAKE_PKGINFO_TYPEINFO): \
@@ -158,15 +171,20 @@ index 92a9112bca..b80ec1e801 100644
 -    simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
 -    VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
 -
--    isEmpty(VALID_ARCHS): \
--        error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
--
 -    single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
 -
--    ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
--    ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))
+-    macos {
+-        only_active_arch: DEFAULT_ARCHS = $$system("uname -m")
+-        else: DEFAULT_ARCHS = $$VALID_ARCHS
+-    }
 -
--    QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS
+-    ARCHS = $(filter $(EXPORT_VALID_ARCHS), \
+-        $(if $(ARCHS), $(ARCHS), \
+-            $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \
+-        $(EXPORT_VALID_ARCHS))))
+-    ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))
+-
+-    QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS
 -
 -    arch_flags = $(EXPORT_ARCH_ARGS)
 -
@@ -291,11 +309,12 @@ index 92a9112bca..b80ec1e801 100644
      generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
      generate_xcode_project.target = xcodeproj
 diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index e3534561a5..3b01424e67 100644
+index 2c91ba6679..a6ab233825 100644
 --- a/mkspecs/features/mac/default_pre.prf
 +++ b/mkspecs/features/mac/default_pre.prf
-@@ -1,60 +1,2 @@
- CONFIG = asset_catalogs rez $$CONFIG
+@@ -21,61 +21,3 @@ macos {
+ }
+ 
  load(default_pre)
 -
 -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch
index 98738656114d..bdb6a3616567 100644
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch
+++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch
@@ -8,11 +8,11 @@ Subject: [PATCH 11/11] fix header_module
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index b9e5d35026..9924271042 100644
+index 0b2a30d159..37271e09d9 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -84,7 +84,7 @@ header_module {
-         CONFIG  += qt_no_install_library
+         qt_no_install_library
  
      # Allow creation of .prl, .la and .pc files.
 -    target.path = $$[QT_INSTALL_LIBS]
@@ -20,6 +20,3 @@ index b9e5d35026..9924271042 100644
      target.CONFIG += dummy_install
      INSTALLS    += target
  } else {
--- 
-2.25.4
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
deleted file mode 100644
index a43a46d8a69b..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
-index a367487e..c3aeca1d 100644
---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
-+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
-@@ -49,6 +49,11 @@
- // but was only added in the 10.14 SDK, so declare it just in case.
- extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
- 
-+// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html
-+#if !defined(kIOSurfaceSuccess)
-+#define kIOSurfaceSuccess KERN_SUCCESS
-+#endif
-+
- QT_BEGIN_NAMESPACE
- 
- Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch
index 8ef1b08a5b88..f0809f8f9a3f 100644
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch
@@ -86,18 +86,6 @@ index 0cf1f31b60d..042319a2aa3 100644
 +include(clang-mac.conf)
  
  load(qt_config)
-diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
-index d16b77acb8e..4ba0a8eaa36 100644
---- a/mkspecs/common/macx.conf
-+++ b/mkspecs/common/macx.conf
-@@ -6,7 +6,6 @@ QMAKE_PLATFORM         += macos osx macx
- QMAKE_MAC_SDK           = macosx
- 
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
--QMAKE_APPLE_DEVICE_ARCHS = x86_64
- 
- # Should be 10.15, but as long as the CI builds with
- # older SDKs we have to keep this.
 diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app
 similarity index 100%
 rename from mkspecs/macx-clang/Info.plist.app
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
deleted file mode 100644
index de75ecbd0c17..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f156c35975e7844d2369ec5a6633ee40ec56f17a Mon Sep 17 00:00:00 2001
-From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
-Date: Mon, 7 Dec 2020 12:32:29 -0500
-Subject: [PATCH 1/6] Revert "QCocoaDrag - set image only on the first drag
- item"
-
-This reverts commit 7ee9bfc158a290776f622f62d0202220c6d159bc.
----
- src/plugins/platforms/cocoa/qcocoadrag.mm | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
-index 4bd1b129bd..a506126c72 100644
---- a/src/plugins/platforms/cocoa/qcocoadrag.mm
-+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
-@@ -217,18 +217,13 @@ bool QCocoaDrag::maybeDragMultipleItems()
-     // 0. We start from URLs, which can be actually in a list (thus technically
-     // only ONE item in the pasteboard. The fact it's only one does not help, we are
-     // still getting an exception because of the number of items/images mismatch ...
--    // We only set the image for the first item and nil for the rest, the image already
--    // contains a combined picture for all urls we drag.
--    auto imageOrNil = dragImage;
-     for (const auto &qtUrl : qtUrls) {
-         NSURL *nsUrl = qtUrl.toNSURL();
-         auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
-         const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
-                                             dragImage.size.width,
-                                             dragImage.size.height);
--
--        [newItem setDraggingFrame:itemFrame contents:imageOrNil];
--        imageOrNil = nil;
-+        [newItem setDraggingFrame:itemFrame contents:dragImage];
-         [dragItems addObject:newItem];
-     }
-     // 1. Repeat for non-url items, if any:
-@@ -237,7 +232,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
-         const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
-                                             dragImage.size.width,
-                                             dragImage.size.height);
--        [newItem setDraggingFrame:itemFrame contents:imageOrNil];
-+        [newItem setDraggingFrame:itemFrame contents:dragImage];
-         [dragItems addObject:newItem];
-     }
- 
--- 
-2.21.0
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
deleted file mode 100644
index ee3a2d9f5a4d..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9aaac67e3c3bf40ef3efc3b07b1655f72c8c54aa Mon Sep 17 00:00:00 2001
-From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
-Date: Mon, 7 Dec 2020 12:32:31 -0500
-Subject: [PATCH 2/6] Revert "QCocoaDrag::drag - make sure clipboard is ours
- and populated"
-
-This reverts commit 720e2e0c92ca6635c5f05f318770a70cf653c1c7.
----
- src/plugins/platforms/cocoa/qcocoadrag.mm | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
-index a506126c72..c6ee4323ce 100644
---- a/src/plugins/platforms/cocoa/qcocoadrag.mm
-+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
-@@ -131,10 +131,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
-     m_drag = o;
-     m_executed_drop_action = Qt::IgnoreAction;
- 
--    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
--    m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
--    dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
--
-     if (maybeDragMultipleItems())
-         return m_executed_drop_action;
- 
-@@ -143,6 +139,10 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
-     NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
-     Q_ASSERT(dragImage);
- 
-+    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
-+    m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
-+    dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
-+
-     NSPoint event_location = [m_lastEvent locationInWindow];
-     NSWindow *theWindow = [m_lastEvent window];
-     Q_ASSERT(theWindow);
--- 
-2.21.0
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
deleted file mode 100644
index 55211fca64c7..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d1626c55d10537274c6f365855342a1c619a4c3a Mon Sep 17 00:00:00 2001
-From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
-Date: Mon, 7 Dec 2020 12:32:32 -0500
-Subject: [PATCH 3/6] Revert "QCocoaDrag::maybeDragMultipleItems - fix
- erroneous size check"
-
-This reverts commit b8a03411784803c07ecc1f769860756d6fdc04cd.
----
- src/plugins/platforms/cocoa/qcocoadrag.mm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
-index c6ee4323ce..ab6863a432 100644
---- a/src/plugins/platforms/cocoa/qcocoadrag.mm
-+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
-@@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
-     const auto &qtUrls = m_drag->mimeData()->urls();
-     NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
- 
--    if (qtUrls.size() <= 1) {
-+    if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
-         // Good old -dragImage: works perfectly for this ...
-         return false;
-     }
--- 
-2.21.0
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
deleted file mode 100644
index ee9b80ca6ed4..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From d5c155a9f3ff38e28ac073f6df43175724ebc290 Mon Sep 17 00:00:00 2001
-From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
-Date: Mon, 7 Dec 2020 12:32:34 -0500
-Subject: [PATCH 4/6] Revert "QCocoaDrag - avoid using the deprecated API if
- possible"
-
-This reverts commit 8481a9fc974a1f1dd44a9f82decb18fe2290689f.
----
- src/plugins/platforms/cocoa/qcocoadrag.h      |  6 --
- src/plugins/platforms/cocoa/qcocoadrag.mm     | 90 -------------------
- .../platforms/cocoa/qnsview_dragging.mm       |  9 +-
- 3 files changed, 1 insertion(+), 104 deletions(-)
-
-diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h
-index 975741c270..5a5b985c6e 100644
---- a/src/plugins/platforms/cocoa/qcocoadrag.h
-+++ b/src/plugins/platforms/cocoa/qcocoadrag.h
-@@ -48,8 +48,6 @@
- #include <QtGui/private/qdnd_p.h>
- #include <QtGui/private/qinternalmimedata_p.h>
- 
--#include <QtCore/qeventloop.h>
--
- QT_BEGIN_NAMESPACE
- 
- class QCocoaDrag : public QPlatformDrag
-@@ -71,15 +69,11 @@ public:
-     void setLastMouseEvent(NSEvent *event, NSView *view);
- 
-     void setAcceptedAction(Qt::DropAction act);
--    void exitDragLoop();
- private:
-     QDrag *m_drag;
-     NSEvent *m_lastEvent;
-     NSView *m_lastView;
-     Qt::DropAction m_executed_drop_action;
--    QEventLoop internalDragLoop;
--
--    bool maybeDragMultipleItems();
- 
-     QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const;
- };
-diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
-index ab6863a432..b4a16ab912 100644
---- a/src/plugins/platforms/cocoa/qcocoadrag.mm
-+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
-@@ -44,9 +44,6 @@
- #include <QtWidgets/qwidget.h>
- #endif
- #include <QtGui/private/qcoregraphics_p.h>
--#include <QtCore/qsysinfo.h>
--
--#include <vector>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -131,9 +128,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
-     m_drag = o;
-     m_executed_drop_action = Qt::IgnoreAction;
- 
--    if (maybeDragMultipleItems())
--        return m_executed_drop_action;
--
-     QPoint hotSpot = m_drag->hotSpot();
-     QPixmap pm = dragPixmap(m_drag, hotSpot);
-     NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
-@@ -164,95 +158,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
-     return m_executed_drop_action;
- }
- 
--bool QCocoaDrag::maybeDragMultipleItems()
--{
--    Q_ASSERT(m_drag && m_drag->mimeData());
--    Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction);
--
--    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) {
--        // -dragImage: stopped working in 10.14 first.
--        return false;
--    }
--
--    const QMacAutoReleasePool pool;
--
--    NSWindow *theWindow = [m_lastEvent window];
--    Q_ASSERT(theWindow);
--
--    if (![theWindow.contentView respondsToSelector:@selector(draggingSession:sourceOperationMaskForDraggingContext:)])
--        return false;
--
--    auto *sourceView = static_cast<NSView<NSDraggingSource>*>(theWindow.contentView);
--
--    const auto &qtUrls = m_drag->mimeData()->urls();
--    NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
--
--    if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
--        // Good old -dragImage: works perfectly for this ...
--        return false;
--    }
--
--    std::vector<NSPasteboardItem *> nonUrls;
--    for (NSPasteboardItem *item in dragBoard.pasteboardItems) {
--        bool isUrl = false;
--        for (NSPasteboardType type in item.types) {
--            using NSStringRef = NSString *;
--            if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) {
--                isUrl = true;
--                break;
--            }
--        }
--
--        if (!isUrl)
--            nonUrls.push_back(item);
--    }
--
--    QPoint hotSpot = m_drag->hotSpot();
--    const auto pixmap = dragPixmap(m_drag, hotSpot);
--    NSImage *dragImage = [NSImage imageFromQImage:pixmap.toImage()];
--    Q_ASSERT(dragImage);
--
--    NSMutableArray<NSDraggingItem *> *dragItems = [[[NSMutableArray alloc] init] autorelease];
--    const NSPoint itemLocation = m_drag->hotSpot().toCGPoint();
--    // 0. We start from URLs, which can be actually in a list (thus technically
--    // only ONE item in the pasteboard. The fact it's only one does not help, we are
--    // still getting an exception because of the number of items/images mismatch ...
--    for (const auto &qtUrl : qtUrls) {
--        NSURL *nsUrl = qtUrl.toNSURL();
--        auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
--        const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
--                                            dragImage.size.width,
--                                            dragImage.size.height);
--        [newItem setDraggingFrame:itemFrame contents:dragImage];
--        [dragItems addObject:newItem];
--    }
--    // 1. Repeat for non-url items, if any:
--    for (auto *pbItem : nonUrls) {
--        auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease];
--        const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
--                                            dragImage.size.width,
--                                            dragImage.size.height);
--        [newItem setDraggingFrame:itemFrame contents:dragImage];
--        [dragItems addObject:newItem];
--    }
--
--    [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView];
--    internalDragLoop.exec();
--    return true;
--}
--
- void QCocoaDrag::setAcceptedAction(Qt::DropAction act)
- {
-     m_executed_drop_action = act;
- }
- 
--void QCocoaDrag::exitDragLoop()
--{
--    if (internalDragLoop.isRunning())
--        internalDragLoop.exit();
--}
--
--
- QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const
- {
-     const QMimeData* data = drag->mimeData();
-diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
-index 978d73f7d9..463e3c5579 100644
---- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
-+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
-@@ -232,10 +232,6 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
-     if (!target)
-         return;
- 
--    auto *nativeDrag = QCocoaIntegration::instance()->drag();
--    Q_ASSERT(nativeDrag);
--    nativeDrag->exitDragLoop();
--
-     QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint();
- 
-     qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint;
-@@ -294,12 +294,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
-     if (!target)
-         return;
- 
--    QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
--    Q_ASSERT(nativeDrag);
--    nativeDrag->exitDragLoop();
--    // for internal drag'n'drop, don't override the action the drop event accepted
--    if (!nativeDrag->currentDrag())
--        nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
-+    QCocoaIntegration::instance()->drag();
- 
-     // Qt starts drag-and-drop on a mouse button press event. Cococa in
-     // this case won't send the matching release event, so we have to
--- 
-2.21.0
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
deleted file mode 100644
index f93f80055982..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001
-From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
-Date: Mon, 7 Dec 2020 12:32:37 -0500
-Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState"
-
-This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd.
----
- src/plugins/styles/mac/qmacstyle_mac.mm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
-index d1febd81d4..b5e6e60ec0 100644
---- a/src/plugins/styles/mac/qmacstyle_mac.mm
-+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
-@@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
-                     pbCell = static_cast<NSPopUpButtonCell *>(pb.cell);
-                     oldPosition = pbCell.arrowPosition;
-                     pbCell.arrowPosition = NSPopUpNoArrow;
--                    if (pb.state == NSControlStateValueOff) {
-+                    if (pb.state == NSOffState) {
-                         // NSPopUpButton in this state is smaller.
-                         rAdjusted.origin.x -= 3;
-                         rAdjusted.size.width += 6;
--- 
-2.21.0
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
deleted file mode 100644
index b5c634aff76b..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 3ce5e752c66307f905fdf732b102a396d9248fbb Mon Sep 17 00:00:00 2001
-From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
-Date: Mon, 7 Dec 2020 13:22:02 -0500
-Subject: [PATCH 6/6] git checkout v5.15.0 --
- src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
-
----
- .../cocoa/qcocoacolordialoghelper.mm          | 50 +++++++++----------
- 1 file changed, 25 insertions(+), 25 deletions(-)
-
-diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
-index 5ad1f9d7bb..c9fa035d87 100644
---- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
-+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
-@@ -180,34 +180,34 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
- 
- - (void)updateQtColor
- {
--    // Discard the color space and pass the color components to QColor. This
--    // is a good option as long as QColor is color-unmanaged: we preserve the
--    // exact RGB value from the color picker, which is predictable. Further,
--    // painting with the color will reproduce the same color on-screen, as
--    // long as the the same screen is used for selecting the color.
--    NSColor *componentColor = [[mColorPanel color] colorUsingType:NSColorTypeComponentBased];
--    switch (componentColor.colorSpace.colorSpaceModel)
--    {
--    case NSColorSpaceModelGray: {
--        CGFloat white = 0, alpha = 0;
--        [componentColor getWhite:&white alpha:&alpha];
--        mQtColor.setRgbF(white, white, white, alpha);
--    } break;
--    case NSColorSpaceModelRGB: {
--        CGFloat red = 0, green = 0, blue = 0, alpha = 0;
--        [componentColor getRed:&red green:&green blue:&blue alpha:&alpha];
--        mQtColor.setRgbF(red, green, blue, alpha);
--    } break;
--    case NSColorSpaceModelCMYK: {
-+    NSColor *color = [mColorPanel color];
-+    NSString *colorSpaceName = [color colorSpaceName];
-+    if (colorSpaceName == NSDeviceCMYKColorSpace) {
-         CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0;
--        [componentColor getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
-+        [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
-         mQtColor.setCmykF(cyan, magenta, yellow, black, alpha);
--    } break;
--    default:
--        qWarning("QNSColorPanelDelegate: Unsupported color space model");
--    break;
-+    } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace)  {
-+        CGFloat red = 0, green = 0, blue = 0, alpha = 0;
-+        [color getRed:&red green:&green blue:&blue alpha:&alpha];
-+        mQtColor.setRgbF(red, green, blue, alpha);
-+    } else if (colorSpaceName == NSNamedColorSpace) {
-+        NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
-+        CGFloat red = 0, green = 0, blue = 0, alpha = 0;
-+        [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
-+        mQtColor.setRgbF(red, green, blue, alpha);
-+    } else {
-+        NSColorSpace *colorSpace = [color colorSpace];
-+        if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){
-+            CGFloat components[5];
-+            [color getComponents:components];
-+            mQtColor.setCmykF(components[0], components[1], components[2], components[3], components[4]);
-+        } else {
-+            NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
-+            CGFloat red = 0, green = 0, blue = 0, alpha = 0;
-+            [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
-+            mQtColor.setRgbF(red, green, blue, alpha);
-+        }
-     }
--
-     if (mHelper)
-         emit mHelper->currentColorChanged(mQtColor);
- }
--- 
-2.21.0
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
deleted file mode 100644
index 3638268de7af..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
---- a/mkspecs/common/macx.conf
-+++ b/mkspecs/common/macx.conf
-@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64
- 
- # Should be 10.15, but as long as the CI builds with
- # older SDKs we have to keep this.
--QT_MAC_SDK_VERSION_MIN = 10.14
-+QT_MAC_SDK_VERSION_MIN = 10.12
- 
- QT_MAC_SDK_VERSION_MAX = 10.15
- 
-diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
---- a/src/corelib/kernel/qcore_mac.mm
-+++ b/src/corelib/kernel/qcore_mac.mm
-@@ -261,16 +261,10 @@ QMacAutoReleasePool::QMacAutoReleasePool()
- 
- #ifdef QT_DEBUG
-     void *poolFrame = nullptr;
--    if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
--        void *frame;
--        if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1))
--            poolFrame = frame;
--    } else {
-         static const int maxFrames = 3;
-         void *callstack[maxFrames];
-         if (backtrace(callstack, maxFrames) == maxFrames)
-             poolFrame = callstack[maxFrames - 1];
--    }
- 
-     if (poolFrame) {
-         Dl_info info;
-diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
---- a/src/gui/rhi/qrhi.cpp
-+++ b/src/gui/rhi/qrhi.cpp
-@@ -4251,7 +4251,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh
-         break;
- #endif
-     case Metal:
--#if defined(Q_OS_MACOS) || defined(Q_OS_IOS)
-+#if 0
-         r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params),
-                              static_cast<QRhiMetalNativeHandles *>(importDevice));
-         break;
-diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri
---- a/src/gui/rhi/rhi.pri
-+++ b/src/gui/rhi/rhi.pri
-@@ -43,7 +43,7 @@ win32 {
-     LIBS += -ld3d11 -ldxgi -ldxguid
- }
- 
--macos|ios {
-+false {
-     HEADERS += \
-         rhi/qrhimetal_p.h \
-         rhi/qrhimetal_p_p.h
-diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
---- a/src/plugins/platforms/cocoa/qcocoadrag.mm
-+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
-@@ -133,7 +133,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
-     NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
-     Q_ASSERT(dragImage);
- 
--    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
-+    QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND);
-     m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
-     dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
- 
-@@ -144,7 +144,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
-     CGFloat flippedY = dragImage.size.height - hotSpot.y();
-     event_location.y -= flippedY;
-     NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0);
--    NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
-+    NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
- 
-     [theWindow dragImage:dragImage
-         at:event_location
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
index 44df09299251..86663ee80b57 100644
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
+++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
@@ -1,28 +1,3 @@
-diff a/configure.pri b/configure.pri
---- a/configure.pri
-+++ b/configure.pri
-@@ -439,8 +439,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) {
- 
- defineTest(qtwebengine_isMacOsPlatformSupported) {
-     !qtwebengine_isMinXcodeVersion(10, 0, 0) {
--        qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.")
--        return(false)
-     }
-     !clang|intel_icc {
-         qtwebengine_platformError("requires Clang.")
-@@ -449,12 +447,6 @@ defineTest(qtwebengine_isMacOsPlatformSupported) {
-     # We require macOS 10.13 (darwin version 17.0.0) or newer.
-     darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
-     lessThan(darwin_major_version, 17) {
--        qtwebengine_platformError("requires macOS version 10.13 or newer.")
--        return(false)
--    }
--    !qtwebengine_isMinOSXSDKVersion(10, 13): {
--        qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
--        return(false)
-     }
-     return(true)
- }
 diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri
 --- a/src/buildtools/config/mac_osx.pri
 +++ b/src/buildtools/config/mac_osx.pri
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index d337b030ab8f..d342996c67e7 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -118,16 +118,6 @@ qtModule {
     "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
     "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
     "-Wno-elaborated-enum-base"
-
-    #
-    # Prevent errors like
-    # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
-    # error: pointer to non-const type 'id' with no explicit ownership
-    #     id** _kvcPropertyAccessors;
-    #
-    # TODO remove when new Apple SDK is in
-    #
-    "-fno-objc-arc"
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 133ff0345018..035e6397a967 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22503,11 +22503,12 @@ with pkgs;
   qt5 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.15) {
       inherit newScope;
-      inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
+      inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
       inherit bison cups dconf harfbuzz libGL perl gtk3 python3;
       inherit (gst_all_1) gstreamer gst-plugins-base;
       inherit darwin;
       inherit buildPackages;
+      stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     });
 
   libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix {

From 7c8ab8cb3b9501db61c8cb13c9974d523dfed634 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Jan 2023 19:22:30 +0300
Subject: [PATCH 931/953] qt5: remove remaining version checks

---
 .../libraries/qt-5/modules/qtbase.nix         | 66 +++++--------------
 .../libraries/qt-5/modules/qtwayland.nix      |  6 +-
 .../libraries/qt-5/modules/qtwebengine.nix    | 44 ++++---------
 .../libraries/qt-5/modules/qtwebkit.nix       | 28 ++------
 4 files changed, 42 insertions(+), 102 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0102c2fd1b6f..44f72701854c 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -9,7 +9,7 @@
 
 , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite
 , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb
-, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil
+, libxkbcommon, libxml2, libxslt, openssl, pcre2, sqlite, udev, xcbutil
 , xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core
 
   # optional dependencies
@@ -27,8 +27,6 @@
 }:
 
 let
-  compareVersion = v: builtins.compareVersions version v;
-  qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash";
   debugSymbols = debug || developerBuild;
 in
 
@@ -45,7 +43,7 @@ stdenv.mkDerivation {
 
     # Image formats
     libjpeg libpng
-    (if compareVersion "5.9.0" < 0 then pcre16 else pcre2)
+    pcre2
   ] ++ (
     if stdenv.isDarwin then [
       # TODO: move to buildInputs, this should not be propagated.
@@ -116,7 +114,7 @@ stdenv.mkDerivation {
 
     # https://bugs.gentoo.org/803470
     sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json
-  '' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
+
     patchShebangs ./bin
   '' + (
     if stdenv.isDarwin then ''
@@ -146,22 +144,18 @@ stdenv.mkDerivation {
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
-    ${lib.optionalString (compareVersion "5.9.0" < 0) ''
-    # We need to set LD to CXX or otherwise we get nasty compile errors
-    export LD=$CXX
-    ''}
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
 
     # paralellize compilation of qtmake, which happens within ./configure
     export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
-  '' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
+
     ./bin/syncqt.pl -version $version
   '';
 
   postConfigure = ''
     qmakeCacheInjectNixOutputs() {
-        local cache="$1/${qmakeCacheName}"
+        local cache="$1/.qmake.stash"
         echo "qmakeCacheInjectNixOutputs: $cache"
         if ! [ -f "$cache" ]; then
             echo >&2 "qmakeCacheInjectNixOutputs: WARNING: $cache does not exist"
@@ -184,7 +178,7 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = toString ([
     "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
     ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
-    ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"''
+    ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
     ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
   ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
     ++ lib.optional stdenv.isLinux "-DUSE_X11"
@@ -192,14 +186,10 @@ stdenv.mkDerivation {
       # ignore "is only available on macOS 10.12.2 or newer" in obj-c code
       "-Wno-error=unguarded-availability"
     ]
-    ++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [
-      # .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate'
-      "-DQ_OS_MAC"
-    ] ++ lib.optionals withGtk3 [
+    ++ lib.optionals withGtk3 [
          ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
          ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
-       ]
-    ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC");
+  ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC");
 
   prefixKey = "-prefix ";
 
@@ -233,18 +223,14 @@ stdenv.mkDerivation {
     "-L" "${icu.out}/lib"
     "-I" "${icu.dev}/include"
     "-pch"
-  ] ++ lib.optional debugSymbols "-debug"
-    ++ lib.optionals (compareVersion "5.11.0" < 0) [
-    "-qml-debug"
-  ] ++ lib.optionals (compareVersion "5.9.0" < 0) [
-    "-c++11"
-    "-no-reduce-relocations"
-  ] ++ lib.optionals developerBuild [
+  ]
+  ++ lib.optional debugSymbols "-debug"
+  ++ lib.optionals developerBuild [
     "-developer-build"
     "-no-warnings-are-errors"
   ] ++ (if (!stdenv.hostPlatform.isx86_64) then [
     "-no-sse2"
-  ] else lib.optionals (compareVersion "5.9.0" >= 0) [
+  ] else [
     "-sse2"
     "${lib.optionalString (!stdenv.hostPlatform.sse3Support)   "-no"}-sse3"
     "${lib.optionalString (!stdenv.hostPlatform.ssse3Support)  "-no"}-ssse3"
@@ -278,7 +264,7 @@ stdenv.mkDerivation {
     "-make tools"
     ''-${lib.optionalString (!buildExamples) "no"}make examples''
     ''-${lib.optionalString (!buildTests) "no"}make tests''
-  ] ++ lib.optional (compareVersion "5.15.0" < 0) "-v"
+  ]
     ++ (
       if stdenv.isDarwin then [
       "-no-fontconfig"
@@ -286,9 +272,8 @@ stdenv.mkDerivation {
       "-qt-libpng"
       "-no-framework"
     ] else [
-      "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath"
-    ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb"
-      ++ [
+      "-rpath"
+    ] ++ [
       "-xcb"
       "-qpa xcb"
       "-L" "${libX11.out}/lib"
@@ -303,20 +288,11 @@ stdenv.mkDerivation {
       ''-${lib.optionalString (cups == null) "no-"}cups''
       "-dbus-linked"
       "-glib"
-    ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg"
-      ++ [
+    ] ++ [
       "-system-libpng"
     ] ++ lib.optional withGtk3 "-gtk"
-      ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify"
-      ++ lib.optionals (compareVersion "5.10.0" >= 0) [
-      # Without these, Qt stops working on kernels < 3.17. See:
-      # https://github.com/NixOS/nixpkgs/issues/38832
-      "-no-feature-renameat2"
-      "-no-feature-getentropy"
-    ] ++ lib.optionals (compareVersion "5.12.1" < 0) [
-      # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1
-      "-system-xkbcommon"
-      "-xkbcommon-evdev"
+      ++ [
+        "-inotify"
     ] ++ lib.optionals (cups != null) [
       "-L" "${cups.lib}/lib"
       "-I" "${cups.dev}/include"
@@ -368,12 +344,6 @@ stdenv.mkDerivation {
     license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ];
     maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
     platforms = platforms.unix;
-    # Qt5 is broken on aarch64-darwin
-    # the build ends up with the following error:
-    #   error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc'
-    #   note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64
-    # it seems the qmake/cmake passes x86_64 as preferred architecture somewhere
-    broken = stdenv.isDarwin && stdenv.isAarch64 && (compareVersion "5.15.3" < 0);
   };
 
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix
index 10e18b3b9844..c7b61ab11f4b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix
@@ -11,14 +11,14 @@ qtModule {
     # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
     # context).  Beware: shared among different Qt5 versions.
     ./qtwayland-app_id.patch
-  ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.15")
+
     # Backport of https://codereview.qt-project.org/c/qt/qtwayland/+/388338
     # Pulled from Fedora as they modified it to not apply to KDE as Plasma 5.x
     # doesn't behave properly with the patch applied. See the discussion at
     # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/39 for details
-    # This patch won't apply to versions before 5.15.
     (fetchpatch {
       url = "https://src.fedoraproject.org/rpms/qt5-qtwayland/raw/46376bb00d4c3dd3db2e82ad7ca5301ce16ea4ab/f/0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch";
       sha256 = "sha256-XP+noYCk8fUdA0ItCqMjV7lSXDlNdB7Az9q7NRpupHc=";
-    });
+    })
+  ];
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index d342996c67e7..3cf2fedbadde 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -80,30 +80,21 @@ qtModule {
 
     sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
       src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-  '' + lib.optionalString stdenv.isDarwin (
-  (if (lib.versionAtLeast qtCompatVersion "5.14") then ''
+  '' + lib.optionalString stdenv.isDarwin (''
     substituteInPlace src/buildtools/config/mac_osx.pri \
       --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
-  '' else ''
-    substituteInPlace src/core/config/mac_osx.pri \
-      --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
-  '')
-   # Following is required to prevent a build error:
-   # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it
-  + ''
+
+    # Following is required to prevent a build error:
+    # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it
     substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
       --replace '$sysroot/usr' "${xnu}"
-  ''
-  # Apple has some secret stuff they don't share with OpenBSM
-  + (if (lib.versionAtLeast qtCompatVersion "5.14") then ''
-  substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \
-    --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]"
-  substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \
-    --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]"
-  '' else ''
-  substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
-    --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
-  '')) + postPatch;
+
+    # Apple has some secret stuff they don't share with OpenBSM
+    substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \
+      --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]"
+    substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \
+      --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]"
+  '') + postPatch;
 
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
     # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
@@ -115,8 +106,6 @@ qtModule {
   ] ++ lib.optionals stdenv.cc.isClang [
     "-Wno-elaborated-enum-base"
   ] ++ lib.optionals stdenv.isDarwin [
-    "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
-    "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
     "-Wno-elaborated-enum-base"
   ];
 
@@ -129,7 +118,7 @@ qtModule {
   '';
 
   qmakeFlags = [ "--" "-system-ffmpeg" ]
-    ++ lib.optional (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire"
+    ++ lib.optional pipewireSupport "-webengine-webrtc-pipewire"
     ++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
 
   propagatedBuildInputs = [
@@ -163,7 +152,7 @@ qtModule {
     xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
     xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile
 
-  ] ++ lib.optionals (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) [
+  ] ++ lib.optionals pipewireSupport [
     # Pipewire
     pipewire_0_2
   ]
@@ -221,7 +210,7 @@ qtModule {
     [Paths]
     Prefix = ..
     EOF
-  '' + lib.optionalString (lib.versions.majorMinor qtCompatVersion == "5.15") ''
+
     # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3)
     sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake
   '';
@@ -249,10 +238,5 @@ qtModule {
 
     # This build takes a long time; particularly on slow architectures
     timeout = 24 * 3600;
-    # we are still stuck with MacOS SDK 10.12 on x86_64-darwin
-    # and qtwebengine 5.14+ requires at least SDK 10.14
-    # (qtwebengine 5.12 is fine with SDK 10.12)
-    # on aarch64-darwin we are already at MacOS SDK 11.0
-    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 76f3481386f3..cc2644edd4e6 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -19,35 +19,21 @@ let
     '';
     buildInputs = [ perl ];
   };
-  usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0";
 in
 qtModule {
   pname = "qtwebkit";
-  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ]
-    ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
-    ++ lib.optional usingAnnulenWebkitFork qtwebchannel;
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
-    ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]
-    ++ lib.optional usingAnnulenWebkitFork hyphen;
-  nativeBuildInputs = [
-    bison flex gdb gperf perl pkg-config python38 ruby
-  ] ++ lib.optional usingAnnulenWebkitFork cmake;
+  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ]
+    ++ lib.optional stdenv.isDarwin qtmultimedia;
+  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ]
+    ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ];
+  nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python38 ruby cmake ];
 
-  cmakeFlags = lib.optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ]
+  cmakeFlags = [ "-DPORT=Qt" ]
     ++ lib.optionals stdenv.isDarwin [
       "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia"
       "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets"
       "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF"
-    ]);
-
-  # QtWebKit overrides qmake's default_pre and default_post features,
-  # so its custom qmake files must be found first at the front of QMAKEPATH.
-  preConfigure = lib.optionalString (!usingAnnulenWebkitFork) ''
-    QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
-    fixQtBuiltinPaths . '*.pr?'
-    # Fix hydra's "Log limit exceeded"
-    export qmakeFlags="$qmakeFlags CONFIG+=silent"
-  '';
+    ];
 
   NIX_CFLAGS_COMPILE = [
     # with gcc7 this warning blows the log over Hydra's limit

From 30840561195378b6d50eed27a4389e47a328cafe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 12 Jan 2023 11:19:25 +0300
Subject: [PATCH 932/953] qt5/qtwebengine: try patching out more Darwin
 platform checks

---
 .../libraries/qt-5/5.15/default.nix           |  1 +
 .../qt-5/5.15/qtwebengine-darwin-checks.patch | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 177cafbd6fc9..b877fda244a2 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -67,6 +67,7 @@ let
     ] ++ lib.optionals stdenv.isDarwin [
       ./qtwebengine-darwin-no-platform-check.patch
       ./qtwebengine-mac-dont-set-dsymutil-path.patch
+      ./qtwebengine-darwin-checks.patch
     ];
     qtwebkit = [
       (fetchpatch {
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch
new file mode 100644
index 000000000000..0d4154837829
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch
@@ -0,0 +1,29 @@
+diff --git a/configure.pri b/configure.pri
+index e072961f0..ac0861c01 100644
+--- a/configure.pri
++++ b/configure.pri
+@@ -442,24 +442,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) {
+ }
+ 
+ defineTest(qtwebengine_isMacOsPlatformSupported) {
+-    !qtwebengine_isMinXcodeVersion(10, 0, 0) {
+-        qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.")
+-        return(false)
+-    }
+-    !clang|intel_icc {
+-        qtwebengine_platformError("requires Clang.")
+-        return(false)
+-    }
+-    # We require macOS 10.13 (darwin version 17.0.0) or newer.
+-    darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
+-    lessThan(darwin_major_version, 17) {
+-        qtwebengine_platformError("requires macOS version 10.13 or newer.")
+-        return(false)
+-    }
+-    !qtwebengine_isMinOSXSDKVersion(10, 13): {
+-        qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+-        return(false)
+-    }
+     return(true)
+ }
+ 

From 251474b8cd83dc7ca2c8120fffdc9a964cb62292 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 12 Jan 2023 11:27:24 +0300
Subject: [PATCH 933/953] qt5/qtwebengine: use homebrew version of python3
 patches

It works on Mac
---
 pkgs/development/libraries/qt-5/5.15/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index b877fda244a2..dd33d9614207 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -55,14 +55,14 @@ let
     qtserialport = [ ./qtserialport.patch ];
     qtwebengine = [
       (fetchpatch {
-        url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-python3.patch";
+        url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a6f16c6daea3b5a1f7bc9f175d1645922c131563/qt5/qt5-webengine-python3.patch";
         hash = "sha256-rUSDwTucXVP3Obdck7LRTeKZ+JYQSNhQ7+W31uHZ9yM=";
       })
       (fetchpatch {
-        url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-chromium-python3.patch";
+        url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-chromium-python3.patch";
         stripLen = 1;
         extraPrefix = "src/3rdparty/";
-        hash = "sha256-BODOw1ksPPns2fmMrk6KC5Po513xB0f1ycbsIL9MmHE=";
+        hash = "sha256-MZGYeMdGzwypfKoSUaa56K3inbcGRx7he/+AFyk5ekA=";
       })
     ] ++ lib.optionals stdenv.isDarwin [
       ./qtwebengine-darwin-no-platform-check.patch

From 1f7691c10bafbbaf2d680134c39f6047a9bc35d0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 12 Jan 2023 13:50:28 +0300
Subject: [PATCH 934/953] mesa: build with SDK 11 on Darwin

Fixes build on x86_64-darwin
---
 pkgs/top-level/all-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 035e6397a967..b2e93a5bede9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21837,8 +21837,9 @@ with pkgs;
 
   mesa = callPackage ../development/libraries/mesa {
     llvmPackages = llvmPackages_latest;
-    inherit (darwin.apple_sdk.frameworks) OpenGL;
-    inherit (darwin.apple_sdk.libs) Xplugin;
+    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+    inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
+    inherit (darwin.apple_sdk_11_0.libs) Xplugin;
   };
 
   mesa_glu =  callPackage ../development/libraries/mesa-glu {

From 0db6b38fa2c0319ae7c7c6e5bbde4ca89a75d2a9 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 2 Jan 2023 19:06:44 -0500
Subject: [PATCH 935/953] roc-toolkit: 0.1.5 -> 0.2.1

---
 .../0001-Remove-deprecated-scons-call.patch   | 24 --------------
 ...002-Fix-compatibility-with-new-SCons.patch | 31 -------------------
 .../libraries/audio/roc-toolkit/default.nix   | 14 ++++-----
 .../fix-pkgconfig-installation.patch          | 13 ++++++++
 4 files changed, 19 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch
 delete mode 100644 pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch
 create mode 100644 pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch

diff --git a/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch b/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch
deleted file mode 100644
index e13dda549705..000000000000
--- a/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From abdfbb94df98fe88be4dd92ca587500126558411 Mon Sep 17 00:00:00 2001
-From: Victor Gaydov <victor@enise.org>
-Date: Sun, 26 Jul 2020 11:54:52 +0300
-Subject: [PATCH] Remove deprecated scons call
-
----
- SConstruct | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 407025d8..04afa91f 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[
- # performance tuning
- env.Decider('MD5-timestamp')
- env.SetOption('implicit_cache', 1)
--env.SourceCode('.', None)
- 
- # provide absolute path to force single sconsign file
- # per-directory sconsign files seems to be buggy with generated sources
--- 
-2.34.1
-
diff --git a/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch b/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch
deleted file mode 100644
index 097f1b3ff479..000000000000
--- a/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 15b37bb12a362c7889ac431eca4a47d6b2bdb97c Mon Sep 17 00:00:00 2001
-From: Victor Gaydov <victor@enise.org>
-Date: Sat, 5 Dec 2020 18:38:36 +0300
-Subject: [PATCH] Fix compatibility with new SCons
-
----
- site_scons/site_tools/roc/config.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/site_scons/site_tools/roc/config.py b/site_scons/site_tools/roc/config.py
-index b42b3adb..03b76be7 100644
---- a/site_scons/site_tools/roc/config.py
-+++ b/site_scons/site_tools/roc/config.py
-@@ -13,7 +13,13 @@ def _run_prog(context, src, suffix):
-     # RunProg may incorrectly use cached results from a previous run saved for
-     # different file contents but the same invocation number. To prevent this, we
-     # monkey patch its global counter with a hashsum of the file contents.
--    SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
-+    # The workaround is needed only for older versions of SCons, where
-+    # _ac_build_counter was an integer.
-+    try:
-+        if type(SCons.SConf._ac_build_counter) is int:
-+            SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
-+    except:
-+        pass
-     return context.RunProg(src, suffix)
- 
- def CheckLibWithHeaderExt(context, libs, headers, language, expr='1', run=True):
--- 
-2.34.1
-
diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix
index 98c088ed5495..e93ff5ef9a77 100644
--- a/pkgs/development/libraries/audio/roc-toolkit/default.nix
+++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix
@@ -8,6 +8,7 @@
   libuv,
   openfecSupport ? true,
   openfec,
+  speexdsp,
   libunwindSupport ? true,
   libunwind,
   pulseaudioSupport ? true,
@@ -16,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "roc-toolkit";
-  version = "0.1.5";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "roc-streaming";
     repo = "roc-toolkit";
     rev = "v${version}";
-    sha256 = "sha256:1pld340zfch4p3qaf5anrspq7vmxrgf9ddsdsq92pk49axaaz19w";
+    sha256 = "sha256-W8PiI5W1T6pNaYzR4u6fPtkP8DKq/Z85Kq/WF5dXVxo=";
   };
 
   nativeBuildInputs = [
@@ -37,15 +38,14 @@ stdenv.mkDerivation rec {
     libunwind
     openfec
     libpulseaudio
+    speexdsp
   ];
 
   sconsFlags =
     [ "--build=${stdenv.buildPlatform.config}"
       "--host=${stdenv.hostPlatform.config}"
       "--prefix=${placeholder "out"}"
-      "--disable-sox"
-      "--disable-doc"
-      "--disable-tests" ] ++
+      "--disable-sox" ] ++
     lib.optional (!libunwindSupport) "--disable-libunwind" ++
     lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++
     (if (!openfecSupport)
@@ -56,10 +56,8 @@ stdenv.mkDerivation rec {
   prePatch = lib.optionalString stdenv.isAarch64
     "sed -i 's/c++98/c++11/g' SConstruct";
 
-  # TODO: Remove these patches in the next version.
   patches = [
-    ./0001-Remove-deprecated-scons-call.patch
-    ./0002-Fix-compatibility-with-new-SCons.patch
+    ./fix-pkgconfig-installation.patch
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch b/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch
new file mode 100644
index 000000000000..8c6982f1f7c1
--- /dev/null
+++ b/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch
@@ -0,0 +1,13 @@
+diff --git a/src/SConscript b/src/SConscript
+index b59f67a7..9f16e0a2 100644
+--- a/src/SConscript
++++ b/src/SConscript
+@@ -141,7 +141,7 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e
+                 desc='Real-time audio streaming over the network.',
+                 url='https://roc-streaming.org',
+                 version=env['ROC_VERSION'])
+-            env.AddDistFile(env['PKG_CONFIG_PATH'], pc_file)
++            env.AddDistFile(os.path.join(env['ROC_SYSTEM_LIBDIR'], 'pkgconfig'), pc_file)
+ 
+ if GetOption('enable_examples'):
+     examples_env = subenvs.examples.Clone()

From 91558c86dedf5a84734654f1e4003d7b0fcbd085 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 12 Jan 2023 16:18:42 +0300
Subject: [PATCH 936/953] roc-toolkit: propagate buildInputs

Required by the pkg-config file for libroc.
---
 pkgs/development/libraries/audio/roc-toolkit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix
index e93ff5ef9a77..a4916eecfe41 100644
--- a/pkgs/development/libraries/audio/roc-toolkit/default.nix
+++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs = [
+  propagatedBuildInputs = [
     libuv
     libunwind
     openfec

From b9259df616359f2badec2ab315c88989eacc0ac5 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 12 Jan 2023 12:22:07 -0500
Subject: [PATCH 937/953] rustPlatform.buildRustPackage: fix cross compiling
 auditable packages

---
 pkgs/build-support/rust/build-rust-package/default.nix   | 3 ++-
 .../rust/cargo-auditable-cargo-wrapper.nix}              | 0
 .../default.nix => compilers/rust/cargo-auditable.nix}   | 0
 pkgs/development/compilers/rust/default.nix              | 2 ++
 pkgs/development/compilers/rust/make-rust-platform.nix   | 9 +++++++--
 pkgs/top-level/all-packages.nix                          | 4 +---
 6 files changed, 12 insertions(+), 6 deletions(-)
 rename pkgs/development/{tools/rust/cargo-auditable/cargo-wrapper.nix => compilers/rust/cargo-auditable-cargo-wrapper.nix} (100%)
 rename pkgs/development/{tools/rust/cargo-auditable/default.nix => compilers/rust/cargo-auditable.nix} (100%)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index a24425bf27aa..69ee4f56b98f 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -10,6 +10,7 @@
 , cargoInstallHook
 , cargoNextestHook
 , cargoSetupHook
+, cargo
 , cargo-auditable
 , cargo-auditable-cargo-wrapper
 , rustc
@@ -120,7 +121,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
 
   nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [
     (cargo-auditable-cargo-wrapper.override {
-      inherit cargo-auditable;
+      inherit cargo cargo-auditable;
     })
   ] ++ [
     cacert
diff --git a/pkgs/development/tools/rust/cargo-auditable/cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-auditable/cargo-wrapper.nix
rename to pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-auditable/default.nix
rename to pkgs/development/compilers/rust/cargo-auditable.nix
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 7a100f7ec911..42ca74c7164d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -81,6 +81,8 @@ in
         rustPlatform = bootRustPlatform;
         inherit CoreFoundation Security;
       };
+      cargo-auditable = self.callPackage ./cargo-auditable.nix { };
+      cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
       clippy = self.callPackage ./clippy.nix { inherit Security; };
     });
   };
diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix
index fcfd02dcf6cd..25a692565db3 100644
--- a/pkgs/development/compilers/rust/make-rust-platform.nix
+++ b/pkgs/development/compilers/rust/make-rust-platform.nix
@@ -1,6 +1,11 @@
 { buildPackages, callPackage, stdenv, runCommand }@prev:
 
-{ rustc, cargo, stdenv ? prev.stdenv, ... }:
+{ rustc
+, cargo
+, cargo-auditable ? null
+, stdenv ? prev.stdenv
+, ...
+}:
 
 rec {
   rust = {
@@ -14,7 +19,7 @@ rec {
 
   buildRustPackage = callPackage ../../../build-support/rust/build-rust-package {
     inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook
-      fetchCargoTarball importCargoLock rustc;
+      fetchCargoTarball importCargoLock rustc cargo cargo-auditable;
   };
 
   importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix { inherit cargo; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 133ff0345018..ef7c41a72ae8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15419,7 +15419,7 @@ with pkgs;
   rustPackages_1_66 = rust_1_66.packages.stable;
   rustPackages = rustPackages_1_66;
 
-  inherit (rustPackages) cargo clippy rustc rustPlatform;
+  inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
 
   makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {};
 
@@ -15449,8 +15449,6 @@ with pkgs;
   cargo-audit = callPackage ../development/tools/rust/cargo-audit {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-auditable = callPackage ../development/tools/rust/cargo-auditable { };
-  cargo-auditable-cargo-wrapper = callPackage ../development/tools/rust/cargo-auditable/cargo-wrapper.nix { };
   cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc {
     inherit (darwin.apple_sdk.frameworks) Security;
     openssl = openssl_1_1;

From 202c6e5720546835d377f9380ea8dfb24cf7b46f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 12 Jan 2023 16:14:40 +0300
Subject: [PATCH 938/953] pipewire: 0.3.63 -> 0.3.64

---
 .../development/libraries/pipewire/default.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 62b6536c047d..ad2bf00a6c23 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -2,7 +2,6 @@
 , lib
 , buildPackages
 , fetchFromGitLab
-, fetchpatch
 , python3
 , meson
 , ninja
@@ -68,7 +67,7 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "pipewire";
-    version = "0.3.63";
+    version = "0.3.64";
 
     outputs = [
       "out"
@@ -86,7 +85,7 @@ let
       owner = "pipewire";
       repo = "pipewire";
       rev = version;
-      sha256 = "sha256-GQJpw5G9YN7T2upu2FLUxE8UvMRev3K2j4Z1uK1/dt4=";
+      sha256 = "sha256-wIvdciLBWIQjENEipzbVID0eliOcEwqS567pLxVVOsc=";
     };
 
     patches = [
@@ -102,19 +101,6 @@ let
       ./0090-pipewire-config-template-paths.patch
       # Place SPA data files in lib output to avoid dependency cycles
       ./0095-spa-data-dir.patch
-
-      # FIXME: backports, remove after 0.3.64
-      # fix bluetooth issues
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c7b3ef0d9ff16a1e69a299870860bebcb628e298.patch";
-        hash = "sha256-hiZ6VUhMu8NgwX5DZ/JRVl/g1Go0nZQSjQVrmqIzXoY=";
-      })
-
-      # fix routes getting lost
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/89ac6b353521fb9a6d6eb6bb74724c4fa968f75c.patch";
-        hash = "sha256-vzHiKWGmyuUF2iDS/ZQws+bCXVYYEl048JaMckY/fGI=";
-      })
     ];
 
     nativeBuildInputs = [

From c70e91bcc7c5a731d25ccfa3421715ec6e782058 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 11 Jan 2023 04:34:59 +0000
Subject: [PATCH 939/953] tcb: mark as glibc-only

musl and UClibc, the other Linux libcs supported in Nixpkgs, don't
have NSS, so tcb can't be built for them.
---
 pkgs/tools/security/tcb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/tools/security/tcb/default.nix
index b49f7767dcbd..6a1f5b5eb5f2 100644
--- a/pkgs/tools/security/tcb/default.nix
+++ b/pkgs/tools/security/tcb/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.openwall.com/tcb/";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = systems.inspect.patterns.isGnu;
     maintainers = with maintainers; [ izorkin ];
   };
 }

From 0debb0b193b5155433806c025a6f1946f9cab554 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 11 Jan 2023 04:35:24 +0000
Subject: [PATCH 940/953] shadow: only use tcb where available

Fixes pkgsMusl.shadow.

Fixes: 0e32191623d ("shadow: add tcb support")
---
 pkgs/os-specific/linux/shadow/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 2d0e60716290..f0e2c281aa56 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -6,7 +6,7 @@
 , libxcrypt
 , glibcCross ? null
 , pam ? null
-, withTcb ? stdenv.isLinux, tcb
+, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb
 }:
 let
   glibc =

From 820f3452f4326a0aadb427a294d9b304a2b2f72e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 11 Jan 2023 06:16:18 +0000
Subject: [PATCH 941/953] pkgsMusl.systemd: fix build by updating patchset

---
 pkgs/os-specific/linux/systemd/default.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4c16e96fdb10..4329c8522839 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -6,7 +6,6 @@
 , fetchFromGitHub
 , fetchpatch
 , fetchzip
-, applyPatches
 , buildPackages
 , makeBinaryWrapper
 , ninja
@@ -89,7 +88,7 @@
 , withDocumentation ? true
 , withEfi ? stdenv.hostPlatform.isEfi && !stdenv.hostPlatform.isMusl
 , withFido2 ? true
-, withHomed ? true
+, withHomed ? !stdenv.hostPlatform.isMusl
 , withHostnamed ? true
 , withHwdb ? true
 , withImportd ? !stdenv.hostPlatform.isMusl
@@ -177,20 +176,10 @@ stdenv.mkDerivation {
   ] ++ lib.optional stdenv.hostPlatform.isMusl (
     let
       oe-core = fetchzip {
-        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-d43ec090ceb2bf0016a065103a4c34d0c43cb906.tar.gz";
-        sha256 = "sha256-e5rHmz0uyNgJwrAj96VGWWu9YHhZtJXoDpCtj17eC5w=";
+        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-cccd4bcaf381c2729adc000381bd89906003e72a.tar.gz";
+        sha256 = "2CFZEzWqUy6OOF3c+LN4Zmy3RqMzfdRHp+B5zlWJsoE=";
       };
-      oe-core-patched = applyPatches {
-        src = oe-core;
-        patches = [
-          (fetchpatch {
-            url = "https://lore.kernel.org/all/20221109002306.853567-1-raj.khem@gmail.com/raw";
-            includes = [ "meta/recipes-core/systemd/systemd/*" ];
-            sha256 = "sha256-aPJjN4vesZwFzgY4Nb6uaIuHz/quH1HccSVEof32IOU=";
-          })
-        ];
-      };
-      musl-patches = oe-core-patched + "/meta/recipes-core/systemd/systemd";
+      musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
     in
     [
       (musl-patches + "/0003-missing_type.h-add-comparison_fn_t.patch")
@@ -212,8 +201,7 @@ stdenv.mkDerivation {
       (musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch")
       (musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch")
       (musl-patches + "/0001-Adjust-for-musl-headers.patch")
-      (musl-patches + "/0001-networkd-ipv4acd.c-Use-net-if.h-for-getting-IFF_LOOP.patch")
-      (musl-patches + "/0001-test-compile-test-utmp.c-only-if-UTMP-is-enabled.patch")
+      (musl-patches + "/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch")
     ]
   );
 

From 77a214e764811aa5f4d3d4385439de4b28921171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 13 Jan 2023 10:03:32 +0100
Subject: [PATCH 942/953] spidermonkey: fixup build on aarch64-linux

All three versions are the same in this respect.
It's the issue with old libgcc_s propagated via our glibc package; e.g.
https://github.com/NixOS/nixpkgs/pull/209113
---
 pkgs/development/interpreters/spidermonkey/common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index d12396396da4..a6695082684d 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -149,6 +149,8 @@ stdenv.mkDerivation (finalAttrs: rec {
   # while we have a double-float toolchain
   NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d";
 
+  NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
+
   postPatch = lib.optionalString (lib.versionOlder version "102") ''
     # This patch is a manually applied fix of
     #   https://bugzilla.mozilla.org/show_bug.cgi?id=1644600

From b6427439deead716ba4d178432b2a2e15304e40f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 13 Jan 2023 13:20:53 +0100
Subject: [PATCH 943/953] python3Packages.matplotlib: Disable strictoverflow
 hardening on darwin

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

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 79c842f6d3e8..a033e8a11bab 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -45,6 +45,11 @@ buildPythonPackage rec {
     Cocoa
   ];
 
+  # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument]
+  hardeningDisable = lib.optionals stdenv.isDarwin [
+    "strictoverflow"
+  ];
+
   propagatedBuildInputs = [
     certifi
     contourpy

From be0d0f2905686ba3d753b0c566782c1548e0af54 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 13 Jan 2023 04:02:35 +0000
Subject: [PATCH 944/953] pkgsStatic.bash: fix build

Link: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00000.html
---
 pkgs/shells/bash/5.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 6e16c083bc7c..40db2abe03ab 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -51,7 +51,12 @@ stdenv.mkDerivation rec {
   patchFlags = [ "-p0" ];
 
   patches = upstreamPatches
-    ++ [ ./pgrp-pipe-5.patch ];
+    ++ [ ./pgrp-pipe-5.patch ]
+    ++ lib.optional stdenv.hostPlatform.isStatic (fetchurl {
+      name = "fix-static.patch";
+      url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51";
+      sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk=";
+    });
 
   configureFlags = [
     (if interactive then "--with-installed-readline" else "--disable-readline")

From e173a0544e14c38df6875267531ddaabd9bf702e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 13 Jan 2023 14:19:45 +0100
Subject: [PATCH 945/953] python3Packages.django-vite: fix src.rev

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

diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix
index 9a8a7c5e4617..34bb765cff5c 100644
--- a/pkgs/development/python-modules/django-vite/default.nix
+++ b/pkgs/development/python-modules/django-vite/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MrBin99";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/${version}";
     hash = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE=";
   };
 

From 82779d710896f9ad0d68ad654a61a9e1eeadcd1f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 13 Jan 2023 14:20:37 +0100
Subject: [PATCH 946/953] python3Packages.django-phonenumber-field: fix src.rev

---
 .../python-modules/django-phonenumber-field/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix
index 8af5e8fee892..a185a94aff94 100644
--- a/pkgs/development/python-modules/django-phonenumber-field/default.nix
+++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stefanfoulis";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/${version}";
     hash = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM=";
   };
 

From 697b730fc56ea48bb1275890486a6257891660ee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 13 Jan 2023 14:22:12 +0100
Subject: [PATCH 947/953] python3Packages.django-rest-registration: fix src.rev

---
 .../python-modules/django-rest-registration/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix
index c1605a93d39e..bfce8141f473 100644
--- a/pkgs/development/python-modules/django-rest-registration/default.nix
+++ b/pkgs/development/python-modules/django-rest-registration/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "apragacz";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/${version}";
     hash = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ=";
   };
 

From 54cb39a3f5cd6a1b1138ec8dcc90ffaf7e8f0927 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 13 Jan 2023 14:24:57 +0100
Subject: [PATCH 948/953] apache-airflow: fix src.hash

Got broken due to limitations of the python bulk updater
---
 pkgs/development/python-modules/apache-airflow/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index 68b2cf396de8..496e5f9f7107 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -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-gE/kPFb5PyPOi6sqtA9YqMokbjVSKgclGNQ6fbiCdgQ=";
+    hash = "sha256-QWUXSG+RSHkF5kP1ZYtx+tHjO0n7hfya9CFA3lBhJHk=";
   };
 
   # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.

From 275ddaec5318819e9b911855d1f6b818e8ead43d Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 8 Jan 2023 23:02:24 +0100
Subject: [PATCH 949/953] nodejs-14_x: 14.21.1 -> 14.21.2

---
 pkgs/development/web/nodejs/v14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index 86358be5bcf0..4563dd7a045a 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -8,7 +8,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "14.21.1";
-    sha256 = "sha256-PbldbKcolXvwkLYwGnqdLYBxSyoG2Jih22XG5Csdp6w=";
+    version = "14.21.2";
+    sha256 = "00zzl43iis8mr8x48hww5ncj8mj5dmpn05rq7ihpffkp2q7rmw6q";
     patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }

From 920bb038e9f0ef9fa5b44814340437a156ba9587 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 8 Jan 2023 23:02:43 +0100
Subject: [PATCH 950/953] nodejs-16_x: 16.18.1 -> 16.19.0

---
 pkgs/development/web/nodejs/v16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index 8483e7251b4e..c8241ababc0d 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -10,8 +10,8 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "16.18.1";
-    sha256 = "sha256-H4BRqI+G9CBk9EFf56mA5ZsKUC7Mje9YP2MDvE1EUjg=";
+    version = "16.19.0";
+    sha256 = "01k72p0hp4lhlpz1syd9cbkm2gpfww0hn10xdpmzd4i3x8dfq7sg";
     patches = [
       ./disable-darwin-v8-system-instrumentation.patch
       ./bypass-darwin-xcrun-node16.patch

From 7146e2a152c78854bd05793c76e7da8eb0002048 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 8 Jan 2023 23:02:56 +0100
Subject: [PATCH 951/953] nodejs-18_x: 18.12.1 -> 18.13.0

---
 pkgs/development/web/nodejs/v18.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index b91f2c9f2c2b..5d1dfa555431 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, fetchpatch, python3, enableNpm ? true }:
+{ callPackage, openssl, python3, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -10,17 +10,9 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "18.12.1";
-  sha256 = "sha256-T6QGRRvFJlmikOUs/bIWKnYL1UnaS4u+vmop8pbZON8=";
+  version = "18.13.0";
+  sha256 = "0s6sscynhw9limpp43f965rn9grdamcvsnd9wfb2h5qxw1icajpx";
   patches = [
-    (fetchpatch {
-      # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200
-      name = "revert-arm64-pointer-auth.patch";
-      url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch";
-      sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY=";
-      revert = true;
-    })
-
     ./disable-darwin-v8-system-instrumentation.patch
     ./bypass-darwin-xcrun-node16.patch
   ] ++ npmPatches;

From ba5367b708fad8a910f1a99b7afa87d506df9f9a Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 8 Jan 2023 23:03:08 +0100
Subject: [PATCH 952/953] nodejs-19_x: 19.2.0 -> 19.4.0

---
 pkgs/development/web/nodejs/v19.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix
index 335477aa7ddc..454d647dad2c 100644
--- a/pkgs/development/web/nodejs/v19.nix
+++ b/pkgs/development/web/nodejs/v19.nix
@@ -6,15 +6,14 @@ let
     python = python3;
   };
 
-  npmPatches = callPackage ./npm-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
-  version = "19.2.0";
-  sha256 = "sha256-CVaw/wHy9jg4J+kWpgSBWc4r2wUhf2VKj/9U6BFtwX4=";
+  version = "19.4.0";
+  sha256 = "0qdj67dgxbjpllm2z9vm46c50s3dqk8a34hbp81vsa7mf3b42182";
   patches = [
     ./revert-arm64-pointer-auth.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
-  ] ++ npmPatches;
+  ];
 }

From 2b78639484d824eb61aaaeb9999f250e75247921 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 14 Jan 2023 04:55:09 +0100
Subject: [PATCH 953/953] python3Packages.clevercsv: 0.7.4 -> 0.7.5

https://github.com/alan-turing-institute/CleverCSV/blob/v0.7.5/CHANGELOG.md
---
 .../python-modules/clevercsv/default.nix        | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index 0760fb36c6fb..823ecb87c305 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , cchardet
 , chardet
 , pandas
@@ -13,24 +12,20 @@
 
 buildPythonPackage rec {
   pname = "clevercsv";
-  version = "0.7.4";
+  version = "0.7.5";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "CleverCSV";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U=";
+    hash = "sha256-zpnUw0ThYbbYS7CYgsi0ZL1qxbY4B1cy2NhrUU9uzig=";
   };
 
-  patches = [
-    (fetchpatch {
-      # Fixes compat with setuptools>=65.6.0
-      # https://github.com/alan-turing-institute/CleverCSV/issues/77
-      url = "https://github.com/alan-turing-institute/CleverCSV/commit/0614fe16fa0e8e08c4c916efc956209fe2aa8ce6.patch";
-      hash = "sha256-ZL0cc5Si8ga6kd3JhfaIUOWXdnEgep9tvHBVpXjsI+w=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "packaging>=23.0" "packaging"
+  '';
 
   propagatedBuildInputs = [
     cchardet