Merge master into staging-next

49 files changed, 1263 insertions, 1763 deletions

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index de84fcdce8da..0d7964e2e655 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -4247,6 +4247,18 @@ final: prev:
     meta.homepage = "https://github.com/liuchengxu/graphviz.vim/";
   };
 
+  grapple-nvim = buildVimPlugin {
+    pname = "grapple.nvim";
+    version = "2024-04-11";
+    src = fetchFromGitHub {
+      owner = "cbochs";
+      repo = "grapple.nvim";
+      rev = "12172536620464f8cc124e07c6e3ccd306ea3c5c";
+      sha256 = "0rpiq47zb0ms6bbbd3c1ywmq5vc88132xcqwfnbfn3d2hrvbz8d1";
+    };
+    meta.homepage = "https://github.com/cbochs/grapple.nvim/";
+  };
+
   gruber-darker-nvim = buildVimPlugin {
     pname = "gruber-darker.nvim";
     version = "2024-01-08";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index ca18c766c3df..ace647e29b52 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -353,6 +353,7 @@ https://github.com/rmagatti/goto-preview/,,
 https://github.com/junegunn/goyo.vim/,,
 https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
 https://github.com/liuchengxu/graphviz.vim/,,
+https://github.com/cbochs/grapple.nvim/,HEAD,
 https://github.com/blazkowolf/gruber-darker.nvim/,,
 https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
 https://github.com/morhetz/gruvbox/,,
diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
index bd640845331f..d510549f767b 100644
--- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
+++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "cloudfoundry-cli";
-  version = "8.7.9";
+  version = "8.7.10";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-uFYeiw2hdX25mUBdudNCC4ZuFEoWyfghWmQR8IsQy+w=";
+    sha256 = "sha256-hzXNaaL6CLVRIy88lCJ87q0V6A+ld1GPDcUagsvMXY0=";
   };
-  vendorHash = "sha256-lvSo8kl2du6Sv7zY3uheXaO6Qg+nblW0jpp2q8+1vyk=";
+  vendorHash = "sha256-zDE+9OsnX3S7SPTVW3hR1rO++6Wdk00zy2msu+jUNlw=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
index e35b4cd07f38..f3f62e940729 100644
--- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
+++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
@@ -4,7 +4,8 @@
 , unstableGitUpdater
 , poetry-core
 , nixops
-, digital-ocean
+, python-digitalocean
+, pythonOlder
 }:
 
 buildPythonPackage {
@@ -12,6 +13,8 @@ buildPythonPackage {
   version = "unstable-2022-08-14";
   pyproject = true;
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixops-digitalocean";
@@ -34,7 +37,7 @@ buildPythonPackage {
   ];
 
   propagatedBuildInputs = [
-    digital-ocean
+    python-digitalocean
   ];
 
   pythonImportsCheck = [ "nixops_digitalocean" ];
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index 19c91baf9a43..5e61fc78091e 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }:
+{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qt6, boost, openssl, libsecret }:
 
 stdenv.mkDerivation rec {
   pname = "chatterino2";
@@ -10,8 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0=";
     fetchSubmodules = true;
   };
-  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
-  buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ];
+  nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ];
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtimageformats
+    qt6.qttools
+    qt6.qt5compat
+    boost
+    openssl
+    libsecret
+  ] ++ lib.optionals stdenv.isLinux [
+    qt6.qtwayland
+  ];
+  cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ];
   postInstall = lib.optionalString stdenv.isDarwin ''
     mkdir -p "$out/Applications"
     mv bin/chatterino.app "$out/Applications/"
@@ -32,6 +44,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ rexim ];
+    maintainers = with maintainers; [ rexim supa ];
   };
 }
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index d002cf5dffbc..2009c6f9a0bc 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -21,14 +21,14 @@
 let
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "24.4.1";
+  version = "24.4.2";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
-    hash = "sha256-E4tLlzjIOElsZr2jcbsnge5jJqKQ0kWf86tFonZ1+Zs=";
+    hash = "sha256-HnWxIcOy7Te6Q5YfZYhvITpfsgeQw8Tt/Nr++wcpxEU=";
   };
 
   nativeBuildInputs = [
@@ -55,11 +55,11 @@ stdenv.mkDerivation {
 
   postInstall = ''
     installShellCompletion --cmd ${appname} \
-      --bash <(xvfb-run $out/bin/${appname} --completion bash --allow-multiple-instances) \
-      --fish <(xvfb-run $out/bin/${appname} --completion fish --allow-multiple-instances)
+      --bash <(xvfb-run $out/bin/${appname} --completion bash) \
+      --fish <(xvfb-run $out/bin/${appname} --completion fish)
     installShellCompletion --cmd ${pname} \
-      --bash <(xvfb-run $out/bin/${appname} --completion bash --allow-multiple-instances) \
-      --fish <(xvfb-run $out/bin/${appname} --completion fish --allow-multiple-instances)
+      --bash <(xvfb-run $out/bin/${appname} --completion bash) \
+      --fish <(xvfb-run $out/bin/${appname} --completion fish)
   ''
   # Create a lowercase symlink for Linux
   + lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index f92b63a9ba98..d8d7bcd22d0a 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -2,7 +2,7 @@
 , sqlite, wxGTK32, libusb1, soapysdr
 , mesa_glu, libX11, gnuplot, fltk
 , GLUT
-, withGui ? !stdenv.isDarwin # withGui transitively depends on mesa, which is broken on darwin
+, withGui ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     maintainers = with maintainers; [ markuskowa ];
     platforms = platforms.unix;
+    badPlatforms = lib.optionals withGui platforms.darwin; # withGui transitively depends on mesa, which is broken on darwin
   };
 }
 
diff --git a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch
deleted file mode 100644
index 6bdfcf2c2d2a..000000000000
--- a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/AniLibria.pro b/AniLibria.pro
-index 407dbde..ae69502 100644
---- a/AniLibria.pro
-+++ b/AniLibria.pro
-@@ -21,17 +21,17 @@ windows {
-     DEFINES += NO_NEED_STANDART_PLAYER
- }
- 
--#unix {
--#    LIBS += -lvlc
-+unix {
-+    LIBS += -lvlc
- 
- #    INCLUDEPATH += /usr/include/
- #    DEPENDPATH += /usr/include/
- 
--#    INCLUDEPATH += /usr/include/vlc/plugins
--#    DEPENDPATH += /usr/include/vlc/plugins
-+    INCLUDEPATH += @VLC_PATH@/vlc/plugins
-+    DEPENDPATH += @VLC_PATH@/vlc/plugins
- 
--#    CONFIG += buildwithvlc
--#}
-+    CONFIG += buildwithvlc
-+}
- 
- buildwithvlc {
-     DEFINES += USE_VLC_PLAYER
diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix
index d35947be850b..522c37f3a625 100644
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@@ -11,23 +11,27 @@
 , wrapQtAppsHook
 , makeDesktopItem
 , copyDesktopItems
-, libvlc
+
+, withVLC ? true , libvlc
+, withMPV ? true , mpv-unwrapped
 }:
 
 mkDerivation rec {
   pname = "anilibria-winmaclinux";
-  version = "1.2.15";
+  version = "1.2.16.1";
 
   src = fetchFromGitHub {
     owner = "anilibria";
     repo = "anilibria-winmaclinux";
     rev = version;
-    sha256 = "sha256-pfM3o4H3XJ4ZE0FXVR1k8pc7lr7SOQjKEMWuG9YkvvI=";
+    hash = "sha256-QQliz/tLeYsWgh/ZAO7FfbApAEqWhWoaQe9030QZxA8=";
   };
 
   sourceRoot = "${src.name}/src";
 
-  qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ];
+  qmakeFlags = [ "PREFIX=${placeholder "out"}" ]
+    ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ]
+    ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ];
 
   patches = [
     ./0001-fix-installation-paths.patch
@@ -61,14 +65,15 @@ mkDerivation rec {
     qtquickcontrols2
     qtwebsockets
     qtmultimedia
-    libvlc
   ] ++ (with gst_all_1; [
     gst-plugins-bad
     gst-plugins-good
     gst-plugins-base
     gst-libav
     gstreamer
-  ]);
+  ])
+  ++ lib.optionals withVLC [ libvlc ]
+  ++ lib.optionals withMPV [ mpv-unwrapped.dev ];
 
   desktopItems = [
     (makeDesktopItem (rec {
diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index ac74ed748f41..543b2b524708 100644
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -1,6 +1,7 @@
 { autoPatchelfHook
 , fetchurl
 , lib
+, copyDesktopItems
 , makeDesktopItem
 , makeWrapper
 , stdenv
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     autoPatchelfHook
     cairo
+    copyDesktopItems
     cups.lib
     dbus.lib
     expat
@@ -92,8 +94,12 @@ stdenv.mkDerivation rec {
     # Install all files, remove unnecessary ones
     cp -a . $out/opt/${basename}/
     rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/}
-    ln -s "$out/opt/${basename}/${basename}" $out/bin/
-    cp -r "${desktopItem}/share/applications" $out/share/
+    ln -s $out/opt/${basename}/${basename} $out/bin/
+    for res in 16 32 48 64 128 256; do
+      install -Dm644 \
+        icons/icon-"$res".png \
+        $out/share/icons/hicolor/"$res"x"$res"/apps/${basename}.png
+    done
     runHook postInstall
   '';
 
@@ -105,14 +111,14 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  desktopItem = makeDesktopItem {
+  desktopItems = [(makeDesktopItem {
     name = basename;
     exec = basename;
     icon = basename;
     desktopName = "Streamlink Twitch GUI";
     genericName = meta.description;
     categories = [ "AudioVideo" "Network" ];
-  };
+  })];
 
   meta = with lib; {
     description = "Twitch.tv browser for Streamlink";
diff --git a/pkgs/by-name/cc/cc1541/package.nix b/pkgs/by-name/cc/cc1541/package.nix
new file mode 100644
index 000000000000..f0f5fd7a02ca
--- /dev/null
+++ b/pkgs/by-name/cc/cc1541/package.nix
@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchFromBitbucket
+, asciidoc
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cc1541";
+  version = "4.1";
+
+  src = fetchFromBitbucket {
+    owner = "ptv_claus";
+    repo = "cc1541";
+    rev = finalAttrs.version;
+    hash = "sha256-b8cEGC3WxrjebQjed/VD9SIWkiQpNaE2yW+bQRCtmSs=";
+  };
+
+  env.ENABLE_MAN = 1;
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  nativeBuildInputs = [ asciidoc ];
+
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    runHook preCheck
+    make test
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "Tool for creating Commodore 1541 Floppy disk images in D64, D71 or D81 format";
+    homepage = "https://bitbucket.org/ptv_claus/cc1541/src/master/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthewcroughan ];
+    mainProgram = "cc1541";
+    platforms = platforms.all;
+  };
+})
diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index ea3560af7039..ee864183f55b 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -21,15 +21,15 @@ let
     src = fetchFromGitHub {
       owner = "domenkozar";
       repo = "nix";
-      rev = "c5bbf14ecbd692eeabf4184cc8d50f79c2446549";
-      hash = "sha256-zvCqeUO2GLOm7jnU23G4EzTZR7eylcJN+HJ5svjmubI=";
+      rev = "ecd0af0c1f56de32cbad14daa1d82a132bf298f8";
+      hash = "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=";
     };
     buildInputs = old.buildInputs ++ [ libgit2 ];
     doCheck = false;
     doInstallCheck = false;
   });
 
-  version = "1.0.3";
+  version = "1.0.4";
 in rustPlatform.buildRustPackage {
   pname = "devenv";
   inherit version;
@@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     rev = "v${version}";
-    hash = "sha256-fnJPqMFoWTYsPNEwbxTxO0h771vZKu+b5Ig4LJQcoRg=";
+    hash = "sha256-JODoFPcYKOr39dErx8JFSjeWKmO5PUsHJrF2VU6MFEg=";
   };
 
-  cargoHash = "sha256-Qckh7knX3sARMHgn+39ozQj8CnfyEQV4yjJPP2+v2SM=";
+  cargoHash = "sha256-//THEzW0OYEDSLrOELBaWnwjDbUc4jpwRDQfWJO/saA=";
 
   nativeBuildInputs = [ makeWrapper pkg-config ];
 
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 9c96b86f64c9..844f97700c22 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   rustPlatform,
+  fetchpatch,
   fetchFromGitHub,
   pkg-config,
   stdenv,
@@ -32,6 +33,14 @@ rustPlatform.buildRustPackage rec {
   patches = [
     # Disables a doctest that depends on a nightly feature
     ./0001-re_space_view_time_series-utils-patch-out-doctests-w.patch
+
+
+    # "Fix cell size test now that the overhead has shrunk"
+    # https://github.com/rerun-io/rerun/pull/5917
+    (fetchpatch {
+      url = "https://github.com/rerun-io/rerun/commit/933fc5cc1f3ee262a78bd4647257295747671152.patch";
+      hash = "sha256-jCeGfzKt0oYqIea+7bA2V/U9VIjhVvfQzLRrYG4jaHY=";
+    })
   ];
 
   cargoHash = "sha256-qvnkOlcjADV4b+JfFAy9yNaZGaf0ZO7hh9HBg5XmPi0=";
@@ -96,7 +105,7 @@ rustPlatform.buildRustPackage rec {
     )
   '';
 
-  postPhases = lib.optionals stdenv.hostPlatform.isLinux  [ "addDlopenRunpathsPhase" ];
+  postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
 
   cargoTestFlags = [
     "-p"
diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 90513eea9c9b..2656688392df 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "5.2.3";
+  version = "5.2.4";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-aGuztJLHfC/GZuvZSieWOOYN5VyvxYCZKGX1nQQDvxo=";
+    hash = "sha256-ty4LqRJzwDRMCqPUcvgCAuvNExb0iRIzCOSMCfDzGEU=";
   };
 
   # Fix build on darwin
diff --git a/pkgs/by-name/wa/wayfarer/package.nix b/pkgs/by-name/wa/wayfarer/package.nix
new file mode 100644
index 000000000000..cbfb7c149744
--- /dev/null
+++ b/pkgs/by-name/wa/wayfarer/package.nix
@@ -0,0 +1,64 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, blueprint-compiler
+, desktop-file-utils
+, gst_all_1
+, gtk4
+, libpulseaudio
+, meson
+, ninja
+, pipewire
+, pkg-config
+, vala
+, wrapGAppsHook4
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wayfarer";
+  version = "1.2.4";
+
+  src = fetchFromGitHub {
+    owner = "stronnag";
+    repo = "wayfarer";
+    rev = finalAttrs.version;
+    hash = "sha256-Vuiy2SjpK2T1ekbwa/KyIFa1V4BJsnJRIj4b+Yx0VEw=";
+  };
+
+  postPatch = ''
+    patchShebangs src/getinfo.sh
+
+    # OS release information is not available in the sandbox
+    substituteInPlace meson/baseinfo.py \
+      --replace-warn 'platform.freedesktop_os_release()["NAME"]' '"NixOS"'
+  '';
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    vala
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-ugly
+    gtk4
+    libpulseaudio
+    pipewire
+  ];
+
+  meta = with lib; {
+    description = "Screen recorder for GNOME / Wayland / pipewire";
+    homepage = "https://github.com/stronnag/wayfarer";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ fgaz ];
+    mainProgram = "wayfarer";
+    platforms = subtractLists platforms.darwin platforms.unix;
+  };
+})
diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix
index c244fa5477e6..b7ad0b67aa1b 100644
--- a/pkgs/data/fonts/nerdfonts/shas.nix
+++ b/pkgs/data/fonts/nerdfonts/shas.nix
@@ -1,69 +1,69 @@
 {
-  "0xProto" = "0vprpl49708c6hl99bc590gk26clzqvsc512kgg5377hl4jr1nyn";
-  "3270" = "1hy29vmiwg5rcbhxxn6i7wb16rw9601xb92ibvk8768fg22f8wrs";
-  "Agave" = "1kzrzip6sk720ngc35s83jwqcfrblqlkjjlfaa27h06zvy4prr62";
-  "AnonymousPro" = "1jb42zkbyn1b4r3klsnzp9hd9pq5mwa5ckyakfgiy9602x4hawwz";
-  "Arimo" = "0gm96hv11bl334hy6xg5cm59kdkzy3373smqwxf7kyh6b71vqhff";
-  "AurulentSansMono" = "0q27z3dkb7dm55xnnz3qmikp4k73zs9bpwiw48rg03vp9bx3q8dg";
-  "BigBlueTerminal" = "0sbfligc7h6rjq6iyks71k298bnfnl8nl74f08gbd7syylwgsmdn";
-  "BitstreamVeraSansMono" = "09nqng0whncn574nxp722y6mva911gl8dv3gsq3pinxl5108w6iw";
-  "CascadiaCode" = "0nm0alq6i35k8l5dsn0zxcplgyd7snr581r66ghvk2h2g34vhiv6";
-  "CascadiaMono" = "1cypxg38xd9k6r7c75adn5qiyx8jygyxn7xar2hbl9yvmv7zvxdr";
-  "CodeNewRoman" = "0317rr1fwssybwj70f398nrk3s7q6vgckgpn969lz61xw5v8s8lb";
-  "ComicShannsMono" = "0j8wi2nd3jzahhhwafc168zaqpn4qlhn33blh3xlm3s9dzlgf4d5";
-  "CommitMono" = "179vyaam8ndz1zr52ini9pylg8mcv21nixypsxf3iwlb22ik37bc";
-  "Cousine" = "07r9vs4bjgbsgwwx0mciazam6jkiv25b33smg4v45zny1p4i0ibl";
-  "D2Coding" = "0jz5x433w0gyf8bq1dz1abasx4zgmn2569nvpzhliifkvzz7r96c";
-  "DaddyTimeMono" = "11rv3ic4hpkh07fdgz995mvld5xi6qc136289l3jqc6f3g27g4id";
-  "DejaVuSansMono" = "0dry4nfr9zfqfvxcfvagb2dfbph8756kgrnms3izj3xljzih6jky";
-  "DroidSansMono" = "1z3qjbz1v4zv9nywcks7r5n5v5h82qrnl82agsyay6hycgi1c4nv";
-  "EnvyCodeR" = "03d3jwv5mz7gmhg0mpzzh7p642qdqyvlkkwc0wa3qarqilf9d61r";
-  "FantasqueSansMono" = "0jh8bzw13ypsi7vlg6j1v0zqn9iacxpgs77jjxbz0f5cgchdw89p";
-  "FiraCode" = "1g09f6n8mig1y3kyqj2n80x2pxas8n0kvkswznigpz3flpyzgf82";
-  "FiraMono" = "1zckphsr3wlq89r6lv1w0x0mk53w7z81c7lvzlx8vm341s4wqprf";
-  "GeistMono" = "1wylnqnrbwkpvsqgaxkdcp703wngdfhkxqgxyg0qlk1lhxbyismx";
-  "Go-Mono" = "11y7ppdqvgvsv6jp4zhi1wh1jyzzs0sbcfjjs64lcar46bmrklq1";
-  "Gohu" = "1gvjlx5yynrnbsl02q7rws7l93pm7vddbqqrjzan4wipdwwql50d";
-  "Hack" = "02vnlrql5kjh4c2wcpaic6sg2kb6s6lvabc5fvxzgzaf5gy4g717";
-  "Hasklig" = "0ahhfglsm2spa8ak03kkx3ld2q0l1r6s2npxz0kjzajzbj0ji5dq";
-  "HeavyData" = "0fywirlk7x5qwxfvihgrd6abv56cjhy3x1fqmbfkhd30cfwcjgmx";
-  "Hermit" = "0635kkbl62x7pzvl7pl4m3i4l9dx01svkl7y2bh8207xy2l78paf";
-  "iA-Writer" = "12j25849lfrp19cjrb98z21hjsfpjfbv64w0w2si6xdmi64g15pz";
-  "IBMPlexMono" = "1cv2cz4p6jvj26yk7282paqkid107maakdf2443qlmcxadaid1lf";
-  "Inconsolata" = "143r6bskaa9l8l4m905nkfx80cbhvgz1mi2smvkzbfbjdqmy9aqs";
-  "InconsolataGo" = "0x4c3gvm6h0dvai5ndl2f00cdxr4y44rj4fd486bbwvl6rvjpz34";
-  "InconsolataLGC" = "1js78b78cfiv4r1ffhv4aca3n0dbd2k9nh7v7h0jdx74ifss0846";
-  "IntelOneMono" = "0pp4f7ffar0gm0m2fvi3p200m3s6p6j3fpzzqs525g4s27558159";
-  "Iosevka" = "16k1z2gmvz65cpzj0whrrihj3svyghcbcqc78fismr98w1ws93aq";
-  "IosevkaTerm" = "11xdkvn37sm65vhqxxri8m0628ryz84ava92bslf7fxfx7w9zglp";
-  "IosevkaTermSlab" = "1y0w8bpr553c27a2jfiyxslc0igj9mkxy0p7wkhlacybp2i499mc";
-  "JetBrainsMono" = "17d2f7msl9s7n62xz5vp0brl4zixklcb56spp9ss1dyvlm33r9la";
-  "Lekton" = "0i0j4m9bh8r59lc35g4kxsnjfznq3lym5hlhabm8dk62cl848idr";
-  "LiberationMono" = "1s0yn1irw1i5nlk9fzmzp5q9wy5znq6cbv7nkriiypmkhpjlm1fq";
-  "Lilex" = "0yd0z6nrw6jdfhd6lnl1zqx2alg8k8rss48v1bgh2nzq2h281ql6";
-  "MartianMono" = "1jlpvif33q8sal751hwhrg4559bs6np9fl7d4jpkw50m430wvavk";
-  "Meslo" = "0g5r411w4fsn1y56dyyic0vw1zd3v2blf1i3y9j3gamhw9766j8b";
-  "Monaspace" = "1ci3a4jll36knf4ib7l76f6qk17kxxi9clrpy7ivnj3ziv0iab72";
-  "Monofur" = "0mrxm6vbf9v0v72ai0dmpc5hzvzsa2200s1r5lzsf0gi54pf5c1k";
-  "Monoid" = "0gjbskx78rp8kblc3rnmbgl45qnymf6vxi3nk9wpyapahpln0612";
-  "Mononoki" = "08zl9av8acydg0zm1nnkj0z0iicwdjmjw45gnm47zcxygphn2ag0";
-  "MPlus" = "1zi4sfncjn8gfrb8j0fxqfw474n5wibdj4aa3bw2hr2yw10gx7a5";
-  "NerdFontsSymbolsOnly" = "1n15dscygam3b4vhs4r1vxynnqwhk2sv9s5zs7pknwm2mzlbq8w2";
-  "Noto" = "018m49frsmy7z55dvcqrfbyhnzm84vmpi4704jlp731lxgx4bmff";
-  "OpenDyslexic" = "136j5v1v3f86a99wdcf6v13ndnmfgdvbpys59wiipbf5ij13bclj";
-  "Overpass" = "0cr7ylfc3y7adas3j4m4fpaz2sds0wczrr2qi6z1jm4jab409zh5";
-  "ProFont" = "0zbmr118cf5i6ynqk9fhyvn29h8d63m8cdb9fbkhcxy0hnj1n9wf";
-  "ProggyClean" = "1myv0rbc1dj951b524v62ysnm14mh86566cbhp6dj22sn4a9id81";
-  "Recursive" = "02h92s2brv37qvvsjl16vi9sdypb54ylcc6gaf35xf9brkgm5y3d";
-  "RobotoMono" = "0j3gzv9c497nn4warczm8d70kbqwf7sk75i440rn25kknrfv2l8i";
-  "ShareTechMono" = "07wv7i2p30k7bk93iygcs0qglvm83fcy6hliv8f76p51izv870n4";
-  "SourceCodePro" = "1znr1mbd18773d9xygxym67bms9cxvscjj7rjwfy5v43xbrax8bq";
-  "SpaceMono" = "137mpsibr9ywwxcf21y83qavjxjbg9wq4zsxf64zmkadwnd46cvw";
-  "Terminus" = "0fxih5129rham0i7aiyy9r1q61r9pvxa7higl2qqaynnql2xb5ps";
-  "Tinos" = "0b7l0ncx8wsg7bhqzbb72c9zhsrihyhwg3jmb7lr7am7lm49ammh";
-  "Ubuntu" = "1q9p62dskw2xx6s9zdgi3s9hxp1v0l9qbg7zzdxzjwplm4v1zn3s";
-  "UbuntuMono" = "1qzv4b6jiyzafv3zgbfxx4h9r8npy7n9ykj02dh6dbm69r41drrw";
-  "UbuntuSans" = "1anpzvngk06nac93w3g7pnbf9qg7bd9qjssizwpmnfgc48a7h6hj";
-  "VictorMono" = "1nyawwfxnb0cy1wp6lid4lxi0glp8adsvdb26i3mylqacgg5216g";
-  "ZedMono" = "06yn24ypnc2lwayi96f6xhkzlrb6975805mh0pfrn9iyjzv51b5f";
+  "0xProto" = "09q4ipl3vvav3jbs0s14fqmd2wk70mc7i8mmplpj20jwcicm05ng";
+  "3270" = "0zcj5xhylyqxpwn6dzp28kh8xybhh4y9lva3smcqs7iklhbf8s31";
+  "Agave" = "1xxylrjb0zbq3kj14fx5d3lpb7abl0br6mkj961i391qyqlx01y3";
+  "AnonymousPro" = "1lq9wkf8c153jkjmhnddih12y9xd4gabbkgac0vx9j98hmy7yjqy";
+  "Arimo" = "1f7zljmljrp1dxkrhkyz8zh9ddv7l7m9br6gaygzxr26bq0vrwr0";
+  "AurulentSansMono" = "0wlwwgp1w7rqvqx66dkqwhz5flw75620fj9fb795hakpkjiya6yp";
+  "BigBlueTerminal" = "115cxnll1iyj75f5wi7b7pi5hgfa3b5kbx269alm9183h284lb23";
+  "BitstreamVeraSansMono" = "1s6jpg0vrdwgi9qyn0mbcy8r7h1lqw8z6q39wiin61szfn642a2k";
+  "CascadiaCode" = "1sg6czl3km7yi70vdcyb0ff1xkq1p4nalj0yh164gan3psp9mxss";
+  "CascadiaMono" = "0rrknf86kdwyjpnryp5870nmnq2sxjda8pgs93z23lh7hw758wln";
+  "CodeNewRoman" = "0p1wkmpzcrxw8qv5lf9fwsxqpjglhwim83amf7i8mmxdx1drzlj5";
+  "ComicShannsMono" = "1p35nmzl51mn2mk0g9fdcawvssv4v7bklxxmdx99357ihnlka26w";
+  "CommitMono" = "0jjzi98i28s3z2x8v7rakcdhgdf7jxzagj8snrylw2mvwn7mlgqp";
+  "Cousine" = "1ccq3sp8fqbi0njm9w2p6cf5r7avpan5fklwzpx4mknwbdqlrwdq";
+  "D2Coding" = "1c0chgbsmzlgq0vinbcz7ydkdhnram8cif8zx8kkpha31abna5n0";
+  "DaddyTimeMono" = "1nz4g26a4dx7ng5nv6bc4hg474inan1c00c86mdlmvl2vgmx6zbf";
+  "DejaVuSansMono" = "12x18i15723hxc1l6ng92m77wycjk0d6r15j34n1zsww5r6xwjxr";
+  "DroidSansMono" = "1mqd1qqbs9dxwmi98i4xw88c68l1bww1sqlsmxmn86368rjh14fk";
+  "EnvyCodeR" = "197g4jaljcb1yncn9rvh17n077p7bq0v59lvb9vqkq3lms5lzjni";
+  "FantasqueSansMono" = "079mk8xrri4r1d5k1w5fv1hb0hp3w499csirkd6yriss35sbhv9d";
+  "FiraCode" = "1i1vw65f00n6vjinyqr1bq5ni5r6g8cjinrfl5zhlqm0gagv5x6y";
+  "FiraMono" = "1i9bfxblx568wsjq7ks1kyyfn9k36i4r2an4n45mb46swc94n8n0";
+  "GeistMono" = "0wvc9hqkh7ap3ysklcin8k72706l72p2wyqv3bg5brzcmwcpy90g";
+  "Go-Mono" = "0j6rr0r7418f8a5bmxbagpmcf7bas2n53f0hg835zp2ikx9cx924";
+  "Gohu" = "0h8hjiqs3f6xwn7g4wg12xim65ybw2546nlf5p9ip4ymr7x17dks";
+  "Hack" = "1wxmd4jr4p11cfhzs5chyh649vps6sdz4bq28204npkd7wzh5fc9";
+  "Hasklig" = "1nja4r8sn67g3gn85xhb1h7p1pi96wl0hpg5b5gyd1z5llbgzc2g";
+  "HeavyData" = "1a3a1pixv97wlnai24zb8dhkzxb2llcarhjkfrgd4syhn37sdf7n";
+  "Hermit" = "1bh18rzwma7gzrx3ybw8g2s9k5xv7wx8ybnyas3qaxb03fpjqm93";
+  "iA-Writer" = "0vsppg62l35zhzlsa0fwczv09pk1nhrag9xhcaadipd962dv7c45";
+  "IBMPlexMono" = "0hd04z17l2p21hij4a0gmwnlfxs7s8qqh08zf4pzqld10557gqlp";
+  "Inconsolata" = "1xy3h05zy49h91k7fqk8934p1f776w46i0bh510addg12w8mm7rc";
+  "InconsolataGo" = "0hcvh3s2rnnir03pszfmmwhbdsapx1b516phhjhb4wl0dqma9q39";
+  "InconsolataLGC" = "0bfwhzbz422kfdv9ppr83cc2aqqdn7g49f73zipl4yp5636gi5ks";
+  "IntelOneMono" = "0388390dlcprxhxxl57gy8rllwk8wsd92b5xwnqwb5f394gbc5m0";
+  "Iosevka" = "0dzkcn277jxiqrrqkyigw6jgd4lp9411r28rkpkwx6js6px27q8v";
+  "IosevkaTerm" = "1xccqkydkhmhq8akk23kkypqzcc2svyicxv9gblwzwbndjrfgmdm";
+  "IosevkaTermSlab" = "1svig63li8mjj2dkgiawgb82gpk8vkrkhih5cp0a6174bh4gycii";
+  "JetBrainsMono" = "01j0rkgrix7mdp9fx0y8zzk1kh40yfcp932p0r5y666aq4mq5y3c";
+  "Lekton" = "00cm8ni3cnmgzwj1ypvpcy8gvnlz31la51j411dpsdqsclbcp0i2";
+  "LiberationMono" = "1941pgw723a6my44g6idi56a88qvsi8lj3wl7slpr5l3pmfda2lx";
+  "Lilex" = "0qz23h6a77i4n8nmhb7hc56mkiwn3pj1s6dbl2v53fvypwghswm2";
+  "MartianMono" = "0zfcvi150yn274i41n66zr20hqgqb0r5v75q21bbgqvaysl4wj32";
+  "Meslo" = "1sjrsr7i3diz4h7wkrl8va7b40g4m1432dz6bpbm2nmp89aszg8s";
+  "Monaspace" = "0il36cm37pc6ndp96j32j0fqpqvwyv2xm3jr7d3zxwax1lcfilp5";
+  "Monofur" = "10gzx2r5a5f5jl192c6cwsil5k57aslmryfnilkv4g8417xmn0zb";
+  "Monoid" = "1fhsb326lc093ckrq2kz4vhr3ibrgp8y0mwa3qwdbapldxazz9f7";
+  "Mononoki" = "18zp94dnv6kp8l58151dybjf2w1gi99nh1rw098hkrf52gfrfdpb";
+  "MPlus" = "0x7yvpkn32x50y9zpdpjrp1gvwwp4fsmjbqbnfzy14xhi03p0q2w";
+  "NerdFontsSymbolsOnly" = "0y4r1rid5sjd9ihi6nkwy0sja792aghg21bpl3ri029b9pifx8xp";
+  "Noto" = "0vq9lgf4j6pi7pw3bfgfzkcdixnhikf4yys8fr0qql7mkwhj3rjb";
+  "OpenDyslexic" = "1yl1fm4pfjvxq411m6f8nycqjnpnhkllmlx16wjrjfqpaf63mm4n";
+  "Overpass" = "1plcn2qx2b08va65zagn1ybkh850157ii7x20nnrhp0h5f4rddzw";
+  "ProFont" = "11c3shv09dssjbjwa44y64dwq7dxn3gs23bfgvhkv51vshsx0fzy";
+  "ProggyClean" = "1l822wqrz7xmgnw535i9vl9gwjl4h037hi3xl0g4907kcdxwan0s";
+  "Recursive" = "1fngqsl1shbfbb1wcx77di42g65lm9f5fcw93m8dcvdzk5lxpxz5";
+  "RobotoMono" = "0g6yvz4vpfcylnshhyhwy5llz61n8m0a0vp4jgjhiir5svcd9krw";
+  "ShareTechMono" = "0mxsywg4gns31yzh1256y7pkbh0m6n3rf8gbb55mxw219ngskkyv";
+  "SourceCodePro" = "088vi947kavk1pkvbl68kv7nz84yvfkj725n2zn7ypq354kkm92n";
+  "SpaceMono" = "0f4kcm4i3y11mpxb9anmn8759zpv3lvril4shp3d4mfc0k3dgfdn";
+  "Terminus" = "04kzc594sb5vk8fd3ww9ip7jsy4vi6wmxdf6vzsvb2fgd98ck335";
+  "Tinos" = "14c31qv3ik0in44k98zjn398cffwgq8z7d5lx7sk6iv12hikrd11";
+  "Ubuntu" = "1bgk4hx26qn5ylsydsy9655isz05ir7154pv8dy4x5rpr144s9ba";
+  "UbuntuMono" = "15kkgx6i4f7zn6fdaw2dqqw3hcpl3pi4cy4g5jx67af8qlhqarrb";
+  "UbuntuSans" = "0jj4v198zshwhns5swrh02h2np3wgnv8lacn8b7jhmcd575cgy1y";
+  "VictorMono" = "03rh7rc6a934sgd1bs7h7y1swqwbv3g7zi624k6hd8v1m3f0j6xa";
+  "ZedMono" = "0yhb9fp7ahw8niki1njzk8pbl0iy53pgf7gx5yfc2ass9vjwky9d";
 }
diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/data/fonts/nerdfonts/version.nix
index 65640ccbfb07..038707f5b9ec 100644
--- a/pkgs/data/fonts/nerdfonts/version.nix
+++ b/pkgs/data/fonts/nerdfonts/version.nix
@@ -1 +1 @@
-"3.2.0"
+"3.2.1"
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index ff76b64d71cf..a8141d278600 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -1,17 +1,9 @@
-{ callPackage, fetchpatch, ... }@_args:
+{ callPackage, ... }@_args:
 
 let
   base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // {
-    version = "8.1.27";
-    hash = "sha256-oV/XPqRPLfMLB9JHhuB9GUiw6j7tC4uEVzXVANwov/E=";
-    extraPatches = [
-      # Fix build with libxml 2.12+.
-      # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
-      (fetchpatch {
-        url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch";
-        hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0=";
-      })
-    ];
+    version = "8.1.28";
+    hash = "sha256-i+RQCW4BU8R9dThOfdWVzIl/HVPOAGBwjOlYm8wxQe4=";
   });
 in
 base.withExtensions ({ all, ... }: with all; ([
diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index ce3dc313621f..d839e372570a 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.2.17";
-    hash = "sha256-GRMWwgMmfZYWC0fSL5VdTcEXk96KXzJ+DCp2J1polOo=";
+    version = "8.2.18";
+    hash = "sha256-ygsHwlQgAyD1GKxbPfVAqc8U2GbzyT7cMBO1Lgb6x5Y=";
   });
 in
 base.withExtensions ({ all, ... }: with all; ([
diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 4af1662b3694..d7ac07c1fb55 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.3.4";
-    hash = "sha256-PFyvGODAokOq7JE6OeywkgQxla3eTD/ELpRdpbkndpU=";
+    version = "8.3.6";
+    hash = "sha256-YySx3djrMCWwQQNLiNwrwLSBmwAiEp7q66N+R4AxCLw=";
   });
 in
 base.withExtensions ({ all, ... }: with all; ([
diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix
index 76de14079deb..d2bd0900dd3c 100644
--- a/pkgs/development/libraries/nghttp3/default.nix
+++ b/pkgs/development/libraries/nghttp3/default.nix
@@ -1,31 +1,29 @@
 { lib, stdenv, fetchFromGitHub
 , cmake
-, cunit, ncurses
 , curlHTTP3
 }:
 
 stdenv.mkDerivation rec {
   pname = "nghttp3";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-B/5r0mRpOEi5DQ7OUAAcDmAm1nnak6qNz4qjDrzWlDc=";
+    hash = "sha256-kJt4aQGNiJ0XhlEKunR8jYKytv3rh23jRrNelCDe/Kk=";
+    fetchSubmodules = true;
   };
 
   outputs = [ "out" "dev" "doc" ];
 
   nativeBuildInputs = [ cmake ];
-  nativeCheckInputs = [ cunit ncurses ];
 
   cmakeFlags = [
-    "-DENABLE_STATIC_LIB=OFF"
+    (lib.cmakeBool "ENABLE_STATIC_LIB" false)
   ];
 
   doCheck = true;
-  enableParallelBuilding = true;
 
   passthru.tests = {
     inherit curlHTTP3;
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 948fb0c071f4..344d85591eef 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -1,34 +1,32 @@
 { lib, stdenv, fetchFromGitHub
 , cmake
-, cunit, ncurses
-, libev, nghttp3, quictls
+, brotli, libev, nghttp3, quictls
 , withJemalloc ? false, jemalloc
 , curlHTTP3
 }:
 
 stdenv.mkDerivation rec {
   pname = "ngtcp2";
-  version = "1.2.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-/lHsHkSySKyZZdjTTYCo0a6cwcMcbOWNvAEcO36/kEw=";
+    hash = "sha256-te/kFt7/09QpmkHZ7dJxyKvvxP+mHtIQIgESkJATR38=";
+    fetchSubmodules = true;
   };
 
   outputs = [ "out" "dev" "doc" ];
 
   nativeBuildInputs = [ cmake ];
-  nativeCheckInputs = [ cunit ncurses ];
-  buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
+  buildInputs = [ brotli libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
 
   cmakeFlags = [
-    "-DENABLE_STATIC_LIB=OFF"
+    (lib.cmakeBool "ENABLE_STATIC_LIB" false)
   ];
 
   doCheck = true;
-  enableParallelBuilding = true;
 
   passthru.tests = {
     inherit curlHTTP3;
diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix
index 56298852a377..b7860aa5dc30 100644
--- a/pkgs/development/python-modules/arviz/default.nix
+++ b/pkgs/development/python-modules/arviz/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, dm-tree
 , fetchFromGitHub
 , emcee
 , h5netcdf
@@ -14,6 +15,7 @@
 , scipy
 , packaging
 , pythonOlder
+, typing-extensions
 , xarray
 , xarray-einstats
 , zarr
@@ -31,27 +33,32 @@
 
 buildPythonPackage rec {
   pname = "arviz";
-  version = "0.17.1";
+  version = "0.18.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "arviz-devs";
     repo = "arviz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-V0/yboKpK/4QuCOzKDiyFpu/J2JLu0aQxRZ+rpMS9eY=";
+    hash = "sha256-SZRqSqChQBSA9/jBXN2ds9hh6TI3qZksHai1j2oVsq0=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    packaging
+    setuptools
+  ];
+
+  dependencies = [
+    dm-tree
     h5netcdf
     matplotlib
     netcdf4
     numpy
-    packaging
     pandas
     scipy
-    setuptools
+    typing-extensions
     xarray
     xarray-einstats
   ];
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index de2dd1733ac7..80176e169a9c 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -1,406 +1,396 @@
-{ lib
-, boto3
-, botocore
-, botocore-stubs
-, buildPythonPackage
-, fetchPypi
-, mypy-boto3-accessanalyzer
-, mypy-boto3-account
-, mypy-boto3-acm
-, mypy-boto3-acm-pca
-, mypy-boto3-alexaforbusiness
-, mypy-boto3-amp
-, mypy-boto3-amplify
-, mypy-boto3-amplifybackend
-, mypy-boto3-amplifyuibuilder
-, mypy-boto3-apigateway
-, mypy-boto3-apigatewaymanagementapi
-, mypy-boto3-apigatewayv2
-, mypy-boto3-appconfig
-, mypy-boto3-appconfigdata
-, mypy-boto3-appfabric
-, mypy-boto3-appflow
-, mypy-boto3-appintegrations
-, mypy-boto3-application-autoscaling
-, mypy-boto3-application-insights
-, mypy-boto3-applicationcostprofiler
-, mypy-boto3-appmesh
-, mypy-boto3-apprunner
-, mypy-boto3-appstream
-, mypy-boto3-appsync
-, mypy-boto3-arc-zonal-shift
-, mypy-boto3-athena
-, mypy-boto3-auditmanager
-, mypy-boto3-autoscaling
-, mypy-boto3-autoscaling-plans
-, mypy-boto3-backup
-, mypy-boto3-backup-gateway
-, mypy-boto3-backupstorage
-, mypy-boto3-batch
-, mypy-boto3-billingconductor
-, mypy-boto3-braket
-, mypy-boto3-budgets
-, mypy-boto3-ce
-, mypy-boto3-chime
-, mypy-boto3-chime-sdk-identity
-, mypy-boto3-chime-sdk-media-pipelines
-, mypy-boto3-chime-sdk-meetings
-, mypy-boto3-chime-sdk-messaging
-, mypy-boto3-chime-sdk-voice
-, mypy-boto3-cleanrooms
-, mypy-boto3-cloud9
-, mypy-boto3-cloudcontrol
-, mypy-boto3-clouddirectory
-, mypy-boto3-cloudformation
-, mypy-boto3-cloudfront
-, mypy-boto3-cloudhsm
-, mypy-boto3-cloudhsmv2
-, mypy-boto3-cloudsearch
-, mypy-boto3-cloudsearchdomain
-, mypy-boto3-cloudtrail
-, mypy-boto3-cloudtrail-data
-, mypy-boto3-cloudwatch
-, mypy-boto3-codeartifact
-, mypy-boto3-codebuild
-, mypy-boto3-codecatalyst
-, mypy-boto3-codecommit
-, mypy-boto3-codedeploy
-, mypy-boto3-codeguru-reviewer
-, mypy-boto3-codeguru-security
-, mypy-boto3-codeguruprofiler
-, mypy-boto3-codepipeline
-, mypy-boto3-codestar
-, mypy-boto3-codestar-connections
-, mypy-boto3-codestar-notifications
-, mypy-boto3-cognito-identity
-, mypy-boto3-cognito-idp
-, mypy-boto3-cognito-sync
-, mypy-boto3-comprehend
-, mypy-boto3-comprehendmedical
-, mypy-boto3-compute-optimizer
-, mypy-boto3-config
-, mypy-boto3-connect
-, mypy-boto3-connect-contact-lens
-, mypy-boto3-connectcampaigns
-, mypy-boto3-connectcases
-, mypy-boto3-connectparticipant
-, mypy-boto3-controltower
-, mypy-boto3-cur
-, mypy-boto3-customer-profiles
-, mypy-boto3-databrew
-, mypy-boto3-dataexchange
-, mypy-boto3-datapipeline
-, mypy-boto3-datasync
-, mypy-boto3-dax
-, mypy-boto3-detective
-, mypy-boto3-devicefarm
-, mypy-boto3-devops-guru
-, mypy-boto3-directconnect
-, mypy-boto3-discovery
-, mypy-boto3-dlm
-, mypy-boto3-dms
-, mypy-boto3-docdb
-, mypy-boto3-docdb-elastic
-, mypy-boto3-drs
-, mypy-boto3-ds
-, mypy-boto3-dynamodb
-, mypy-boto3-dynamodbstreams
-, mypy-boto3-ebs
-, mypy-boto3-ec2
-, mypy-boto3-ec2-instance-connect
-, mypy-boto3-ecr
-, mypy-boto3-ecr-public
-, mypy-boto3-ecs
-, mypy-boto3-efs
-, mypy-boto3-eks
-, mypy-boto3-elastic-inference
-, mypy-boto3-elasticache
-, mypy-boto3-elasticbeanstalk
-, mypy-boto3-elastictranscoder
-, mypy-boto3-elb
-, mypy-boto3-elbv2
-, mypy-boto3-emr
-, mypy-boto3-emr-containers
-, mypy-boto3-emr-serverless
-, mypy-boto3-entityresolution
-, mypy-boto3-es
-, mypy-boto3-events
-, mypy-boto3-evidently
-, mypy-boto3-finspace
-, mypy-boto3-finspace-data
-, mypy-boto3-firehose
-, mypy-boto3-fis
-, mypy-boto3-fms
-, mypy-boto3-forecast
-, mypy-boto3-forecastquery
-, mypy-boto3-frauddetector
-, mypy-boto3-fsx
-, mypy-boto3-gamelift
-, mypy-boto3-gamesparks
-, mypy-boto3-glacier
-, mypy-boto3-globalaccelerator
-, mypy-boto3-glue
-, mypy-boto3-grafana
-, mypy-boto3-greengrass
-, mypy-boto3-greengrassv2
-, mypy-boto3-groundstation
-, mypy-boto3-guardduty
-, mypy-boto3-health
-, mypy-boto3-healthlake
-, mypy-boto3-honeycode
-, mypy-boto3-iam
-, mypy-boto3-identitystore
-, mypy-boto3-imagebuilder
-, mypy-boto3-importexport
-, mypy-boto3-inspector
-, mypy-boto3-inspector2
-, mypy-boto3-internetmonitor
-, mypy-boto3-iot
-, mypy-boto3-iot-data
-, mypy-boto3-iot-jobs-data
-, mypy-boto3-iot-roborunner
-, mypy-boto3-iot1click-devices
-, mypy-boto3-iot1click-projects
-, mypy-boto3-iotanalytics
-, mypy-boto3-iotdeviceadvisor
-, mypy-boto3-iotevents
-, mypy-boto3-iotevents-data
-, mypy-boto3-iotfleethub
-, mypy-boto3-iotfleetwise
-, mypy-boto3-iotsecuretunneling
-, mypy-boto3-iotsitewise
-, mypy-boto3-iotthingsgraph
-, mypy-boto3-iottwinmaker
-, mypy-boto3-iotwireless
-, mypy-boto3-ivs
-, mypy-boto3-ivs-realtime
-, mypy-boto3-ivschat
-, mypy-boto3-kafka
-, mypy-boto3-kafkaconnect
-, mypy-boto3-kendra
-, mypy-boto3-kendra-ranking
-, mypy-boto3-keyspaces
-, mypy-boto3-kinesis
-, mypy-boto3-kinesis-video-archived-media
-, mypy-boto3-kinesis-video-media
-, mypy-boto3-kinesis-video-signaling
-, mypy-boto3-kinesis-video-webrtc-storage
-, mypy-boto3-kinesisanalytics
-, mypy-boto3-kinesisanalyticsv2
-, mypy-boto3-kinesisvideo
-, mypy-boto3-kms
-, mypy-boto3-lakeformation
-, mypy-boto3-lambda
-, mypy-boto3-lex-models
-, mypy-boto3-lex-runtime
-, mypy-boto3-lexv2-models
-, mypy-boto3-lexv2-runtime
-, mypy-boto3-license-manager
-, mypy-boto3-license-manager-linux-subscriptions
-, mypy-boto3-license-manager-user-subscriptions
-, mypy-boto3-lightsail
-, mypy-boto3-location
-, mypy-boto3-logs
-, mypy-boto3-lookoutequipment
-, mypy-boto3-lookoutmetrics
-, mypy-boto3-lookoutvision
-, mypy-boto3-m2
-, mypy-boto3-machinelearning
-, mypy-boto3-macie
-, mypy-boto3-macie2
-, mypy-boto3-managedblockchain
-, mypy-boto3-managedblockchain-query
-, mypy-boto3-marketplace-catalog
-, mypy-boto3-marketplace-entitlement
-, mypy-boto3-marketplacecommerceanalytics
-, mypy-boto3-mediaconnect
-, mypy-boto3-mediaconvert
-, mypy-boto3-medialive
-, mypy-boto3-mediapackage
-, mypy-boto3-mediapackage-vod
-, mypy-boto3-mediapackagev2
-, mypy-boto3-mediastore
-, mypy-boto3-mediastore-data
-, mypy-boto3-mediatailor
-, mypy-boto3-medical-imaging
-, mypy-boto3-memorydb
-, mypy-boto3-meteringmarketplace
-, mypy-boto3-mgh
-, mypy-boto3-mgn
-, mypy-boto3-migration-hub-refactor-spaces
-, mypy-boto3-migrationhub-config
-, mypy-boto3-migrationhuborchestrator
-, mypy-boto3-migrationhubstrategy
-, mypy-boto3-mobile
-, mypy-boto3-mq
-, mypy-boto3-mturk
-, mypy-boto3-mwaa
-, mypy-boto3-neptune
-, mypy-boto3-network-firewall
-, mypy-boto3-networkmanager
-, mypy-boto3-nimble
-, mypy-boto3-oam
-, mypy-boto3-omics
-, mypy-boto3-opensearch
-, mypy-boto3-opensearchserverless
-, mypy-boto3-opsworks
-, mypy-boto3-opsworkscm
-, mypy-boto3-organizations
-, mypy-boto3-osis
-, mypy-boto3-outposts
-, mypy-boto3-panorama
-, mypy-boto3-payment-cryptography
-, mypy-boto3-payment-cryptography-data
-, mypy-boto3-personalize
-, mypy-boto3-personalize-events
-, mypy-boto3-personalize-runtime
-, mypy-boto3-pi
-, mypy-boto3-pinpoint
-, mypy-boto3-pinpoint-email
-, mypy-boto3-pinpoint-sms-voice
-, mypy-boto3-pinpoint-sms-voice-v2
-, mypy-boto3-pipes
-, mypy-boto3-polly
-, mypy-boto3-pricing
-, mypy-boto3-privatenetworks
-, mypy-boto3-proton
-, mypy-boto3-qldb
-, mypy-boto3-qldb-session
-, mypy-boto3-quicksight
-, mypy-boto3-ram
-, mypy-boto3-rbin
-, mypy-boto3-rds
-, mypy-boto3-rds-data
-, mypy-boto3-redshift
-, mypy-boto3-redshift-data
-, mypy-boto3-redshift-serverless
-, mypy-boto3-rekognition
-, mypy-boto3-resiliencehub
-, mypy-boto3-resource-explorer-2
-, mypy-boto3-resource-groups
-, mypy-boto3-resourcegroupstaggingapi
-, mypy-boto3-robomaker
-, mypy-boto3-rolesanywhere
-, mypy-boto3-route53
-, mypy-boto3-route53-recovery-cluster
-, mypy-boto3-route53-recovery-control-config
-, mypy-boto3-route53-recovery-readiness
-, mypy-boto3-route53domains
-, mypy-boto3-route53resolver
-, mypy-boto3-rum
-, mypy-boto3-s3
-, mypy-boto3-s3control
-, mypy-boto3-s3outposts
-, mypy-boto3-sagemaker
-, mypy-boto3-sagemaker-a2i-runtime
-, mypy-boto3-sagemaker-edge
-, mypy-boto3-sagemaker-featurestore-runtime
-, mypy-boto3-sagemaker-geospatial
-, mypy-boto3-sagemaker-metrics
-, mypy-boto3-sagemaker-runtime
-, mypy-boto3-savingsplans
-, mypy-boto3-scheduler
-, mypy-boto3-schemas
-, mypy-boto3-sdb
-, mypy-boto3-secretsmanager
-, mypy-boto3-securityhub
-, mypy-boto3-securitylake
-, mypy-boto3-serverlessrepo
-, mypy-boto3-service-quotas
-, mypy-boto3-servicecatalog
-, mypy-boto3-servicecatalog-appregistry
-, mypy-boto3-servicediscovery
-, mypy-boto3-ses
-, mypy-boto3-sesv2
-, mypy-boto3-shield
-, mypy-boto3-signer
-, mypy-boto3-simspaceweaver
-, mypy-boto3-sms
-, mypy-boto3-sms-voice
-, mypy-boto3-snow-device-management
-, mypy-boto3-snowball
-, mypy-boto3-sns
-, mypy-boto3-sqs
-, mypy-boto3-ssm
-, mypy-boto3-ssm-contacts
-, mypy-boto3-ssm-incidents
-, mypy-boto3-ssm-sap
-, mypy-boto3-sso
-, mypy-boto3-sso-admin
-, mypy-boto3-sso-oidc
-, mypy-boto3-stepfunctions
-, mypy-boto3-storagegateway
-, mypy-boto3-sts
-, mypy-boto3-support
-, mypy-boto3-support-app
-, mypy-boto3-swf
-, mypy-boto3-synthetics
-, mypy-boto3-textract
-, mypy-boto3-timestream-query
-, mypy-boto3-timestream-write
-, mypy-boto3-tnb
-, mypy-boto3-transcribe
-, mypy-boto3-transfer
-, mypy-boto3-translate
-, mypy-boto3-verifiedpermissions
-, mypy-boto3-voice-id
-, mypy-boto3-vpc-lattice
-, mypy-boto3-waf
-, mypy-boto3-waf-regional
-, mypy-boto3-wafv2
-, mypy-boto3-wellarchitected
-, mypy-boto3-wisdom
-, mypy-boto3-workdocs
-, mypy-boto3-worklink
-, mypy-boto3-workmail
-, mypy-boto3-workmailmessageflow
-, mypy-boto3-workspaces
-, mypy-boto3-workspaces-web
-, mypy-boto3-xray
-, pythonOlder
-, setuptools
-, types-s3transfer
-, typing-extensions
+{
+  lib,
+  boto3,
+  botocore,
+  botocore-stubs,
+  buildPythonPackage,
+  fetchPypi,
+  mypy-boto3-accessanalyzer,
+  mypy-boto3-account,
+  mypy-boto3-acm,
+  mypy-boto3-acm-pca,
+  mypy-boto3-alexaforbusiness,
+  mypy-boto3-amp,
+  mypy-boto3-amplify,
+  mypy-boto3-amplifybackend,
+  mypy-boto3-amplifyuibuilder,
+  mypy-boto3-apigateway,
+  mypy-boto3-apigatewaymanagementapi,
+  mypy-boto3-apigatewayv2,
+  mypy-boto3-appconfig,
+  mypy-boto3-appconfigdata,
+  mypy-boto3-appfabric,
+  mypy-boto3-appflow,
+  mypy-boto3-appintegrations,
+  mypy-boto3-application-autoscaling,
+  mypy-boto3-application-insights,
+  mypy-boto3-applicationcostprofiler,
+  mypy-boto3-appmesh,
+  mypy-boto3-apprunner,
+  mypy-boto3-appstream,
+  mypy-boto3-appsync,
+  mypy-boto3-arc-zonal-shift,
+  mypy-boto3-athena,
+  mypy-boto3-auditmanager,
+  mypy-boto3-autoscaling,
+  mypy-boto3-autoscaling-plans,
+  mypy-boto3-backup,
+  mypy-boto3-backup-gateway,
+  mypy-boto3-backupstorage,
+  mypy-boto3-batch,
+  mypy-boto3-billingconductor,
+  mypy-boto3-braket,
+  mypy-boto3-budgets,
+  mypy-boto3-ce,
+  mypy-boto3-chime,
+  mypy-boto3-chime-sdk-identity,
+  mypy-boto3-chime-sdk-media-pipelines,
+  mypy-boto3-chime-sdk-meetings,
+  mypy-boto3-chime-sdk-messaging,
+  mypy-boto3-chime-sdk-voice,
+  mypy-boto3-cleanrooms,
+  mypy-boto3-cloud9,
+  mypy-boto3-cloudcontrol,
+  mypy-boto3-clouddirectory,
+  mypy-boto3-cloudformation,
+  mypy-boto3-cloudfront,
+  mypy-boto3-cloudhsm,
+  mypy-boto3-cloudhsmv2,
+  mypy-boto3-cloudsearch,
+  mypy-boto3-cloudsearchdomain,
+  mypy-boto3-cloudtrail,
+  mypy-boto3-cloudtrail-data,
+  mypy-boto3-cloudwatch,
+  mypy-boto3-codeartifact,
+  mypy-boto3-codebuild,
+  mypy-boto3-codecatalyst,
+  mypy-boto3-codecommit,
+  mypy-boto3-codedeploy,
+  mypy-boto3-codeguru-reviewer,
+  mypy-boto3-codeguru-security,
+  mypy-boto3-codeguruprofiler,
+  mypy-boto3-codepipeline,
+  mypy-boto3-codestar,
+  mypy-boto3-codestar-connections,
+  mypy-boto3-codestar-notifications,
+  mypy-boto3-cognito-identity,
+  mypy-boto3-cognito-idp,
+  mypy-boto3-cognito-sync,
+  mypy-boto3-comprehend,
+  mypy-boto3-comprehendmedical,
+  mypy-boto3-compute-optimizer,
+  mypy-boto3-config,
+  mypy-boto3-connect,
+  mypy-boto3-connect-contact-lens,
+  mypy-boto3-connectcampaigns,
+  mypy-boto3-connectcases,
+  mypy-boto3-connectparticipant,
+  mypy-boto3-controltower,
+  mypy-boto3-cur,
+  mypy-boto3-customer-profiles,
+  mypy-boto3-databrew,
+  mypy-boto3-dataexchange,
+  mypy-boto3-datapipeline,
+  mypy-boto3-datasync,
+  mypy-boto3-dax,
+  mypy-boto3-detective,
+  mypy-boto3-devicefarm,
+  mypy-boto3-devops-guru,
+  mypy-boto3-directconnect,
+  mypy-boto3-discovery,
+  mypy-boto3-dlm,
+  mypy-boto3-dms,
+  mypy-boto3-docdb,
+  mypy-boto3-docdb-elastic,
+  mypy-boto3-drs,
+  mypy-boto3-ds,
+  mypy-boto3-dynamodb,
+  mypy-boto3-dynamodbstreams,
+  mypy-boto3-ebs,
+  mypy-boto3-ec2,
+  mypy-boto3-ec2-instance-connect,
+  mypy-boto3-ecr,
+  mypy-boto3-ecr-public,
+  mypy-boto3-ecs,
+  mypy-boto3-efs,
+  mypy-boto3-eks,
+  mypy-boto3-elastic-inference,
+  mypy-boto3-elasticache,
+  mypy-boto3-elasticbeanstalk,
+  mypy-boto3-elastictranscoder,
+  mypy-boto3-elb,
+  mypy-boto3-elbv2,
+  mypy-boto3-emr,
+  mypy-boto3-emr-containers,
+  mypy-boto3-emr-serverless,
+  mypy-boto3-entityresolution,
+  mypy-boto3-es,
+  mypy-boto3-events,
+  mypy-boto3-evidently,
+  mypy-boto3-finspace,
+  mypy-boto3-finspace-data,
+  mypy-boto3-firehose,
+  mypy-boto3-fis,
+  mypy-boto3-fms,
+  mypy-boto3-forecast,
+  mypy-boto3-forecastquery,
+  mypy-boto3-frauddetector,
+  mypy-boto3-fsx,
+  mypy-boto3-gamelift,
+  mypy-boto3-gamesparks,
+  mypy-boto3-glacier,
+  mypy-boto3-globalaccelerator,
+  mypy-boto3-glue,
+  mypy-boto3-grafana,
+  mypy-boto3-greengrass,
+  mypy-boto3-greengrassv2,
+  mypy-boto3-groundstation,
+  mypy-boto3-guardduty,
+  mypy-boto3-health,
+  mypy-boto3-healthlake,
+  mypy-boto3-honeycode,
+  mypy-boto3-iam,
+  mypy-boto3-identitystore,
+  mypy-boto3-imagebuilder,
+  mypy-boto3-importexport,
+  mypy-boto3-inspector,
+  mypy-boto3-inspector2,
+  mypy-boto3-internetmonitor,
+  mypy-boto3-iot,
+  mypy-boto3-iot-data,
+  mypy-boto3-iot-jobs-data,
+  mypy-boto3-iot-roborunner,
+  mypy-boto3-iot1click-devices,
+  mypy-boto3-iot1click-projects,
+  mypy-boto3-iotanalytics,
+  mypy-boto3-iotdeviceadvisor,
+  mypy-boto3-iotevents,
+  mypy-boto3-iotevents-data,
+  mypy-boto3-iotfleethub,
+  mypy-boto3-iotfleetwise,
+  mypy-boto3-iotsecuretunneling,
+  mypy-boto3-iotsitewise,
+  mypy-boto3-iotthingsgraph,
+  mypy-boto3-iottwinmaker,
+  mypy-boto3-iotwireless,
+  mypy-boto3-ivs,
+  mypy-boto3-ivs-realtime,
+  mypy-boto3-ivschat,
+  mypy-boto3-kafka,
+  mypy-boto3-kafkaconnect,
+  mypy-boto3-kendra,
+  mypy-boto3-kendra-ranking,
+  mypy-boto3-keyspaces,
+  mypy-boto3-kinesis,
+  mypy-boto3-kinesis-video-archived-media,
+  mypy-boto3-kinesis-video-media,
+  mypy-boto3-kinesis-video-signaling,
+  mypy-boto3-kinesis-video-webrtc-storage,
+  mypy-boto3-kinesisanalytics,
+  mypy-boto3-kinesisanalyticsv2,
+  mypy-boto3-kinesisvideo,
+  mypy-boto3-kms,
+  mypy-boto3-lakeformation,
+  mypy-boto3-lambda,
+  mypy-boto3-lex-models,
+  mypy-boto3-lex-runtime,
+  mypy-boto3-lexv2-models,
+  mypy-boto3-lexv2-runtime,
+  mypy-boto3-license-manager,
+  mypy-boto3-license-manager-linux-subscriptions,
+  mypy-boto3-license-manager-user-subscriptions,
+  mypy-boto3-lightsail,
+  mypy-boto3-location,
+  mypy-boto3-logs,
+  mypy-boto3-lookoutequipment,
+  mypy-boto3-lookoutmetrics,
+  mypy-boto3-lookoutvision,
+  mypy-boto3-m2,
+  mypy-boto3-machinelearning,
+  mypy-boto3-macie,
+  mypy-boto3-macie2,
+  mypy-boto3-managedblockchain,
+  mypy-boto3-managedblockchain-query,
+  mypy-boto3-marketplace-catalog,
+  mypy-boto3-marketplace-entitlement,
+  mypy-boto3-marketplacecommerceanalytics,
+  mypy-boto3-mediaconnect,
+  mypy-boto3-mediaconvert,
+  mypy-boto3-medialive,
+  mypy-boto3-mediapackage,
+  mypy-boto3-mediapackage-vod,
+  mypy-boto3-mediapackagev2,
+  mypy-boto3-mediastore,
+  mypy-boto3-mediastore-data,
+  mypy-boto3-mediatailor,
+  mypy-boto3-medical-imaging,
+  mypy-boto3-memorydb,
+  mypy-boto3-meteringmarketplace,
+  mypy-boto3-mgh,
+  mypy-boto3-mgn,
+  mypy-boto3-migration-hub-refactor-spaces,
+  mypy-boto3-migrationhub-config,
+  mypy-boto3-migrationhuborchestrator,
+  mypy-boto3-migrationhubstrategy,
+  mypy-boto3-mobile,
+  mypy-boto3-mq,
+  mypy-boto3-mturk,
+  mypy-boto3-mwaa,
+  mypy-boto3-neptune,
+  mypy-boto3-network-firewall,
+  mypy-boto3-networkmanager,
+  mypy-boto3-nimble,
+  mypy-boto3-oam,
+  mypy-boto3-omics,
+  mypy-boto3-opensearch,
+  mypy-boto3-opensearchserverless,
+  mypy-boto3-opsworks,
+  mypy-boto3-opsworkscm,
+  mypy-boto3-organizations,
+  mypy-boto3-osis,
+  mypy-boto3-outposts,
+  mypy-boto3-panorama,
+  mypy-boto3-payment-cryptography,
+  mypy-boto3-payment-cryptography-data,
+  mypy-boto3-personalize,
+  mypy-boto3-personalize-events,
+  mypy-boto3-personalize-runtime,
+  mypy-boto3-pi,
+  mypy-boto3-pinpoint,
+  mypy-boto3-pinpoint-email,
+  mypy-boto3-pinpoint-sms-voice,
+  mypy-boto3-pinpoint-sms-voice-v2,
+  mypy-boto3-pipes,
+  mypy-boto3-polly,
+  mypy-boto3-pricing,
+  mypy-boto3-privatenetworks,
+  mypy-boto3-proton,
+  mypy-boto3-qldb,
+  mypy-boto3-qldb-session,
+  mypy-boto3-quicksight,
+  mypy-boto3-ram,
+  mypy-boto3-rbin,
+  mypy-boto3-rds,
+  mypy-boto3-rds-data,
+  mypy-boto3-redshift,
+  mypy-boto3-redshift-data,
+  mypy-boto3-redshift-serverless,
+  mypy-boto3-rekognition,
+  mypy-boto3-resiliencehub,
+  mypy-boto3-resource-explorer-2,
+  mypy-boto3-resource-groups,
+  mypy-boto3-resourcegroupstaggingapi,
+  mypy-boto3-robomaker,
+  mypy-boto3-rolesanywhere,
+  mypy-boto3-route53,
+  mypy-boto3-route53-recovery-cluster,
+  mypy-boto3-route53-recovery-control-config,
+  mypy-boto3-route53-recovery-readiness,
+  mypy-boto3-route53domains,
+  mypy-boto3-route53resolver,
+  mypy-boto3-rum,
+  mypy-boto3-s3,
+  mypy-boto3-s3control,
+  mypy-boto3-s3outposts,
+  mypy-boto3-sagemaker,
+  mypy-boto3-sagemaker-a2i-runtime,
+  mypy-boto3-sagemaker-edge,
+  mypy-boto3-sagemaker-featurestore-runtime,
+  mypy-boto3-sagemaker-geospatial,
+  mypy-boto3-sagemaker-metrics,
+  mypy-boto3-sagemaker-runtime,
+  mypy-boto3-savingsplans,
+  mypy-boto3-scheduler,
+  mypy-boto3-schemas,
+  mypy-boto3-sdb,
+  mypy-boto3-secretsmanager,
+  mypy-boto3-securityhub,
+  mypy-boto3-securitylake,
+  mypy-boto3-serverlessrepo,
+  mypy-boto3-service-quotas,
+  mypy-boto3-servicecatalog,
+  mypy-boto3-servicecatalog-appregistry,
+  mypy-boto3-servicediscovery,
+  mypy-boto3-ses,
+  mypy-boto3-sesv2,
+  mypy-boto3-shield,
+  mypy-boto3-signer,
+  mypy-boto3-simspaceweaver,
+  mypy-boto3-sms,
+  mypy-boto3-sms-voice,
+  mypy-boto3-snow-device-management,
+  mypy-boto3-snowball,
+  mypy-boto3-sns,
+  mypy-boto3-sqs,
+  mypy-boto3-ssm,
+  mypy-boto3-ssm-contacts,
+  mypy-boto3-ssm-incidents,
+  mypy-boto3-ssm-sap,
+  mypy-boto3-sso,
+  mypy-boto3-sso-admin,
+  mypy-boto3-sso-oidc,
+  mypy-boto3-stepfunctions,
+  mypy-boto3-storagegateway,
+  mypy-boto3-sts,
+  mypy-boto3-support,
+  mypy-boto3-support-app,
+  mypy-boto3-swf,
+  mypy-boto3-synthetics,
+  mypy-boto3-textract,
+  mypy-boto3-timestream-query,
+  mypy-boto3-timestream-write,
+  mypy-boto3-tnb,
+  mypy-boto3-transcribe,
+  mypy-boto3-transfer,
+  mypy-boto3-translate,
+  mypy-boto3-verifiedpermissions,
+  mypy-boto3-voice-id,
+  mypy-boto3-vpc-lattice,
+  mypy-boto3-waf,
+  mypy-boto3-waf-regional,
+  mypy-boto3-wafv2,
+  mypy-boto3-wellarchitected,
+  mypy-boto3-wisdom,
+  mypy-boto3-workdocs,
+  mypy-boto3-worklink,
+  mypy-boto3-workmail,
+  mypy-boto3-workmailmessageflow,
+  mypy-boto3-workspaces,
+  mypy-boto3-workspaces-web,
+  mypy-boto3-xray,
+  pythonOlder,
+  setuptools,
+  types-s3transfer,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.34.83";
+  version = "1.34.84";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ZY+uu/4yLBbK/YSAAyoZ19ZyPRUjR5Z4le1mRoytF4o=";
+    pname = "boto3_stubs";
+    inherit version;
+    hash = "sha256-c7u1CaacSsjM4DivsVEGhriDmMvUbV3x4yOPzmbfmvU=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     botocore-stubs
     types-s3transfer
     typing-extensions
   ];
 
   passthru.optional-dependencies = {
-    accessanalyzer = [
-      mypy-boto3-accessanalyzer
-    ];
-    account = [
-      mypy-boto3-account
-    ];
-    acm = [
-      mypy-boto3-acm
-    ];
-    acm-pca = [
-      mypy-boto3-acm-pca
-    ];
-    alexaforbusiness = [
-      mypy-boto3-alexaforbusiness
-    ];
+    accessanalyzer = [ mypy-boto3-accessanalyzer ];
+    account = [ mypy-boto3-account ];
+    acm = [ mypy-boto3-acm ];
+    acm-pca = [ mypy-boto3-acm-pca ];
+    alexaforbusiness = [ mypy-boto3-alexaforbusiness ];
     all = [
       mypy-boto3-accessanalyzer
       mypy-boto3-account
@@ -756,355 +746,125 @@ buildPythonPackage rec {
       mypy-boto3-workspaces-web
       mypy-boto3-xray
     ];
-    amp = [
-      mypy-boto3-amp
-    ];
-    amplify = [
-      mypy-boto3-amplify
-    ];
-    amplifybackend = [
-      mypy-boto3-amplifybackend
-    ];
-    amplifyuibuilder = [
-      mypy-boto3-amplifyuibuilder
-    ];
-    apigateway = [
-      mypy-boto3-apigateway
-    ];
-    apigatewaymanagementapi = [
-      mypy-boto3-apigatewaymanagementapi
-    ];
-    apigatewayv2 = [
-      mypy-boto3-apigatewayv2
-    ];
-    appconfig = [
-      mypy-boto3-appconfig
-    ];
-    appconfigdata = [
-      mypy-boto3-appconfigdata
-    ];
-    appfabric = [
-      mypy-boto3-appfabric
-    ];
-    appflow = [
-      mypy-boto3-appflow
-    ];
-    appintegrations = [
-      mypy-boto3-appintegrations
-    ];
-    application-autoscaling = [
-      mypy-boto3-application-autoscaling
-    ];
-    application-insights = [
-      mypy-boto3-application-insights
-    ];
-    applicationcostprofiler = [
-      mypy-boto3-applicationcostprofiler
-    ];
-    appmesh = [
-      mypy-boto3-appmesh
-    ];
-    apprunner = [
-      mypy-boto3-apprunner
-    ];
-    appstream = [
-      mypy-boto3-appstream
-    ];
-    appsync = [
-      mypy-boto3-appsync
-    ];
-    arc-zonal-shift = [
-      mypy-boto3-arc-zonal-shift
-    ];
-    athena = [
-      mypy-boto3-athena
-    ];
-    auditmanager = [
-      mypy-boto3-auditmanager
-    ];
-    autoscaling = [
-      mypy-boto3-autoscaling
-    ];
-    autoscaling-plans = [
-      mypy-boto3-autoscaling-plans
-    ];
-    backup = [
-      mypy-boto3-backup
-    ];
-    backup-gateway = [
-      mypy-boto3-backup-gateway
-    ];
-    backupstorage = [
-      mypy-boto3-backupstorage
-    ];
-    batch = [
-      mypy-boto3-batch
-    ];
-    billingconductor = [
-      mypy-boto3-billingconductor
-    ];
+    amp = [ mypy-boto3-amp ];
+    amplify = [ mypy-boto3-amplify ];
+    amplifybackend = [ mypy-boto3-amplifybackend ];
+    amplifyuibuilder = [ mypy-boto3-amplifyuibuilder ];
+    apigateway = [ mypy-boto3-apigateway ];
+    apigatewaymanagementapi = [ mypy-boto3-apigatewaymanagementapi ];
+    apigatewayv2 = [ mypy-boto3-apigatewayv2 ];
+    appconfig = [ mypy-boto3-appconfig ];
+    appconfigdata = [ mypy-boto3-appconfigdata ];
+    appfabric = [ mypy-boto3-appfabric ];
+    appflow = [ mypy-boto3-appflow ];
+    appintegrations = [ mypy-boto3-appintegrations ];
+    application-autoscaling = [ mypy-boto3-application-autoscaling ];
+    application-insights = [ mypy-boto3-application-insights ];
+    applicationcostprofiler = [ mypy-boto3-applicationcostprofiler ];
+    appmesh = [ mypy-boto3-appmesh ];
+    apprunner = [ mypy-boto3-apprunner ];
+    appstream = [ mypy-boto3-appstream ];
+    appsync = [ mypy-boto3-appsync ];
+    arc-zonal-shift = [ mypy-boto3-arc-zonal-shift ];
+    athena = [ mypy-boto3-athena ];
+    auditmanager = [ mypy-boto3-auditmanager ];
+    autoscaling = [ mypy-boto3-autoscaling ];
+    autoscaling-plans = [ mypy-boto3-autoscaling-plans ];
+    backup = [ mypy-boto3-backup ];
+    backup-gateway = [ mypy-boto3-backup-gateway ];
+    backupstorage = [ mypy-boto3-backupstorage ];
+    batch = [ mypy-boto3-batch ];
+    billingconductor = [ mypy-boto3-billingconductor ];
     boto3 = [
       boto3
       botocore
     ];
-    braket = [
-      mypy-boto3-braket
-    ];
-    budgets = [
-      mypy-boto3-budgets
-    ];
-    ce = [
-      mypy-boto3-ce
-    ];
-    chime = [
-      mypy-boto3-chime
-    ];
-    chime-sdk-identity = [
-      mypy-boto3-chime-sdk-identity
-    ];
-    chime-sdk-media-pipelines = [
-      mypy-boto3-chime-sdk-media-pipelines
-    ];
-    chime-sdk-meetings = [
-      mypy-boto3-chime-sdk-meetings
-    ];
-    chime-sdk-messaging = [
-      mypy-boto3-chime-sdk-messaging
-    ];
-    chime-sdk-voice = [
-      mypy-boto3-chime-sdk-voice
-    ];
-    cleanrooms = [
-      mypy-boto3-cleanrooms
-    ];
-    cloud9 = [
-      mypy-boto3-cloud9
-    ];
-    cloudcontrol = [
-      mypy-boto3-cloudcontrol
-    ];
-    clouddirectory = [
-      mypy-boto3-clouddirectory
-    ];
-    cloudformation = [
-      mypy-boto3-cloudformation
-    ];
-    cloudfront = [
-      mypy-boto3-cloudfront
-    ];
-    cloudhsm = [
-      mypy-boto3-cloudhsm
-    ];
-    cloudhsmv2 = [
-      mypy-boto3-cloudhsmv2
-    ];
-    cloudsearch = [
-      mypy-boto3-cloudsearch
-    ];
-    cloudsearchdomain = [
-      mypy-boto3-cloudsearchdomain
-    ];
-    cloudtrail = [
-      mypy-boto3-cloudtrail
-    ];
-    cloudtrail-data = [
-      mypy-boto3-cloudtrail-data
-    ];
-    cloudwatch = [
-      mypy-boto3-cloudwatch
-    ];
-    codeartifact = [
-      mypy-boto3-codeartifact
-    ];
-    codebuild = [
-      mypy-boto3-codebuild
-    ];
-    codecatalyst = [
-      mypy-boto3-codecatalyst
-    ];
-    codecommit = [
-      mypy-boto3-codecommit
-    ];
-    codedeploy = [
-      mypy-boto3-codedeploy
-    ];
-    codeguru-reviewer = [
-      mypy-boto3-codeguru-reviewer
-    ];
-    codeguru-security = [
-      mypy-boto3-codeguru-security
-    ];
-    codeguruprofiler = [
-      mypy-boto3-codeguruprofiler
-    ];
-    codepipeline = [
-      mypy-boto3-codepipeline
-    ];
-    codestar = [
-      mypy-boto3-codestar
-    ];
-    codestar-connections = [
-      mypy-boto3-codestar-connections
-    ];
-    codestar-notifications = [
-      mypy-boto3-codestar-notifications
-    ];
-    cognito-identity = [
-      mypy-boto3-cognito-identity
-    ];
-    cognito-idp = [
-      mypy-boto3-cognito-idp
-    ];
-    cognito-sync = [
-      mypy-boto3-cognito-sync
-    ];
-    comprehend = [
-      mypy-boto3-comprehend
-    ];
-    comprehendmedical = [
-      mypy-boto3-comprehendmedical
-    ];
-    compute-optimizer = [
-      mypy-boto3-compute-optimizer
-    ];
-    config = [
-      mypy-boto3-config
-    ];
-    connect = [
-      mypy-boto3-connect
-    ];
-    connect-contact-lens = [
-      mypy-boto3-connect-contact-lens
-    ];
-    connectcampaigns = [
-      mypy-boto3-connectcampaigns
-    ];
-    connectcases = [
-      mypy-boto3-connectcases
-    ];
-    connectparticipant = [
-      mypy-boto3-connectparticipant
-    ];
-    controltower = [
-      mypy-boto3-controltower
-    ];
-    cur = [
-      mypy-boto3-cur
-    ];
-    customer-profiles = [
-      mypy-boto3-customer-profiles
-    ];
-    databrew = [
-      mypy-boto3-databrew
-    ];
-    dataexchange = [
-      mypy-boto3-dataexchange
-    ];
-    datapipeline = [
-      mypy-boto3-datapipeline
-    ];
-    datasync = [
-      mypy-boto3-datasync
-    ];
-    dax = [
-      mypy-boto3-dax
-    ];
-    detective = [
-      mypy-boto3-detective
-    ];
-    devicefarm = [
-      mypy-boto3-devicefarm
-    ];
-    devops-guru = [
-      mypy-boto3-devops-guru
-    ];
-    directconnect = [
-      mypy-boto3-directconnect
-    ];
-    discovery = [
-      mypy-boto3-discovery
-    ];
-    dlm = [
-      mypy-boto3-dlm
-    ];
-    dms = [
-      mypy-boto3-dms
-    ];
-    docdb = [
-      mypy-boto3-docdb
-    ];
-    docdb-elastic = [
-      mypy-boto3-docdb-elastic
-    ];
-    drs = [
-      mypy-boto3-drs
-    ];
-    ds = [
-      mypy-boto3-ds
-    ];
-    dynamodb = [
-      mypy-boto3-dynamodb
-    ];
-    dynamodbstreams = [
-      mypy-boto3-dynamodbstreams
-    ];
-    ebs = [
-      mypy-boto3-ebs
-    ];
-    ec2 = [
-      mypy-boto3-ec2
-    ];
-    ec2-instance-connect = [
-      mypy-boto3-ec2-instance-connect
-    ];
-    ecr = [
-      mypy-boto3-ecr
-    ];
-    ecr-public = [
-      mypy-boto3-ecr-public
-    ];
-    ecs = [
-      mypy-boto3-ecs
-    ];
-    efs = [
-      mypy-boto3-efs
-    ];
-    eks = [
-      mypy-boto3-eks
-    ];
-    elastic-inference = [
-      mypy-boto3-elastic-inference
-    ];
-    elasticache = [
-      mypy-boto3-elasticache
-    ];
-    elasticbeanstalk = [
-      mypy-boto3-elasticbeanstalk
-    ];
-    elastictranscoder = [
-      mypy-boto3-elastictranscoder
-    ];
-    elb = [
-      mypy-boto3-elb
-    ];
-    elbv2 = [
-      mypy-boto3-elbv2
-    ];
-    emr = [
-      mypy-boto3-emr
-    ];
-    emr-containers = [
-      mypy-boto3-emr-containers
-    ];
-    emr-serverless = [
-      mypy-boto3-emr-serverless
-    ];
-    entityresolution = [
-      mypy-boto3-entityresolution
-    ];
-    es = [
-      mypy-boto3-es
-    ];
+    braket = [ mypy-boto3-braket ];
+    budgets = [ mypy-boto3-budgets ];
+    ce = [ mypy-boto3-ce ];
+    chime = [ mypy-boto3-chime ];
+    chime-sdk-identity = [ mypy-boto3-chime-sdk-identity ];
+    chime-sdk-media-pipelines = [ mypy-boto3-chime-sdk-media-pipelines ];
+    chime-sdk-meetings = [ mypy-boto3-chime-sdk-meetings ];
+    chime-sdk-messaging = [ mypy-boto3-chime-sdk-messaging ];
+    chime-sdk-voice = [ mypy-boto3-chime-sdk-voice ];
+    cleanrooms = [ mypy-boto3-cleanrooms ];
+    cloud9 = [ mypy-boto3-cloud9 ];
+    cloudcontrol = [ mypy-boto3-cloudcontrol ];
+    clouddirectory = [ mypy-boto3-clouddirectory ];
+    cloudformation = [ mypy-boto3-cloudformation ];
+    cloudfront = [ mypy-boto3-cloudfront ];
+    cloudhsm = [ mypy-boto3-cloudhsm ];
+    cloudhsmv2 = [ mypy-boto3-cloudhsmv2 ];
+    cloudsearch = [ mypy-boto3-cloudsearch ];
+    cloudsearchdomain = [ mypy-boto3-cloudsearchdomain ];
+    cloudtrail = [ mypy-boto3-cloudtrail ];
+    cloudtrail-data = [ mypy-boto3-cloudtrail-data ];
+    cloudwatch = [ mypy-boto3-cloudwatch ];
+    codeartifact = [ mypy-boto3-codeartifact ];
+    codebuild = [ mypy-boto3-codebuild ];
+    codecatalyst = [ mypy-boto3-codecatalyst ];
+    codecommit = [ mypy-boto3-codecommit ];
+    codedeploy = [ mypy-boto3-codedeploy ];
+    codeguru-reviewer = [ mypy-boto3-codeguru-reviewer ];
+    codeguru-security = [ mypy-boto3-codeguru-security ];
+    codeguruprofiler = [ mypy-boto3-codeguruprofiler ];
+    codepipeline = [ mypy-boto3-codepipeline ];
+    codestar = [ mypy-boto3-codestar ];
+    codestar-connections = [ mypy-boto3-codestar-connections ];
+    codestar-notifications = [ mypy-boto3-codestar-notifications ];
+    cognito-identity = [ mypy-boto3-cognito-identity ];
+    cognito-idp = [ mypy-boto3-cognito-idp ];
+    cognito-sync = [ mypy-boto3-cognito-sync ];
+    comprehend = [ mypy-boto3-comprehend ];
+    comprehendmedical = [ mypy-boto3-comprehendmedical ];
+    compute-optimizer = [ mypy-boto3-compute-optimizer ];
+    config = [ mypy-boto3-config ];
+    connect = [ mypy-boto3-connect ];
+    connect-contact-lens = [ mypy-boto3-connect-contact-lens ];
+    connectcampaigns = [ mypy-boto3-connectcampaigns ];
+    connectcases = [ mypy-boto3-connectcases ];
+    connectparticipant = [ mypy-boto3-connectparticipant ];
+    controltower = [ mypy-boto3-controltower ];
+    cur = [ mypy-boto3-cur ];
+    customer-profiles = [ mypy-boto3-customer-profiles ];
+    databrew = [ mypy-boto3-databrew ];
+    dataexchange = [ mypy-boto3-dataexchange ];
+    datapipeline = [ mypy-boto3-datapipeline ];
+    datasync = [ mypy-boto3-datasync ];
+    dax = [ mypy-boto3-dax ];
+    detective = [ mypy-boto3-detective ];
+    devicefarm = [ mypy-boto3-devicefarm ];
+    devops-guru = [ mypy-boto3-devops-guru ];
+    directconnect = [ mypy-boto3-directconnect ];
+    discovery = [ mypy-boto3-discovery ];
+    dlm = [ mypy-boto3-dlm ];
+    dms = [ mypy-boto3-dms ];
+    docdb = [ mypy-boto3-docdb ];
+    docdb-elastic = [ mypy-boto3-docdb-elastic ];
+    drs = [ mypy-boto3-drs ];
+    ds = [ mypy-boto3-ds ];
+    dynamodb = [ mypy-boto3-dynamodb ];
+    dynamodbstreams = [ mypy-boto3-dynamodbstreams ];
+    ebs = [ mypy-boto3-ebs ];
+    ec2 = [ mypy-boto3-ec2 ];
+    ec2-instance-connect = [ mypy-boto3-ec2-instance-connect ];
+    ecr = [ mypy-boto3-ecr ];
+    ecr-public = [ mypy-boto3-ecr-public ];
+    ecs = [ mypy-boto3-ecs ];
+    efs = [ mypy-boto3-efs ];
+    eks = [ mypy-boto3-eks ];
+    elastic-inference = [ mypy-boto3-elastic-inference ];
+    elasticache = [ mypy-boto3-elasticache ];
+    elasticbeanstalk = [ mypy-boto3-elasticbeanstalk ];
+    elastictranscoder = [ mypy-boto3-elastictranscoder ];
+    elb = [ mypy-boto3-elb ];
+    elbv2 = [ mypy-boto3-elbv2 ];
+    emr = [ mypy-boto3-emr ];
+    emr-containers = [ mypy-boto3-emr-containers ];
+    emr-serverless = [ mypy-boto3-emr-serverless ];
+    entityresolution = [ mypy-boto3-entityresolution ];
+    es = [ mypy-boto3-es ];
     essential = [
       mypy-boto3-cloudformation
       mypy-boto3-dynamodb
@@ -1114,718 +874,253 @@ buildPythonPackage rec {
       mypy-boto3-s3
       mypy-boto3-sqs
     ];
-    events = [
-      mypy-boto3-events
-    ];
-    evidently = [
-      mypy-boto3-evidently
-    ];
-    finspace = [
-      mypy-boto3-finspace
-    ];
-    finspace-data = [
-      mypy-boto3-finspace-data
-    ];
-    firehose = [
-      mypy-boto3-firehose
-    ];
-    fis = [
-      mypy-boto3-fis
-    ];
-    fms = [
-      mypy-boto3-fms
-    ];
-    forecast = [
-      mypy-boto3-forecast
-    ];
-    forecastquery = [
-      mypy-boto3-forecastquery
-    ];
-    frauddetector = [
-      mypy-boto3-frauddetector
-    ];
-    fsx = [
-      mypy-boto3-fsx
-    ];
-    gamelift = [
-      mypy-boto3-gamelift
-    ];
-    gamesparks = [
-      mypy-boto3-gamesparks
-    ];
-    glacier = [
-      mypy-boto3-glacier
-    ];
-    globalaccelerator = [
-      mypy-boto3-globalaccelerator
-    ];
-    glue = [
-      mypy-boto3-glue
-    ];
-    grafana = [
-      mypy-boto3-grafana
-    ];
-    greengrass = [
-      mypy-boto3-greengrass
-    ];
-    greengrassv2 = [
-      mypy-boto3-greengrassv2
-    ];
-    groundstation = [
-      mypy-boto3-groundstation
-    ];
-    guardduty = [
-      mypy-boto3-guardduty
-    ];
-    health = [
-      mypy-boto3-health
-    ];
-    healthlake = [
-      mypy-boto3-healthlake
-    ];
-    honeycode = [
-      mypy-boto3-honeycode
-    ];
-    iam = [
-      mypy-boto3-iam
-    ];
-    identitystore = [
-      mypy-boto3-identitystore
-    ];
-    imagebuilder = [
-      mypy-boto3-imagebuilder
-    ];
-    importexport = [
-      mypy-boto3-importexport
-    ];
-    inspector = [
-      mypy-boto3-inspector
-    ];
-    inspector2 = [
-      mypy-boto3-inspector2
-    ];
-    internetmonitor = [
-      mypy-boto3-internetmonitor
-    ];
-    iot = [
-      mypy-boto3-iot
-    ];
-    iot-data = [
-      mypy-boto3-iot-data
-    ];
-    iot-jobs-data = [
-      mypy-boto3-iot-jobs-data
-    ];
-    iot-roborunner = [
-      mypy-boto3-iot-roborunner
-    ];
-    iot1click-devices = [
-      mypy-boto3-iot1click-devices
-    ];
-    iot1click-projects = [
-      mypy-boto3-iot1click-projects
-    ];
-    iotanalytics = [
-      mypy-boto3-iotanalytics
-    ];
-    iotdeviceadvisor = [
-      mypy-boto3-iotdeviceadvisor
-    ];
-    iotevents = [
-      mypy-boto3-iotevents
-    ];
-    iotevents-data = [
-      mypy-boto3-iotevents-data
-    ];
-    iotfleethub = [
-      mypy-boto3-iotfleethub
-    ];
-    iotfleetwise = [
-      mypy-boto3-iotfleetwise
-    ];
-    iotsecuretunneling = [
-      mypy-boto3-iotsecuretunneling
-    ];
-    iotsitewise = [
-      mypy-boto3-iotsitewise
-    ];
-    iotthingsgraph = [
-      mypy-boto3-iotthingsgraph
-    ];
-    iottwinmaker = [
-      mypy-boto3-iottwinmaker
-    ];
-    iotwireless = [
-      mypy-boto3-iotwireless
-    ];
-    ivs = [
-      mypy-boto3-ivs
-    ];
-    ivs-realtime = [
-      mypy-boto3-ivs-realtime
-    ];
-    ivschat = [
-      mypy-boto3-ivschat
-    ];
-    kafka = [
-      mypy-boto3-kafka
-    ];
-    kafkaconnect = [
-      mypy-boto3-kafkaconnect
-    ];
-    kendra = [
-      mypy-boto3-kendra
-    ];
-    kendra-ranking = [
-      mypy-boto3-kendra-ranking
-    ];
-    keyspaces = [
-      mypy-boto3-keyspaces
-    ];
-    kinesis = [
-      mypy-boto3-kinesis
-    ];
-    kinesis-video-archived-media = [
-      mypy-boto3-kinesis-video-archived-media
-    ];
-    kinesis-video-media = [
-      mypy-boto3-kinesis-video-media
-    ];
-    kinesis-video-signaling = [
-      mypy-boto3-kinesis-video-signaling
-    ];
-    kinesis-video-webrtc-storage = [
-      mypy-boto3-kinesis-video-webrtc-storage
-    ];
-    kinesisanalytics = [
-      mypy-boto3-kinesisanalytics
-    ];
-    kinesisanalyticsv2 = [
-      mypy-boto3-kinesisanalyticsv2
-    ];
-    kinesisvideo = [
-      mypy-boto3-kinesisvideo
-    ];
-    kms = [
-      mypy-boto3-kms
-    ];
-    lakeformation = [
-      mypy-boto3-lakeformation
-    ];
-    lambda = [
-      mypy-boto3-lambda
-    ];
-    lex-models = [
-      mypy-boto3-lex-models
-    ];
-    lex-runtime = [
-      mypy-boto3-lex-runtime
-    ];
-    lexv2-models = [
-      mypy-boto3-lexv2-models
-    ];
-    lexv2-runtime = [
-      mypy-boto3-lexv2-runtime
-    ];
-    license-manager = [
-      mypy-boto3-license-manager
-    ];
-    license-manager-linux-subscriptions = [
-      mypy-boto3-license-manager-linux-subscriptions
-    ];
-    license-manager-user-subscriptions = [
-      mypy-boto3-license-manager-user-subscriptions
-    ];
-    lightsail = [
-      mypy-boto3-lightsail
-    ];
-    location = [
-      mypy-boto3-location
-    ];
-    logs = [
-      mypy-boto3-logs
-    ];
-    lookoutequipment = [
-      mypy-boto3-lookoutequipment
-    ];
-    lookoutmetrics = [
-      mypy-boto3-lookoutmetrics
-    ];
-    lookoutvision = [
-      mypy-boto3-lookoutvision
-    ];
-    m2 = [
-      mypy-boto3-m2
-    ];
-    machinelearning = [
-      mypy-boto3-machinelearning
-    ];
-    macie = [
-      mypy-boto3-macie
-    ];
-    macie2 = [
-      mypy-boto3-macie2
-    ];
-    managedblockchain = [
-      mypy-boto3-managedblockchain
-    ];
-    managedblockchain-query = [
-      mypy-boto3-managedblockchain-query
-    ];
-    marketplace-catalog = [
-      mypy-boto3-marketplace-catalog
-    ];
-    marketplace-entitlement = [
-      mypy-boto3-marketplace-entitlement
-    ];
-    marketplacecommerceanalytics = [
-      mypy-boto3-marketplacecommerceanalytics
-    ];
-    mediaconnect = [
-      mypy-boto3-mediaconnect
-    ];
-    mediaconvert = [
-      mypy-boto3-mediaconvert
-    ];
-    medialive = [
-      mypy-boto3-medialive
-    ];
-    mediapackage = [
-      mypy-boto3-mediapackage
-    ];
-    mediapackage-vod = [
-      mypy-boto3-mediapackage-vod
-    ];
-    mediapackagev2 = [
-      mypy-boto3-mediapackagev2
-    ];
-    mediastore = [
-      mypy-boto3-mediastore
-    ];
-    mediastore-data = [
-      mypy-boto3-mediastore-data
-    ];
-    mediatailor = [
-      mypy-boto3-mediatailor
-    ];
-    medical-imaging = [
-      mypy-boto3-medical-imaging
-    ];
-    memorydb = [
-      mypy-boto3-memorydb
-    ];
-    meteringmarketplace = [
-      mypy-boto3-meteringmarketplace
-    ];
-    mgh = [
-      mypy-boto3-mgh
-    ];
-    mgn = [
-      mypy-boto3-mgn
-    ];
-    migration-hub-refactor-spaces = [
-      mypy-boto3-migration-hub-refactor-spaces
-    ];
-    migrationhub-config = [
-      mypy-boto3-migrationhub-config
-    ];
-    migrationhuborchestrator = [
-      mypy-boto3-migrationhuborchestrator
-    ];
-    migrationhubstrategy = [
-      mypy-boto3-migrationhubstrategy
-    ];
-    mobile = [
-      mypy-boto3-mobile
-    ];
-    mq = [
-      mypy-boto3-mq
-    ];
-    mturk = [
-      mypy-boto3-mturk
-    ];
-    mwaa = [
-      mypy-boto3-mwaa
-    ];
-    neptune = [
-      mypy-boto3-neptune
-    ];
-    network-firewall = [
-      mypy-boto3-network-firewall
-    ];
-    networkmanager = [
-      mypy-boto3-networkmanager
-    ];
-    nimble = [
-      mypy-boto3-nimble
-    ];
-    oam = [
-      mypy-boto3-oam
-    ];
-    omics = [
-      mypy-boto3-omics
-    ];
-    opensearch = [
-      mypy-boto3-opensearch
-    ];
-    opensearchserverless = [
-      mypy-boto3-opensearchserverless
-    ];
-    opsworks = [
-      mypy-boto3-opsworks
-    ];
-    opsworkscm = [
-      mypy-boto3-opsworkscm
-    ];
-    organizations = [
-      mypy-boto3-organizations
-    ];
-    osis = [
-      mypy-boto3-osis
-    ];
-    outposts = [
-      mypy-boto3-outposts
-    ];
-    panorama = [
-      mypy-boto3-panorama
-    ];
-    payment-cryptography = [
-      mypy-boto3-payment-cryptography
-    ];
-    payment-cryptography-data = [
-      mypy-boto3-payment-cryptography-data
-    ];
-    personalize = [
-      mypy-boto3-personalize
-    ];
-    personalize-events = [
-      mypy-boto3-personalize-events
-    ];
-    personalize-runtime = [
-      mypy-boto3-personalize-runtime
-    ];
-    pi = [
-      mypy-boto3-pi
-    ];
-    pinpoint = [
-      mypy-boto3-pinpoint
-    ];
-    pinpoint-email = [
-      mypy-boto3-pinpoint-email
-    ];
-    pinpoint-sms-voice = [
-      mypy-boto3-pinpoint-sms-voice
-    ];
-    pinpoint-sms-voice-v2 = [
-      mypy-boto3-pinpoint-sms-voice-v2
-    ];
-    pipes = [
-      mypy-boto3-pipes
-    ];
-    polly = [
-      mypy-boto3-polly
-    ];
-    pricing = [
-      mypy-boto3-pricing
-    ];
-    privatenetworks = [
-      mypy-boto3-privatenetworks
-    ];
-    proton = [
-      mypy-boto3-proton
-    ];
-    qldb = [
-      mypy-boto3-qldb
-    ];
-    qldb-session = [
-      mypy-boto3-qldb-session
-    ];
-    quicksight = [
-      mypy-boto3-quicksight
-    ];
-    ram = [
-      mypy-boto3-ram
-    ];
-    rbin = [
-      mypy-boto3-rbin
-    ];
-    rds = [
-      mypy-boto3-rds
-    ];
-    rds-data = [
-      mypy-boto3-rds-data
-    ];
-    redshift = [
-      mypy-boto3-redshift
-    ];
-    redshift-data = [
-      mypy-boto3-redshift-data
-    ];
-    redshift-serverless = [
-      mypy-boto3-redshift-serverless
-    ];
-    rekognition = [
-      mypy-boto3-rekognition
-    ];
-    resiliencehub = [
-      mypy-boto3-resiliencehub
-    ];
-    resource-explorer-2 = [
-      mypy-boto3-resource-explorer-2
-    ];
-    resource-groups = [
-      mypy-boto3-resource-groups
-    ];
-    resourcegroupstaggingapi = [
-      mypy-boto3-resourcegroupstaggingapi
-    ];
-    robomaker = [
-      mypy-boto3-robomaker
-    ];
-    rolesanywhere = [
-      mypy-boto3-rolesanywhere
-    ];
-    route53 = [
-      mypy-boto3-route53
-    ];
-    route53-recovery-cluster = [
-      mypy-boto3-route53-recovery-cluster
-    ];
-    route53-recovery-control-config = [
-      mypy-boto3-route53-recovery-control-config
-    ];
-    route53-recovery-readiness = [
-      mypy-boto3-route53-recovery-readiness
-    ];
-    route53domains = [
-      mypy-boto3-route53domains
-    ];
-    route53resolver = [
-      mypy-boto3-route53resolver
-    ];
-    rum = [
-      mypy-boto3-rum
-    ];
-    s3 = [
-      mypy-boto3-s3
-    ];
-    s3control = [
-      mypy-boto3-s3control
-    ];
-    s3outposts = [
-      mypy-boto3-s3outposts
-    ];
-    sagemaker = [
-      mypy-boto3-sagemaker
-    ];
-    sagemaker-a2i-runtime = [
-      mypy-boto3-sagemaker-a2i-runtime
-    ];
-    sagemaker-edge = [
-      mypy-boto3-sagemaker-edge
-    ];
-    sagemaker-featurestore-runtime = [
-      mypy-boto3-sagemaker-featurestore-runtime
-    ];
-    sagemaker-geospatial = [
-      mypy-boto3-sagemaker-geospatial
-    ];
-    sagemaker-metrics = [
-      mypy-boto3-sagemaker-metrics
-    ];
-    sagemaker-runtime = [
-      mypy-boto3-sagemaker-runtime
-    ];
-    savingsplans = [
-      mypy-boto3-savingsplans
-    ];
-    scheduler = [
-      mypy-boto3-scheduler
-    ];
-    schemas = [
-      mypy-boto3-schemas
-    ];
-    sdb = [
-      mypy-boto3-sdb
-    ];
-    secretsmanager = [
-      mypy-boto3-secretsmanager
-    ];
-    securityhub = [
-      mypy-boto3-securityhub
-    ];
-    securitylake = [
-      mypy-boto3-securitylake
-    ];
-    serverlessrepo = [
-      mypy-boto3-serverlessrepo
-    ];
-    service-quotas = [
-      mypy-boto3-service-quotas
-    ];
-    servicecatalog = [
-      mypy-boto3-servicecatalog
-    ];
-    servicecatalog-appregistry = [
-      mypy-boto3-servicecatalog-appregistry
-    ];
-    servicediscovery = [
-      mypy-boto3-servicediscovery
-    ];
-    ses = [
-      mypy-boto3-ses
-    ];
-    sesv2 = [
-      mypy-boto3-sesv2
-    ];
-    shield = [
-      mypy-boto3-shield
-    ];
-    signer = [
-      mypy-boto3-signer
-    ];
-    simspaceweaver = [
-      mypy-boto3-simspaceweaver
-    ];
-    sms = [
-      mypy-boto3-sms
-    ];
-    sms-voice = [
-      mypy-boto3-sms-voice
-    ];
-    snow-device-management = [
-      mypy-boto3-snow-device-management
-    ];
-    snowball = [
-      mypy-boto3-snowball
-    ];
-    sns = [
-      mypy-boto3-sns
-    ];
-    sqs = [
-      mypy-boto3-sqs
-    ];
-    ssm = [
-      mypy-boto3-ssm
-    ];
-    ssm-contacts = [
-      mypy-boto3-ssm-contacts
-    ];
-    ssm-incidents = [
-      mypy-boto3-ssm-incidents
-    ];
-    ssm-sap = [
-      mypy-boto3-ssm-sap
-    ];
-    sso = [
-      mypy-boto3-sso
-    ];
-    sso-admin = [
-      mypy-boto3-sso-admin
-    ];
-    sso-oidc = [
-      mypy-boto3-sso-oidc
-    ];
-    stepfunctions = [
-      mypy-boto3-stepfunctions
-    ];
-    storagegateway = [
-      mypy-boto3-storagegateway
-    ];
-    sts = [
-      mypy-boto3-sts
-    ];
-    support = [
-      mypy-boto3-support
-    ];
-    support-app = [
-      mypy-boto3-support-app
-    ];
-    swf = [
-      mypy-boto3-swf
-    ];
-    synthetics = [
-      mypy-boto3-synthetics
-    ];
-    textract = [
-      mypy-boto3-textract
-    ];
-    timestream-query = [
-      mypy-boto3-timestream-query
-    ];
-    timestream-write = [
-      mypy-boto3-timestream-write
-    ];
-    tnb = [
-      mypy-boto3-tnb
-    ];
-    transcribe = [
-      mypy-boto3-transcribe
-    ];
-    transfer = [
-      mypy-boto3-transfer
-    ];
-    translate = [
-      mypy-boto3-translate
-    ];
-    verifiedpermissions = [
-      mypy-boto3-verifiedpermissions
-    ];
-    voice-id = [
-      mypy-boto3-voice-id
-    ];
-    vpc-lattice = [
-      mypy-boto3-vpc-lattice
-    ];
-    waf = [
-      mypy-boto3-waf
-    ];
-    waf-regional = [
-      mypy-boto3-waf-regional
-    ];
-    wafv2 = [
-      mypy-boto3-wafv2
-    ];
-    wellarchitected = [
-      mypy-boto3-wellarchitected
-    ];
-    wisdom = [
-      mypy-boto3-wisdom
-    ];
-    workdocs = [
-      mypy-boto3-workdocs
-    ];
-    worklink = [
-      mypy-boto3-worklink
-    ];
-    workmail = [
-      mypy-boto3-workmail
-    ];
-    workmailmessageflow = [
-      mypy-boto3-workmailmessageflow
-    ];
-    workspaces = [
-      mypy-boto3-workspaces
-    ];
-    workspaces-web = [
-      mypy-boto3-workspaces-web
-    ];
-    xray = [
-      mypy-boto3-xray
-    ];
+    events = [ mypy-boto3-events ];
+    evidently = [ mypy-boto3-evidently ];
+    finspace = [ mypy-boto3-finspace ];
+    finspace-data = [ mypy-boto3-finspace-data ];
+    firehose = [ mypy-boto3-firehose ];
+    fis = [ mypy-boto3-fis ];
+    fms = [ mypy-boto3-fms ];
+    forecast = [ mypy-boto3-forecast ];
+    forecastquery = [ mypy-boto3-forecastquery ];
+    frauddetector = [ mypy-boto3-frauddetector ];
+    fsx = [ mypy-boto3-fsx ];
+    gamelift = [ mypy-boto3-gamelift ];
+    gamesparks = [ mypy-boto3-gamesparks ];
+    glacier = [ mypy-boto3-glacier ];
+    globalaccelerator = [ mypy-boto3-globalaccelerator ];
+    glue = [ mypy-boto3-glue ];
+    grafana = [ mypy-boto3-grafana ];
+    greengrass = [ mypy-boto3-greengrass ];
+    greengrassv2 = [ mypy-boto3-greengrassv2 ];
+    groundstation = [ mypy-boto3-groundstation ];
+    guardduty = [ mypy-boto3-guardduty ];
+    health = [ mypy-boto3-health ];
+    healthlake = [ mypy-boto3-healthlake ];
+    honeycode = [ mypy-boto3-honeycode ];
+    iam = [ mypy-boto3-iam ];
+    identitystore = [ mypy-boto3-identitystore ];
+    imagebuilder = [ mypy-boto3-imagebuilder ];
+    importexport = [ mypy-boto3-importexport ];
+    inspector = [ mypy-boto3-inspector ];
+    inspector2 = [ mypy-boto3-inspector2 ];
+    internetmonitor = [ mypy-boto3-internetmonitor ];
+    iot = [ mypy-boto3-iot ];
+    iot-data = [ mypy-boto3-iot-data ];
+    iot-jobs-data = [ mypy-boto3-iot-jobs-data ];
+    iot-roborunner = [ mypy-boto3-iot-roborunner ];
+    iot1click-devices = [ mypy-boto3-iot1click-devices ];
+    iot1click-projects = [ mypy-boto3-iot1click-projects ];
+    iotanalytics = [ mypy-boto3-iotanalytics ];
+    iotdeviceadvisor = [ mypy-boto3-iotdeviceadvisor ];
+    iotevents = [ mypy-boto3-iotevents ];
+    iotevents-data = [ mypy-boto3-iotevents-data ];
+    iotfleethub = [ mypy-boto3-iotfleethub ];
+    iotfleetwise = [ mypy-boto3-iotfleetwise ];
+    iotsecuretunneling = [ mypy-boto3-iotsecuretunneling ];
+    iotsitewise = [ mypy-boto3-iotsitewise ];
+    iotthingsgraph = [ mypy-boto3-iotthingsgraph ];
+    iottwinmaker = [ mypy-boto3-iottwinmaker ];
+    iotwireless = [ mypy-boto3-iotwireless ];
+    ivs = [ mypy-boto3-ivs ];
+    ivs-realtime = [ mypy-boto3-ivs-realtime ];
+    ivschat = [ mypy-boto3-ivschat ];
+    kafka = [ mypy-boto3-kafka ];
+    kafkaconnect = [ mypy-boto3-kafkaconnect ];
+    kendra = [ mypy-boto3-kendra ];
+    kendra-ranking = [ mypy-boto3-kendra-ranking ];
+    keyspaces = [ mypy-boto3-keyspaces ];
+    kinesis = [ mypy-boto3-kinesis ];
+    kinesis-video-archived-media = [ mypy-boto3-kinesis-video-archived-media ];
+    kinesis-video-media = [ mypy-boto3-kinesis-video-media ];
+    kinesis-video-signaling = [ mypy-boto3-kinesis-video-signaling ];
+    kinesis-video-webrtc-storage = [ mypy-boto3-kinesis-video-webrtc-storage ];
+    kinesisanalytics = [ mypy-boto3-kinesisanalytics ];
+    kinesisanalyticsv2 = [ mypy-boto3-kinesisanalyticsv2 ];
+    kinesisvideo = [ mypy-boto3-kinesisvideo ];
+    kms = [ mypy-boto3-kms ];
+    lakeformation = [ mypy-boto3-lakeformation ];
+    lambda = [ mypy-boto3-lambda ];
+    lex-models = [ mypy-boto3-lex-models ];
+    lex-runtime = [ mypy-boto3-lex-runtime ];
+    lexv2-models = [ mypy-boto3-lexv2-models ];
+    lexv2-runtime = [ mypy-boto3-lexv2-runtime ];
+    license-manager = [ mypy-boto3-license-manager ];
+    license-manager-linux-subscriptions = [ mypy-boto3-license-manager-linux-subscriptions ];
+    license-manager-user-subscriptions = [ mypy-boto3-license-manager-user-subscriptions ];
+    lightsail = [ mypy-boto3-lightsail ];
+    location = [ mypy-boto3-location ];
+    logs = [ mypy-boto3-logs ];
+    lookoutequipment = [ mypy-boto3-lookoutequipment ];
+    lookoutmetrics = [ mypy-boto3-lookoutmetrics ];
+    lookoutvision = [ mypy-boto3-lookoutvision ];
+    m2 = [ mypy-boto3-m2 ];
+    machinelearning = [ mypy-boto3-machinelearning ];
+    macie = [ mypy-boto3-macie ];
+    macie2 = [ mypy-boto3-macie2 ];
+    managedblockchain = [ mypy-boto3-managedblockchain ];
+    managedblockchain-query = [ mypy-boto3-managedblockchain-query ];
+    marketplace-catalog = [ mypy-boto3-marketplace-catalog ];
+    marketplace-entitlement = [ mypy-boto3-marketplace-entitlement ];
+    marketplacecommerceanalytics = [ mypy-boto3-marketplacecommerceanalytics ];
+    mediaconnect = [ mypy-boto3-mediaconnect ];
+    mediaconvert = [ mypy-boto3-mediaconvert ];
+    medialive = [ mypy-boto3-medialive ];
+    mediapackage = [ mypy-boto3-mediapackage ];
+    mediapackage-vod = [ mypy-boto3-mediapackage-vod ];
+    mediapackagev2 = [ mypy-boto3-mediapackagev2 ];
+    mediastore = [ mypy-boto3-mediastore ];
+    mediastore-data = [ mypy-boto3-mediastore-data ];
+    mediatailor = [ mypy-boto3-mediatailor ];
+    medical-imaging = [ mypy-boto3-medical-imaging ];
+    memorydb = [ mypy-boto3-memorydb ];
+    meteringmarketplace = [ mypy-boto3-meteringmarketplace ];
+    mgh = [ mypy-boto3-mgh ];
+    mgn = [ mypy-boto3-mgn ];
+    migration-hub-refactor-spaces = [ mypy-boto3-migration-hub-refactor-spaces ];
+    migrationhub-config = [ mypy-boto3-migrationhub-config ];
+    migrationhuborchestrator = [ mypy-boto3-migrationhuborchestrator ];
+    migrationhubstrategy = [ mypy-boto3-migrationhubstrategy ];
+    mobile = [ mypy-boto3-mobile ];
+    mq = [ mypy-boto3-mq ];
+    mturk = [ mypy-boto3-mturk ];
+    mwaa = [ mypy-boto3-mwaa ];
+    neptune = [ mypy-boto3-neptune ];
+    network-firewall = [ mypy-boto3-network-firewall ];
+    networkmanager = [ mypy-boto3-networkmanager ];
+    nimble = [ mypy-boto3-nimble ];
+    oam = [ mypy-boto3-oam ];
+    omics = [ mypy-boto3-omics ];
+    opensearch = [ mypy-boto3-opensearch ];
+    opensearchserverless = [ mypy-boto3-opensearchserverless ];
+    opsworks = [ mypy-boto3-opsworks ];
+    opsworkscm = [ mypy-boto3-opsworkscm ];
+    organizations = [ mypy-boto3-organizations ];
+    osis = [ mypy-boto3-osis ];
+    outposts = [ mypy-boto3-outposts ];
+    panorama = [ mypy-boto3-panorama ];
+    payment-cryptography = [ mypy-boto3-payment-cryptography ];
+    payment-cryptography-data = [ mypy-boto3-payment-cryptography-data ];
+    personalize = [ mypy-boto3-personalize ];
+    personalize-events = [ mypy-boto3-personalize-events ];
+    personalize-runtime = [ mypy-boto3-personalize-runtime ];
+    pi = [ mypy-boto3-pi ];
+    pinpoint = [ mypy-boto3-pinpoint ];
+    pinpoint-email = [ mypy-boto3-pinpoint-email ];
+    pinpoint-sms-voice = [ mypy-boto3-pinpoint-sms-voice ];
+    pinpoint-sms-voice-v2 = [ mypy-boto3-pinpoint-sms-voice-v2 ];
+    pipes = [ mypy-boto3-pipes ];
+    polly = [ mypy-boto3-polly ];
+    pricing = [ mypy-boto3-pricing ];
+    privatenetworks = [ mypy-boto3-privatenetworks ];
+    proton = [ mypy-boto3-proton ];
+    qldb = [ mypy-boto3-qldb ];
+    qldb-session = [ mypy-boto3-qldb-session ];
+    quicksight = [ mypy-boto3-quicksight ];
+    ram = [ mypy-boto3-ram ];
+    rbin = [ mypy-boto3-rbin ];
+    rds = [ mypy-boto3-rds ];
+    rds-data = [ mypy-boto3-rds-data ];
+    redshift = [ mypy-boto3-redshift ];
+    redshift-data = [ mypy-boto3-redshift-data ];
+    redshift-serverless = [ mypy-boto3-redshift-serverless ];
+    rekognition = [ mypy-boto3-rekognition ];
+    resiliencehub = [ mypy-boto3-resiliencehub ];
+    resource-explorer-2 = [ mypy-boto3-resource-explorer-2 ];
+    resource-groups = [ mypy-boto3-resource-groups ];
+    resourcegroupstaggingapi = [ mypy-boto3-resourcegroupstaggingapi ];
+    robomaker = [ mypy-boto3-robomaker ];
+    rolesanywhere = [ mypy-boto3-rolesanywhere ];
+    route53 = [ mypy-boto3-route53 ];
+    route53-recovery-cluster = [ mypy-boto3-route53-recovery-cluster ];
+    route53-recovery-control-config = [ mypy-boto3-route53-recovery-control-config ];
+    route53-recovery-readiness = [ mypy-boto3-route53-recovery-readiness ];
+    route53domains = [ mypy-boto3-route53domains ];
+    route53resolver = [ mypy-boto3-route53resolver ];
+    rum = [ mypy-boto3-rum ];
+    s3 = [ mypy-boto3-s3 ];
+    s3control = [ mypy-boto3-s3control ];
+    s3outposts = [ mypy-boto3-s3outposts ];
+    sagemaker = [ mypy-boto3-sagemaker ];
+    sagemaker-a2i-runtime = [ mypy-boto3-sagemaker-a2i-runtime ];
+    sagemaker-edge = [ mypy-boto3-sagemaker-edge ];
+    sagemaker-featurestore-runtime = [ mypy-boto3-sagemaker-featurestore-runtime ];
+    sagemaker-geospatial = [ mypy-boto3-sagemaker-geospatial ];
+    sagemaker-metrics = [ mypy-boto3-sagemaker-metrics ];
+    sagemaker-runtime = [ mypy-boto3-sagemaker-runtime ];
+    savingsplans = [ mypy-boto3-savingsplans ];
+    scheduler = [ mypy-boto3-scheduler ];
+    schemas = [ mypy-boto3-schemas ];
+    sdb = [ mypy-boto3-sdb ];
+    secretsmanager = [ mypy-boto3-secretsmanager ];
+    securityhub = [ mypy-boto3-securityhub ];
+    securitylake = [ mypy-boto3-securitylake ];
+    serverlessrepo = [ mypy-boto3-serverlessrepo ];
+    service-quotas = [ mypy-boto3-service-quotas ];
+    servicecatalog = [ mypy-boto3-servicecatalog ];
+    servicecatalog-appregistry = [ mypy-boto3-servicecatalog-appregistry ];
+    servicediscovery = [ mypy-boto3-servicediscovery ];
+    ses = [ mypy-boto3-ses ];
+    sesv2 = [ mypy-boto3-sesv2 ];
+    shield = [ mypy-boto3-shield ];
+    signer = [ mypy-boto3-signer ];
+    simspaceweaver = [ mypy-boto3-simspaceweaver ];
+    sms = [ mypy-boto3-sms ];
+    sms-voice = [ mypy-boto3-sms-voice ];
+    snow-device-management = [ mypy-boto3-snow-device-management ];
+    snowball = [ mypy-boto3-snowball ];
+    sns = [ mypy-boto3-sns ];
+    sqs = [ mypy-boto3-sqs ];
+    ssm = [ mypy-boto3-ssm ];
+    ssm-contacts = [ mypy-boto3-ssm-contacts ];
+    ssm-incidents = [ mypy-boto3-ssm-incidents ];
+    ssm-sap = [ mypy-boto3-ssm-sap ];
+    sso = [ mypy-boto3-sso ];
+    sso-admin = [ mypy-boto3-sso-admin ];
+    sso-oidc = [ mypy-boto3-sso-oidc ];
+    stepfunctions = [ mypy-boto3-stepfunctions ];
+    storagegateway = [ mypy-boto3-storagegateway ];
+    sts = [ mypy-boto3-sts ];
+    support = [ mypy-boto3-support ];
+    support-app = [ mypy-boto3-support-app ];
+    swf = [ mypy-boto3-swf ];
+    synthetics = [ mypy-boto3-synthetics ];
+    textract = [ mypy-boto3-textract ];
+    timestream-query = [ mypy-boto3-timestream-query ];
+    timestream-write = [ mypy-boto3-timestream-write ];
+    tnb = [ mypy-boto3-tnb ];
+    transcribe = [ mypy-boto3-transcribe ];
+    transfer = [ mypy-boto3-transfer ];
+    translate = [ mypy-boto3-translate ];
+    verifiedpermissions = [ mypy-boto3-verifiedpermissions ];
+    voice-id = [ mypy-boto3-voice-id ];
+    vpc-lattice = [ mypy-boto3-vpc-lattice ];
+    waf = [ mypy-boto3-waf ];
+    waf-regional = [ mypy-boto3-waf-regional ];
+    wafv2 = [ mypy-boto3-wafv2 ];
+    wellarchitected = [ mypy-boto3-wellarchitected ];
+    wisdom = [ mypy-boto3-wisdom ];
+    workdocs = [ mypy-boto3-workdocs ];
+    worklink = [ mypy-boto3-worklink ];
+    workmail = [ mypy-boto3-workmail ];
+    workmailmessageflow = [ mypy-boto3-workmailmessageflow ];
+    workspaces = [ mypy-boto3-workspaces ];
+    workspaces-web = [ mypy-boto3-workspaces-web ];
+    xray = [ mypy-boto3-xray ];
   };
 
   # Module has no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "boto3-stubs"
-  ];
+  pythonImportsCheck = [ "boto3-stubs" ];
 
   meta = with lib; {
     description = "Type annotations for boto3";
     homepage = "https://pypi.org/project/boto3-stubs/";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab mbalatsko ];
+    maintainers = with maintainers; [
+      fab
+      mbalatsko
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
index 947a81bb76c4..b43eb933ff78 100644
--- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
@@ -1,16 +1,17 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, llama-index-core
-, llama-index-readers-file
-, poetry-core
-, pythonOlder
-, s3fs
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  llama-index-core,
+  llama-index-readers-file,
+  poetry-core,
+  pythonOlder,
+  s3fs,
 }:
 
 buildPythonPackage rec {
   pname = "llama-index-readers-s3";
-  version = "0.1.5";
+  version = "0.1.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,12 +19,10 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_s3";
     inherit version;
-    hash = "sha256-x3XaPKxnvYYzrJYDmXIKC9YOAOr1HOU1XnaaHIuQnhk=";
+    hash = "sha256-xj7uRsc56Wv/SF4OPo/jc+43PabJ4vaM5HcxhnxTzY8=";
   };
 
-  build-system = [
-    poetry-core
-  ];
+  build-system = [ poetry-core ];
 
   dependencies = [
     llama-index-core
@@ -34,9 +33,7 @@ buildPythonPackage rec {
   # Tests are only available in the mono repo
   doCheck = false;
 
-  pythonImportsCheck = [
-    "llama_index.readers.s3"
-  ];
+  pythonImportsCheck = [ "llama_index.readers.s3" ];
 
   meta = with lib; {
     description = "LlamaIndex Readers Integration for S3";
diff --git a/pkgs/development/python-modules/llamaindex-py-client/default.nix b/pkgs/development/python-modules/llamaindex-py-client/default.nix
index d80b1b28ab9e..46af937a382c 100644
--- a/pkgs/development/python-modules/llamaindex-py-client/default.nix
+++ b/pkgs/development/python-modules/llamaindex-py-client/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llamaindex-py-client";
-  version = "0.1.16";
+  version = "0.1.18";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llamaindex_py_client";
     inherit version;
-    hash = "sha256-6Zu8CFXmyqp166IZzbPPbJQ66U+hXMu2ijoI1FL9Y4A=";
+    hash = "sha256-CR7kmpJZLjiUd3reElFsITcJP51kQaVJ9AZGGRfOm34=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index e9b1e8398824..283a9ae38f31 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -1,26 +1,27 @@
-{ lib
-, beautifulsoup4
-, buildPythonPackage
-, dateparser
-, fetchFromGitHub
-, playwright
-, playwright-stealth
-, poetry-core
-, puremagic
-, pydub
-, pythonOlder
-, pythonRelaxDepsHook
-, pytz
-, requests
-, setuptools
-, speechrecognition
-, tzdata
-, w3lib
+{
+  lib,
+  beautifulsoup4,
+  buildPythonPackage,
+  dateparser,
+  fetchFromGitHub,
+  playwright,
+  playwright-stealth,
+  poetry-core,
+  puremagic,
+  pydub,
+  pythonOlder,
+  pythonRelaxDepsHook,
+  pytz,
+  requests,
+  setuptools,
+  speechrecognition,
+  tzdata,
+  w3lib,
 }:
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.24.2";
+  version = "1.24.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +30,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1VLdQFTB2YG8JUNA9+ys8p1kE/5a5qvzMtEtboejOpc=";
+    hash = "sha256-T/6WfDFW4m9bB09mBwKw1I0iQ0HF0I2Pzf2MXExJVGY=";
   };
 
   pythonRelaxDeps = [
@@ -39,10 +40,9 @@ buildPythonPackage rec {
     "tzdata"
   ];
 
-  build-system = [
-    poetry-core
-    pythonRelaxDepsHook
-  ];
+  build-system = [ poetry-core ];
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
 
   dependencies = [
     beautifulsoup4
@@ -68,9 +68,7 @@ buildPythonPackage rec {
   # Module has no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "playwrightcapture"
-  ];
+  pythonImportsCheck = [ "playwrightcapture" ];
 
   meta = with lib; {
     description = "Capture a URL with Playwright";
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 3732d79c56a6..eb9b8e6a3463 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "0.10.0.20240411";
+  version = "0.10.0.20240412";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-x6GOS3sqH+1ijCgovoj6ckW3aidVeXtHsGEnH/mLrHo=";
+    hash = "sha256-G2hdl029MlirHH9HNEnPKlUnWnSplbYKhBDw8H1/W3g=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix
index a104e1e1aeb7..ae1d805712e0 100644
--- a/pkgs/development/python-modules/pybotvac/default.nix
+++ b/pkgs/development/python-modules/pybotvac/default.nix
@@ -1,29 +1,35 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pythonOlder
-, requests
-, requests-oauthlib
-, voluptuous
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  requests,
+  requests-oauthlib,
+  voluptuous,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pybotvac";
-  version = "0.0.24";
-  format = "setuptools";
+  version = "0.0.25";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU=";
+    hash = "sha256-EvGBStEYgqFO9GMtxs1qtDixb4y2Ptom8xncRUv4ur4=";
   };
 
-  patches = [
-    ./urllib3-2.0-compat.patch
-  ];
+  postPatch = ''
+    substituteInPlace pybotvac/robot.py \
+      --replace-fail "import urllib3" "" \
+      --replace-fail "urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)" "# urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)"
+  '';
+
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     requests-oauthlib
     voluptuous
@@ -32,9 +38,7 @@ buildPythonPackage rec {
   # Module no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "pybotvac"
-  ];
+  pythonImportsCheck = [ "pybotvac" ];
 
   meta = with lib; {
     description = "Python module for interacting with Neato Botvac Connected vacuum robots";
diff --git a/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch b/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch
deleted file mode 100644
index 8b6ef4e91cc3..000000000000
--- a/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/pybotvac/robot.py b/pybotvac/robot.py
-index f87546f..e9a61de 100644
---- a/pybotvac/robot.py
-+++ b/pybotvac/robot.py
-@@ -6,7 +6,6 @@ from datetime import datetime, timezone
- from email.utils import format_datetime

- 

- import requests

--import urllib3

- from voluptuous import (

-     ALLOW_EXTRA,

-     All,

-@@ -21,8 +20,6 @@ from voluptuous import (
- from .exceptions import NeatoRobotException, NeatoUnsupportedDevice

- from .neato import Neato  # For default Vendor argument

- 

--# Disable warning due to SubjectAltNameWarning in certificate

--urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)

- 

- _LOGGER = logging.getLogger(__name__)

- 

diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix
index 322de9c8746f..ef643d765a7a 100644
--- a/pkgs/development/python-modules/pytest-aio/default.nix
+++ b/pkgs/development/python-modules/pytest-aio/default.nix
@@ -1,21 +1,23 @@
-{ lib
-, anyio
-, buildPythonPackage
-, curio
-, fetchFromGitHub
-, hypothesis
-, pytest
-, pytestCheckHook
-, pythonOlder
-, sniffio
-, trio
-, trio-asyncio
+{
+  lib,
+  anyio,
+  buildPythonPackage,
+  curio,
+  fetchFromGitHub,
+  hypothesis,
+  pytest,
+  pytestCheckHook,
+  pythonOlder,
+  poetry-core,
+  sniffio,
+  trio,
+  trio-asyncio,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-aio";
-  version = "1.5.0";
-  format = "setuptools";
+  version = "1.8.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -23,34 +25,30 @@ buildPythonPackage rec {
     owner = "klen";
     repo = "pytest-aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-BIVorMRWyboKFZCiELoBh/1oxSpdV263zfLce1fNVhU=";
+    hash = "sha256-MexIL9yFTzhkJ/61GgYoT54MWV8B0c1/CWkN5FVTvnw=";
   };
 
-  postPatch = ''
-    sed -i '/addopts/d' setup.cfg
-  '';
+  build-system = [ poetry-core ];
 
-  buildInputs = [
-    pytest
-  ];
+  buildInputs = [ pytest ];
 
-  nativeCheckInputs = [
+  dependencies = [
     anyio
     curio
     hypothesis
-    pytestCheckHook
     sniffio
     trio
     trio-asyncio
   ];
 
-  pythonImportsCheck = [
-    "pytest_aio"
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "pytest_aio" ];
 
   meta = with lib; {
-    homepage = "https://github.com/klen/pytest-aio";
     description = "Pytest plugin for aiohttp support";
+    homepage = "https://github.com/klen/pytest-aio";
+    changelog = "https://github.com/klen/pytest-aio/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/python-digitalocean/default.nix
index 3d756312deda..c0ab09542d95 100644
--- a/pkgs/development/python-modules/digitalocean/default.nix
+++ b/pkgs/development/python-modules/python-digitalocean/default.nix
@@ -1,39 +1,39 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy3k
-, jsonpickle
-, mock
-, pytest
-, pytestCheckHook
-, requests
-, responses
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  jsonpickle,
+  pytestCheckHook,
+  pythonOlder,
+  requests,
+  responses,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "python-digitalocean";
   version = "1.17.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "koalalorenzo";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1c50ka4y712rr551gq3kdfw7fgfxr4w837sww6yy683yz7m1d1h8";
+    repo = "python-digitalocean";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-CIYW6vl+IOO94VyfgTjJ3T13uGtz4BdKyVmE44maoLA=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     jsonpickle
     requests
   ];
 
-  dontUseSetuptoolsCheck = true;
-
   nativeCheckInputs = [
-    pytest
     pytestCheckHook
     responses
-  ] ++ lib.optionals (!isPy3k) [
-    mock
   ];
 
   preCheck = ''
@@ -41,14 +41,18 @@ buildPythonPackage rec {
   '';
 
   # Test tries to access the network
-  disabledTests = ["TestFirewall"];
+  disabledTests = [ "TestFirewall" ];
 
   pythonImportsCheck = [ "digitalocean" ];
 
   meta = with lib; {
     description = "Python API to manage Digital Ocean Droplets and Images";
     homepage = "https://github.com/koalalorenzo/python-digitalocean";
+    changelog = "https://github.com/koalalorenzo/python-digitalocean/releases/tag/v${version}";
     license = with licenses; [ lgpl3Only ];
-    maintainers = with maintainers; [ kiwi teh ];
+    maintainers = with maintainers; [
+      kiwi
+      teh
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index dd9aaf49e62f..e90cae8f248a 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1127";
+  version = "3.0.1128";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-NF3ygbCLbx2wszgnyWNSZWc+p7t/c2PtJ0N2zUGIkkg=";
+    hash = "sha256-SYR9vkeaVBPwke7FzjcDGSvsZE0vznNf/7zCKizaW+4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
index 5964244d391d..b7ee6caf0333 100644
--- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
+++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "whirlpool-sixth-sense";
-  version = "0.18.7";
+  version = "0.18.8";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "abmantis";
     repo = "whirlpool-sixth-sense";
     rev = "refs/tags/${version}";
-    hash = "sha256-M4qOdxR97VhquB85IgimYKZqix2WoRIZcLSIlVK1xDY=";
+    hash = "sha256-Nmjw6b1k5M4H23tJxUPPJ3JIkuK5ylqEeFp18cGz9pA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 90a9da83bf83..194ce9fd8ce1 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -150,7 +150,10 @@ in rec {
     stdenv = llvm.rocmClangStdenv;
   };
 
-  hiprand = rocrand; # rocrand includes hiprand
+  hiprand = callPackage ./hiprand {
+    inherit rocmUpdateScript rocm-cmake clr rocrand;
+    stdenv = llvm.rocmClangStdenv;
+  };
 
   rocfft = callPackage ./rocfft {
     inherit rocmUpdateScript rocm-cmake rocrand rocfft clr;
diff --git a/pkgs/development/rocm-modules/6/hiprand/default.nix b/pkgs/development/rocm-modules/6/hiprand/default.nix
new file mode 100644
index 000000000000..7251a0e5a07e
--- /dev/null
+++ b/pkgs/development/rocm-modules/6/hiprand/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rocmUpdateScript
+, cmake
+, rocm-cmake
+, clr
+, rocrand
+, gtest
+, buildTests ? false
+, gpuTargets ? [ ]
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hiprand";
+  version = "6.0.2";
+
+  outputs = [
+    "out"
+  ] ++ lib.optionals buildTests [
+    "test"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "hipRAND";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-uGHzOhUX5JEknVFwhHhWFdPmwLS/TuaXYMeItS7tXIg=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
+    clr
+  ];
+
+  buildInputs = [ rocrand ] ++ (lib.optionals buildTests [ gtest ]);
+
+  cmakeFlags = [
+    "-DCMAKE_C_COMPILER=hipcc"
+    "-DCMAKE_CXX_COMPILER=hipcc"
+    "-DHIP_ROOT_DIR=${clr}"
+    # 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_TEST=ON"
+  ];
+
+  postInstall = lib.optionalString buildTests ''
+    mkdir -p $test/bin
+    mv $out/bin/test_* $test/bin
+    rm -r $out/bin/hipRAND
+    # Fail if bin/ isn't actually empty
+    rmdir $out/bin
+  '';
+
+  passthru.updateScript = rocmUpdateScript {
+    name = finalAttrs.pname;
+    owner = finalAttrs.src.owner;
+    repo = finalAttrs.src.repo;
+  };
+
+  meta = with lib; {
+    description = "A HIP wrapper for rocRAND and cuRAND";
+    homepage = "https://github.com/ROCm/hipRAND";
+    license = with licenses; [ mit ];
+    maintainers = teams.rocm.members;
+    platforms = platforms.linux;
+    broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0";
+  };
+})
diff --git a/pkgs/development/rocm-modules/6/rocrand/default.nix b/pkgs/development/rocm-modules/6/rocrand/default.nix
index f09ff3b12059..7d0e80b5af4e 100644
--- a/pkgs/development/rocm-modules/6/rocrand/default.nix
+++ b/pkgs/development/rocm-modules/6/rocrand/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "rocRAND";
     rev = "rocm-${finalAttrs.version}";
     hash = "sha256-BBkcYOP+zh3OQTxuSkeiJizwnE9Gr5Jbhx0e8SU/mmU=";
-    fetchSubmodules = true; # For inline hipRAND
   };
 
   nativeBuildInputs = [
@@ -68,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $benchmark/bin
     mv $out/bin/benchmark_* $benchmark/bin
   '' + lib.optionalString (buildTests || buildBenchmarks) ''
+    rm -r $out/bin/rocRAND
+    # Fail if bin/ isn't actually empty
     rmdir $out/bin
   '';
 
diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix
index 65e429c220d7..8537cabcaca1 100644
--- a/pkgs/development/tools/rust/cargo-about/default.nix
+++ b/pkgs/development/tools/rust/cargo-about/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-about";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
     rev = version;
-    sha256 = "sha256-srJ5NyO+kySFCcqyF0i99Zvh2XsNAyFvTUcks/kt0qs=";
+    sha256 = "sha256-+FtTD2vr1+BxSXHlFqpXmzP54vZ8CP1vJ0BQVFp/Zx4=";
   };
 
-  cargoHash = "sha256-eO4dBXVBjuN68cTvw8LzzJEedu5+dizOMu4QFEOzKK8=";
+  cargoHash = "sha256-5Kh0GpyAq6jeMuPO3x+lC46zkVcxoMVMjQXZCBZRlk8=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index 725cc5231c7e..f4e3c6a4504a 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -1,19 +1,32 @@
-{ lib, stdenv, fetchFromGitLab, SDL2, SDL2_image, pkg-config
-, libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3
+{ lib
+, stdenv
+, fetchFromGitLab
+, SDL2
+, SDL2_image
+, pkg-config
+, libvorbis
+, libGL
+, boost
+, cmake
+, zlib
+, curl
+, SDL2_mixer
+, SDL2_ttf
+, python3
 }:
 
 stdenv.mkDerivation rec {
   pname = "commandergenius";
-  version = "2.3.3";
+  version = "3.5.0";
 
   src = fetchFromGitLab {
     owner = "Dringgstein";
     repo = "Commander-Genius";
     rev = "v${version}";
-    sha256 = "04nb23wwvc3yywz3cr6gvn02fa7psfs22ssg4wk12s08z1azvz3h";
+    hash = "sha256-w5DP7vkvWOs8qcHqoQaEWHnaBwUoi1I4gnE+Z3haHxE=";
   };
 
-  buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ];
+  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libGL boost libvorbis zlib curl python3 ];
 
   preConfigure = ''
     export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share"
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 57b4b921de41..33b56ccb134a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -949,7 +949,7 @@
     "digital_loggers" = ps: with ps; [
     ];
     "digital_ocean" = ps: with ps; [
-      digital-ocean
+      python-digitalocean
     ];
     "directv" = ps: with ps; [
       directv
diff --git a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix
index 5fa1216ad4fb..f533b84fd832 100644
--- a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "nbogojevic";
   domain = "midea_dehumidifier_lan";
-  version = "0.9.2";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-midea-air-appliances-lan";
     rev = "v${version}";
-    hash = "sha256-CNvtpC7g0XR+cNDV9sMWc3sRLsy4bXFSDvkP+I7W1Gc=";
+    hash = "sha256-Fl8qwsW9NdjnYdu7IGQDelXTLqNx5ioUoxkhv+p5L0I=";
   };
 
   propagatedBuildInputs = [ midea-beautiful-air ];
diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix
index bb8a5e6a575c..50067d7dd622 100644
--- a/pkgs/servers/http/envoy/default.nix
+++ b/pkgs/servers/http/envoy/default.nix
@@ -197,5 +197,6 @@ buildBazelPackage {
     license = licenses.asl20;
     maintainers = with maintainers; [ lukegb ];
     platforms = [ "x86_64-linux" "aarch64-linux" ];
+    knownVulnerabilities = [ "CVE-2024-30255" ];
   };
 }
diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix
index 33951c4ab9b4..7735f8951e54 100644
--- a/pkgs/tools/admin/syft/default.nix
+++ b/pkgs/tools/admin/syft/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "syft";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     rev = "refs/tags/v${version}";
-    hash = "sha256-75puiKfXp8vS9iiSk6R85RBn9xlQp9jk51ZNBeJXc/U=";
+    hash = "sha256-HlV+DeLI6/vYAYkp0ZM7z9uWC+nZLso6xlvCQJ2Imjg=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -28,7 +28,7 @@ buildGoModule rec {
   # hash mismatch with darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-AHzKmitIUw0CqBU2Xinb6UVnlZB+2ED85uqGUFonkWM=";
+  vendorHash = "sha256-yXl8f3f3XO8o80PkX6hS/12p80z4LczghdmY1Elp0aE=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/networking/wireproxy/default.nix b/pkgs/tools/networking/wireproxy/default.nix
index 1ce31211f5b5..1c5eda9f1cd4 100644
--- a/pkgs/tools/networking/wireproxy/default.nix
+++ b/pkgs/tools/networking/wireproxy/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "wireproxy";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "pufferffish";
     repo = "wireproxy";
     rev = "v${version}";
-    hash = "sha256-lMTlocKtOg82dH8XU+bIgPhico3mueLAuTspAY88GFI=";
+    hash = "sha256-2gio+kyjIvaNjb/+M8M5YvbAPbQX+B9A/Qly2kyFZXw=";
   };
 
   ldflags = [
@@ -22,7 +22,7 @@ buildGoModule rec {
     "-X main.version=v${version}"
   ];
 
-  vendorHash = "sha256-V9W7Z8vgPdudNivfmGzJe1f6ebrZEqlG4AdIf2NNGrY=";
+  vendorHash = "sha256-u5/ppH+8mcR3AdPnA6vDFL4GwVzbUj679I4zBw80HU0=";
 
   passthru.tests.version = testers.testVersion {
     package = wireproxy;
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix
index 826987af508a..e0b213a120b2 100644
--- a/pkgs/tools/networking/xh/default.nix
+++ b/pkgs/tools/networking/xh/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xh";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "ducaale";
     repo = "xh";
     rev = "v${version}";
-    sha256 = "sha256-nsxXNlDycn7W7X+AthYCFQu8i2bEPQv7r2LCbc3gFrE=";
+    sha256 = "sha256-hppfBiWJAsJXh6eERh4RYTmSOCNlxy2BcilRM6oafjk=";
   };
 
-  cargoHash = "sha256-THj8tE12P/K+t/R1xUxo042FIX6JP3riCvm2a8zVEzw=";
+  cargoHash = "sha256-pyOcrc8F+rdYWQtOEP6RZpaKeaMGNvc6eqFOVeBzK4k=";
 
   buildFeatures = lib.optional withNativeTls "native-tls";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48a048001990..2ba25e623e5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10486,9 +10486,16 @@ with pkgs;
 
   lidarr = callPackage ../servers/lidarr { };
 
-  limesuite = callPackage ../applications/radio/limesuite {
-    inherit (darwin.apple_sdk.frameworks) GLUT;
-  };
+  inherit ({
+    limesuite = callPackage ../applications/radio/limesuite {
+      inherit (darwin.apple_sdk.frameworks) GLUT;
+    };
+    limesuiteWithGui = limesuite.override {
+      withGui = true;
+    };
+  })
+  limesuite
+  limesuiteWithGui;
 
   limesurvey = callPackage ../servers/limesurvey { };
 
@@ -35742,7 +35749,7 @@ with pkgs;
     xwaylandSupport = false;
   };
 
-  chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {
+  chatterino2 = callPackage ../applications/networking/instant-messengers/chatterino2 {
     stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 00573f5cc226..40351281d5c5 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -106,6 +106,7 @@ mapAliases ({
   diff_cover = diff-cover; # added 2021-07-02
   discogs_client = discogs-client; # added 2021-07-02
   distutils_extra = distutils-extra; # added 2023-10-12
+  digital-ocean = python-digitalocean; # addad 2024-04-12
   djangorestframework-jwt = drf-jwt; # added 2021-07-20
   django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18
   django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c67fd6ca7e7c..8daf20a928ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2966,8 +2966,6 @@ self: super: with self; {
 
   diffusers = callPackage ../development/python-modules/diffusers { };
 
-  digital-ocean = callPackage ../development/python-modules/digitalocean { };
-
   digi-xbee = callPackage ../development/python-modules/digi-xbee { };
 
   dill = callPackage ../development/python-modules/dill { };
@@ -12190,6 +12188,8 @@ self: super: with self; {
 
   python-didl-lite = callPackage ../development/python-modules/python-didl-lite { };
 
+  python-digitalocean = callPackage ../development/python-modules/python-digitalocean { };
+
   python-docx = callPackage ../development/python-modules/python-docx { };
 
   python-doi = callPackage ../development/python-modules/python-doi { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5fac0bb1b460..e8ede387b4c2 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -159,6 +159,7 @@ let
               # Ensure that X11/GTK are in order.
               jobs.firefox-unwrapped.x86_64-linux
               jobs.cachix.x86_64-linux
+              jobs.devenv.x86_64-linux
 
               /*
               TODO: re-add tests; context: https://github.com/NixOS/nixpkgs/commit/36587a587ab191eddd868179d63c82cdd5dee21b
@@ -182,6 +183,7 @@ let
               jobs.stdenv.x86_64-darwin
               jobs.cargo.x86_64-darwin
               jobs.cachix.x86_64-darwin
+              jobs.devenv.x86_64-darwin
               jobs.go.x86_64-darwin
               jobs.python3.x86_64-darwin
               jobs.nixpkgs-review.x86_64-darwin
@@ -209,6 +211,7 @@ let
               jobs.stdenv.aarch64-darwin
               jobs.cargo.aarch64-darwin
               jobs.cachix.aarch64-darwin
+              jobs.devenv.aarch64-darwin
               jobs.go.aarch64-darwin
               jobs.python3.aarch64-darwin
               jobs.nixpkgs-review.aarch64-darwin