From d01ea0a16cb0672d21a5c4fba8be6656c8306a93 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Fri, 10 Apr 2026 23:41:27 +0200
Subject: [PATCH 01/85] netdata: 2.9.0 -> 2.10.3

---
 .../system/netdata/dashboard-v3-add.patch     | 35 +++++++-----
 pkgs/tools/system/netdata/default.nix         | 21 ++++---
 .../disable-binary-permission-check.patch     | 56 +++++++++++++++++++
 3 files changed, 90 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/tools/system/netdata/disable-binary-permission-check.patch

diff --git a/pkgs/tools/system/netdata/dashboard-v3-add.patch b/pkgs/tools/system/netdata/dashboard-v3-add.patch
index a5d3dd17484b..2a80da941cdd 100644
--- a/pkgs/tools/system/netdata/dashboard-v3-add.patch
+++ b/pkgs/tools/system/netdata/dashboard-v3-add.patch
@@ -1,16 +1,22 @@
 diff --git a/packaging/cmake/Modules/NetdataDashboard.cmake b/packaging/cmake/Modules/NetdataDashboard.cmake
-index 098eaffcf..e52375bd0 100644
+index 098eaffcf..9f827d840 100644
 --- a/packaging/cmake/Modules/NetdataDashboard.cmake
 +++ b/packaging/cmake/Modules/NetdataDashboard.cmake
-@@ -26,29 +26,12 @@ function(bundle_dashboard)
+@@ -21,37 +21,11 @@ endfunction()
+ # This is unfortunately complicated due to how we need to handle the
+ # generation of the CMakeLists file for the dashboard code.
+ function(bundle_dashboard)
+-  include(ExternalProject)
+-
    set(dashboard_src_dir "${CMAKE_BINARY_DIR}/dashboard-src")
-   set(dashboard_src_prefix "${dashboard_src_dir}/dist/agent")
+-  set(dashboard_src_prefix "${dashboard_src_dir}/dist/agent")
++  set(dashboard_src_prefix "${dashboard_src_dir}/agent")
    set(dashboard_bin_dir "${CMAKE_BINARY_DIR}/dashboard-bin")
 -  set(DASHBOARD_URL "https://app.netdata.cloud/agent.tar.gz" CACHE STRING
 -      "URL used to fetch the local agent dashboard code")
-
-   message(STATUS "Preparing local agent dashboard code")
-
+-
+-  message(STATUS "Preparing local agent dashboard code")
+-
 -  message(STATUS "  Fetching ${DASHBOARD_URL}")
 -  file(DOWNLOAD
 -       "${DASHBOARD_URL}"
@@ -25,11 +31,14 @@ index 098eaffcf..e52375bd0 100644
 -  else()
 -    message(STATUS "  Fetching ${DASHBOARD_URL} -- Done")
 -  endif()
--
-   message(STATUS "  Extracting dashboard code")
-   extract_gzipped_tarball(
+ 
+-  message(STATUS "  Extracting dashboard code")
+-  extract_gzipped_tarball(
 -    "${CMAKE_BINARY_DIR}/dashboard.tar.gz"
-+    "@dashboardTarball@"
-     "${dashboard_src_dir}"
-   )
-   message(STATUS "  Extracting dashboard code -- Done")
+-    "${dashboard_src_dir}"
+-  )
+-  message(STATUS "  Extracting dashboard code -- Done")
++  file(COPY "@dashboardPath@/" DESTINATION "${dashboard_src_dir}" NO_SOURCE_PERMISSIONS)
+ 
+   handle_braindead_versioning_insanity("${dashboard_src_prefix}")
+ 
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index d52f51884f23..1140ae4d7086 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -9,7 +9,7 @@
   curl,
   dlib,
   fetchFromGitHub,
-  fetchurl,
+  fetchzip,
   flex,
   freeipmi,
   go,
@@ -67,13 +67,13 @@ stdenv.mkDerivation (
   finalAttrs:
   {
     pname = "netdata";
-    version = "2.9.0";
+    version = "2.10.3";
 
     src = fetchFromGitHub {
       owner = "netdata";
       repo = "netdata";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-QA8YI1cHiPjrTZc9fy81i9YGgGTdE98Eo3xQtVn4/nY=";
+      hash = "sha256-ryX+C3zuY7vONPeB4ocXDPttU5aSYbj1ThTosCSxmys=";
       fetchSubmodules = true;
     };
 
@@ -141,16 +141,19 @@ stdenv.mkDerivation (
       #     https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93
       ./ndsudo-fix-path.patch
 
+      ./disable-binary-permission-check.patch
+
       ./use-local-corrosion.patch
       ./use-local-libbacktrace.patch
     ]
     ++ lib.optional withCloudUi (
       replaceVars ./dashboard-v3-add.patch {
         # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved
-        # last update 04/01/2025 04:45:14
-        dashboardTarball = fetchurl {
-          url = "https://web.archive.org/web/20250401044514/https://app.netdata.cloud/agent.tar.gz";
-          hash = "sha256-NtmM1I3VrvFErMoBl+w63Nt0DzOOsaB98cxE/axm8mE=";
+        # last update 12/10/2025 21:25:17
+        dashboardPath = fetchzip {
+          # The `if_` suffix is intentional, with out it the hash will vary depending on the region
+          url = "https://web.archive.org/web/20251210212517if_/https://app.netdata.cloud/agent.tar.gz";
+          hash = "sha256-8ovYkvt324l6f0YT6wTG+Y2u7VaVqotAdssnNTtHIEk=";
         };
       }
     );
@@ -308,7 +311,7 @@ stdenv.mkDerivation (
 
           sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d";
 
-          vendorHash = "sha256-VBr6VZvTKh2GFtcVSHCVNhzS8gvl4VFTNLtrK81Y92I=";
+          vendorHash = "sha256-HRe1bcVIQVzwPZnGlAK5A8AO1VTcjFajkPwBVdl4UIA=";
           proxyVendor = true;
           doCheck = false;
 
@@ -361,7 +364,7 @@ stdenv.mkDerivation (
             src
             cargoRoot
             ;
-          hash = "sha256-M9XECeLu58vBTJE4hFkoshc/ze/HF6rBERcjbjAHOJ0=";
+          hash = "sha256-mxFpT95e+NMqjJOIRqM+yKHGQHfpWmIFHqFNiiiqXOY=";
         })
         (rustPlatform.fetchCargoVendor {
           pname = "${finalAttrs.pname}-nd-jf";
diff --git a/pkgs/tools/system/netdata/disable-binary-permission-check.patch b/pkgs/tools/system/netdata/disable-binary-permission-check.patch
new file mode 100644
index 000000000000..d28185f0e644
--- /dev/null
+++ b/pkgs/tools/system/netdata/disable-binary-permission-check.patch
@@ -0,0 +1,56 @@
+diff --git a/src/go/plugin/go.d/pkg/pathvalidate/validate_unix.go b/src/go/plugin/go.d/pkg/pathvalidate/validate_unix.go
+index fae97e7be..153999fa3 100644
+--- a/src/go/plugin/go.d/pkg/pathvalidate/validate_unix.go
++++ b/src/go/plugin/go.d/pkg/pathvalidate/validate_unix.go
+@@ -8,6 +8,7 @@ import (
+ 	"fmt"
+ 	"os"
+ 	"path/filepath"
++	"strings"
+ 	"syscall"
+ )
+ 
+@@ -42,13 +43,15 @@ func ValidateBinaryPath(path string) (string, error) {
+ 	if !ok {
+ 		return "", fmt.Errorf("unable to get file stat information for %s", absPath)
+ 	}
+-	if fileStat.Uid != 0 {
+-		return "", fmt.Errorf("binary at %s must be owned by root (current uid: %d)", absPath, fileStat.Uid)
+-	}
++	if !strings.HasPrefix(absPath, "/nix/store/") {
++		if fileStat.Uid != 0 {
++			return "", fmt.Errorf("binary at %s must be owned by root (current uid: %d)", absPath, fileStat.Uid)
++		}
+ 
+-	if perm := fileInfo.Mode().Perm(); perm&0022 != 0 {
+-		return "", fmt.Errorf("binary at %s must not be writable by group/others (current permissions: %s / %04o)",
+-			absPath, fileInfo.Mode().String(), perm)
++		if perm := fileInfo.Mode().Perm(); perm&0022 != 0 {
++			return "", fmt.Errorf("binary at %s must not be writable by group/others (current permissions: %s / %04o)",
++				absPath, fileInfo.Mode().String(), perm)
++		}
+ 	}
+ 
+ 	// Step 6: Check executable bit
+@@ -67,13 +70,15 @@ func ValidateBinaryPath(path string) (string, error) {
+ 		if !ok {
+ 			return "", fmt.Errorf("unable to get directory stat information for %s", dir)
+ 		}
+-		if dirStat.Uid != 0 {
+-			return "", fmt.Errorf("directory %s must be owned by root (current uid: %d)", dir, dirStat.Uid)
+-		}
++		if !strings.HasPrefix(dir, "/nix/store") {
++			if dirStat.Uid != 0 {
++				return "", fmt.Errorf("directory %s must be owned by root (current uid: %d)", dir, dirStat.Uid)
++			}
+ 
+-		if perm := dirInfo.Mode().Perm(); perm&0022 != 0 {
+-			return "", fmt.Errorf("directory %s must not be writable by group/others (current permissions: %s / %04o)",
+-				dir, dirInfo.Mode().String(), perm)
++			if perm := dirInfo.Mode().Perm(); perm&0022 != 0 {
++				return "", fmt.Errorf("directory %s must not be writable by group/others (current permissions: %s / %04o)",
++					dir, dirInfo.Mode().String(), perm)
++			}
+ 		}
+ 
+ 		if dir == filepath.Dir(dir) {

From 993a731a57280c7ac73f69fd0fdc5533c4f20c73 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 12 May 2026 18:32:41 +0300
Subject: [PATCH 02/85] nixos/security: warn if wrappers are disabled and
 wrappers are defined

Fixes #518955.
---
 nixos/modules/security/wrappers/default.nix | 248 ++++++++++----------
 1 file changed, 127 insertions(+), 121 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 20177350a740..caeda3fc0426 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -245,134 +245,140 @@ in
   };
 
   ###### implementation
-  config = lib.mkIf config.security.enableWrappers {
-
-    assertions = lib.mapAttrsToList (name: opts: {
-      assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
-      message = ''
-        The security.wrappers.${name} wrapper is not valid:
-            setuid/setgid and capabilities are mutually exclusive.
+  config = lib.mkMerge [
+    {
+      warnings = lib.optional (wrappers != { } && !config.security.enableWrappers) ''
+        security.enableWrappers is set to false, but the following wrappers are still enabled and will be silently ignored: ${lib.concatStringsSep ", " (lib.attrNames wrappers)}. This might prevent fundamental functionalities, like PAM authentication. To avoid this warning, either set security.enableWrappers = true, or explicitly disable each wrapper with `enable = false`.
       '';
-    }) wrappers;
+    }
+    (lib.mkIf config.security.enableWrappers {
+      assertions = lib.mapAttrsToList (name: opts: {
+        assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
+        message = ''
+          The security.wrappers.${name} wrapper is not valid:
+              setuid/setgid and capabilities are mutually exclusive.
+        '';
+      }) wrappers;
 
-    security.wrappers =
-      let
-        mkSetuidRoot = source: {
-          setuid = true;
-          owner = "root";
-          group = "root";
-          inherit source;
+      security.wrappers =
+        let
+          mkSetuidRoot = source: {
+            setuid = true;
+            owner = "root";
+            group = "root";
+            inherit source;
+          };
+        in
+        {
+          # These are mount related wrappers that require the +s permission.
+          mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
+          umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
         };
-      in
-      {
-        # These are mount related wrappers that require the +s permission.
-        mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
-        umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
+
+      # Make sure our wrapperDir exports to the PATH env variable when
+      # initializing the shell
+      environment.extraInit = ''
+        # Wrappers override other bin directories.
+        export PATH="${wrapperDir}:$PATH"
+      '';
+
+      security.apparmor.includes = lib.mapAttrs' (
+        wrapName: wrap:
+        lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
+          include "${
+            pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
+              (securityWrapper wrap.source)
+            ]
+          }"
+          mrpx ${wrap.source},
+        ''
+      ) wrappers;
+
+      systemd.mounts = [
+        {
+          where = parentWrapperDir;
+          what = "tmpfs";
+          type = "tmpfs";
+          options = lib.concatStringsSep "," [
+            "nodev"
+            "mode=755"
+            "size=${config.security.wrapperDirSize}"
+          ];
+        }
+      ];
+
+      systemd.services.suid-sgid-wrappers = {
+        description = "Create SUID/SGID Wrappers";
+        wantedBy = [ "sysinit.target" ];
+        before = [
+          "sysinit.target"
+          "shutdown.target"
+        ];
+        conflicts = [ "shutdown.target" ];
+        after = [ "systemd-sysusers.service" ];
+        unitConfig.DefaultDependencies = false;
+        unitConfig.RequiresMountsFor = [
+          "/nix/store"
+          "/run/wrappers"
+        ];
+        serviceConfig.RestrictSUIDSGID = false;
+        serviceConfig.Type = "oneshot";
+        script = ''
+          chmod 755 "${parentWrapperDir}"
+
+          # We want to place the tmpdirs for the wrappers to the parent dir.
+          wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
+          chmod a+rx "$wrapperDir"
+
+          ${lib.concatStringsSep "\n" mkWrappedPrograms}
+
+          if [ -L ${wrapperDir} ]; then
+            # Atomically replace the symlink
+            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
+            old=$(readlink -f ${wrapperDir})
+            if [ -e "${wrapperDir}-tmp" ]; then
+              rm --force --recursive "${wrapperDir}-tmp"
+            fi
+            ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
+            mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
+            rm --force --recursive "$old"
+          else
+            # For initial setup
+            ln --symbolic "$wrapperDir" "${wrapperDir}"
+          fi
+        '';
       };
 
-    # Make sure our wrapperDir exports to the PATH env variable when
-    # initializing the shell
-    environment.extraInit = ''
-      # Wrappers override other bin directories.
-      export PATH="${wrapperDir}:$PATH"
-    '';
+      ###### wrappers consistency checks
+      system.checks = lib.singleton (
+        pkgs.runCommand "ensure-all-wrappers-paths-exist"
+          {
+            preferLocalBuild = true;
+          }
+          ''
+            # make sure we produce output
+            mkdir -p $out
 
-    security.apparmor.includes = lib.mapAttrs' (
-      wrapName: wrap:
-      lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
-        include "${
-          pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
-            (securityWrapper wrap.source)
-          ]
-        }"
-        mrpx ${wrap.source},
-      ''
-    ) wrappers;
+            echo -n "Checking that Nix store paths of all wrapped programs exist... "
 
-    systemd.mounts = [
-      {
-        where = parentWrapperDir;
-        what = "tmpfs";
-        type = "tmpfs";
-        options = lib.concatStringsSep "," [
-          "nodev"
-          "mode=755"
-          "size=${config.security.wrapperDirSize}"
-        ];
-      }
-    ];
+            declare -A wrappers
+            ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
 
-    systemd.services.suid-sgid-wrappers = {
-      description = "Create SUID/SGID Wrappers";
-      wantedBy = [ "sysinit.target" ];
-      before = [
-        "sysinit.target"
-        "shutdown.target"
-      ];
-      conflicts = [ "shutdown.target" ];
-      after = [ "systemd-sysusers.service" ];
-      unitConfig.DefaultDependencies = false;
-      unitConfig.RequiresMountsFor = [
-        "/nix/store"
-        "/run/wrappers"
-      ];
-      serviceConfig.RestrictSUIDSGID = false;
-      serviceConfig.Type = "oneshot";
-      script = ''
-        chmod 755 "${parentWrapperDir}"
+            for name in "''${!wrappers[@]}"; do
+              path="''${wrappers[$name]}"
+              if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
+                test -t 1 && echo -ne '\033[1;31m'
+                echo "FAIL"
+                echo "The path $path does not exist!"
+                echo 'Please, check the value of `security.wrappers."'$name'".source`.'
+                test -t 1 && echo -ne '\033[0m'
+                exit 1
+              fi
+            done
 
-        # We want to place the tmpdirs for the wrappers to the parent dir.
-        wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
-        chmod a+rx "$wrapperDir"
-
-        ${lib.concatStringsSep "\n" mkWrappedPrograms}
-
-        if [ -L ${wrapperDir} ]; then
-          # Atomically replace the symlink
-          # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
-          old=$(readlink -f ${wrapperDir})
-          if [ -e "${wrapperDir}-tmp" ]; then
-            rm --force --recursive "${wrapperDir}-tmp"
-          fi
-          ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
-          mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
-          rm --force --recursive "$old"
-        else
-          # For initial setup
-          ln --symbolic "$wrapperDir" "${wrapperDir}"
-        fi
-      '';
-    };
-
-    ###### wrappers consistency checks
-    system.checks = lib.singleton (
-      pkgs.runCommand "ensure-all-wrappers-paths-exist"
-        {
-          preferLocalBuild = true;
-        }
-        ''
-          # make sure we produce output
-          mkdir -p $out
-
-          echo -n "Checking that Nix store paths of all wrapped programs exist... "
-
-          declare -A wrappers
-          ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
-
-          for name in "''${!wrappers[@]}"; do
-            path="''${wrappers[$name]}"
-            if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
-              test -t 1 && echo -ne '\033[1;31m'
-              echo "FAIL"
-              echo "The path $path does not exist!"
-              echo 'Please, check the value of `security.wrappers."'$name'".source`.'
-              test -t 1 && echo -ne '\033[0m'
-              exit 1
-            fi
-          done
-
-          echo "OK"
-        ''
-    );
-  };
+            echo "OK"
+          ''
+      );
+    })
+  ];
 }

From a881ed82b6327be8fa165a83872b14cb2e114b77 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 12 May 2026 18:39:33 +0300
Subject: [PATCH 03/85] nixos/security: assert normal users are disabled with
 wrappers

---
 nixos/modules/security/wrappers/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index caeda3fc0426..21ae7b0fc983 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -250,6 +250,22 @@ in
       warnings = lib.optional (wrappers != { } && !config.security.enableWrappers) ''
         security.enableWrappers is set to false, but the following wrappers are still enabled and will be silently ignored: ${lib.concatStringsSep ", " (lib.attrNames wrappers)}. This might prevent fundamental functionalities, like PAM authentication. To avoid this warning, either set security.enableWrappers = true, or explicitly disable each wrapper with `enable = false`.
       '';
+      assertions = [
+        {
+          assertion =
+            !(
+              !config.security.enableWrappers && lib.any (u: u.isNormalUser) (lib.attrValues config.users.users)
+            );
+          message = ''
+            security.enableWrappers is disabled but normal users are defined
+            (${
+              lib.concatStringsSep ", " (
+                lib.mapAttrsToList (n: _: n) (lib.filterAttrs (_: u: u.isNormalUser) config.users.users)
+              )
+            }). Without SUID wrappers, users cannot login. Either enable wrappers or remove all normal user accounts.
+          '';
+        }
+      ];
     }
     (lib.mkIf config.security.enableWrappers {
       assertions = lib.mapAttrsToList (name: opts: {

From a44718a6ec4c66e58fb7300532785f43c0f9edad Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 15 May 2026 14:12:55 +0200
Subject: [PATCH 04/85] easyeffects: 8.2.1 -> 8.2.2

---
 pkgs/by-name/ea/easyeffects/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 10a3f4021803..dc10fe8e2d91 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -33,6 +33,7 @@
   speexdsp,
   onetbb,
   webrtc-audio-processing,
+  x42-plugins,
   zam-plugins,
   zita-convolver,
   wrapGAppsHook3,
@@ -60,13 +61,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "easyeffects";
-  version = "8.2.1";
+  version = "8.2.2";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bGjIqts06ruwMQIW5hk4wlG7G/7GtgFVBgSr68tkIqY=";
+    hash = "sha256-rdg7XvrJU7HH9aGd/TwMqqexmFeLOMBldh1XQakQSeM=";
   };
 
   nativeBuildInputs = [
@@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     speexdsp'
     onetbb
     webrtc-audio-processing
+    x42-plugins
     zita-convolver
   ];
 
@@ -122,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
         calf # compressor exciter, bass enhancer and others
         lsp-plugins # delay, limiter, multiband compressor
         mda_lv2 # loudness
+        x42-plugins # autotune
         zam-plugins # maximizer
       ];
 

From e6c071e402fda537f7d1bbd55c3365e0f124880e Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Fri, 15 May 2026 19:15:32 +0000
Subject: [PATCH 05/85] cargo-dist: 0.30.4 -> 0.31.0

---
 pkgs/by-name/ca/cargo-dist/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index 0bc7cd8fc2d6..7aefed0d936d 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -9,20 +9,21 @@
   zstd,
   git,
   rustup,
+  cacert,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-dist";
-  version = "0.30.4";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "cargo-dist";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Woaa+KNRLqTRgglGM50L8w6UXlnDTcUHQZ20AYbZPnE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BSE3pXo7Kk104v7VEh5WUk+Km1/n/kNf8NJGVGjUKoc=";
   };
 
-  cargoHash = "sha256-DVIckYfIf7EqqRXQbNI3msvDopSY7RxR11942w3XBjg=";
+  cargoHash = "sha256-bfX2Yt0wrPg1pbvYdr2O9VUqYlCFVRh4PIABWxZTgjg=";
 
   nativeBuildInputs = [
     pkg-config
@@ -37,10 +38,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeCheckInputs = [
     git
     rustup
+    cacert
   ];
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
+    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
   };
 
   # remove tests that require internet access
@@ -54,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Tool for building final distributable artifacts and uploading them to an archive";
     mainProgram = "dist";
     homepage = "https://github.com/axodotdev/cargo-dist";
-    changelog = "https://github.com/axodotdev/cargo-dist/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/axodotdev/cargo-dist/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20
       mit

From 445805d117ae00796fb750aea6e99a63dad1a849 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 May 2026 07:16:37 +0000
Subject: [PATCH 06/85] tidal-hifi: 6.3.1-Mavy -> 7.0.1

---
 pkgs/by-name/ti/tidal-hifi/electron.nix | 4 ++--
 pkgs/by-name/ti/tidal-hifi/package.nix  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ti/tidal-hifi/electron.nix b/pkgs/by-name/ti/tidal-hifi/electron.nix
index 6def880dfd9c..eb2942606599 100644
--- a/pkgs/by-name/ti/tidal-hifi/electron.nix
+++ b/pkgs/by-name/ti/tidal-hifi/electron.nix
@@ -8,11 +8,11 @@ let
     https://github.com/Mastermindzh/tidal-hifi/blob/master/build/electron-builder.base.yml
      for the expected version
   */
-  version = "40.7.0";
+  version = "41.5.0";
 in
 (fetchzip {
   url = "https://github.com/castlabs/electron-releases/releases/download/v${version}+wvcus/electron-v${version}+wvcus-linux-x64.zip";
-  hash = "sha256-Ax1gTt5ZRHFP7IBxNb+KXeglflel1zoz0VUHhEM2aAc=";
+  hash = "sha256-LjM80c48AzEwoU8h07qUELTV5jjQeApanaoPZ/szdag=";
   stripRoot = false;
 
 }).overrideAttrs
diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index 39e86326b596..7c77d797d72a 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -92,13 +92,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "tidal-hifi";
-  version = "6.3.1-Mavy";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "Mastermindzh";
     repo = "tidal-hifi";
     tag = finalAttrs.version;
-    hash = "sha256-IOC6LQ6kLQGBTB1Ng6TWCsW9zvsJ3/Yb1515dGbV1EU=";
+    hash = "sha256-6RKGSXWe3YP52bv03kEX60RLE+WRBEsou6yHLZGEVPs=";
   };
 
   nativeBuildInputs = [
@@ -107,7 +107,7 @@ buildNpmPackage (finalAttrs: {
     copyDesktopItems
   ];
 
-  npmDepsHash = "sha256-rsZCy0W1B+beH6bSqOSp4Pu6h3hknrLCfUb8a0F4nFg=";
+  npmDepsHash = "sha256-8uDzikiVGLjhpba6HpSHcvlNghRtmugqjazoAYP1M98=";
   forceGitDeps = true;
   makeCacheWritable = true;
 

From ed775bb58f16248befc63afd35870e02c936183b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anna=20Fr=C3=BChling?= <git@annafruehling.de>
Date: Mon, 18 May 2026 12:57:34 +0200
Subject: [PATCH 07/85] cobang: add python dependency typing_extensions

Introduced in https://github.com/hongquan/CoBang/commit/207668d772d8ac1134dee17cf32d4d8f329cd863
---
 pkgs/by-name/co/cobang/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix
index 226166c7f4da..a359d7546564 100644
--- a/pkgs/by-name/co/cobang/package.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -59,6 +59,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pygobject3
     python-zbar
     qrcode
+    typing-extensions
   ];
 
   # Wrapping this manually for SVG recognition

From 41ca33eeb8edeceb1b3071b296a259b5d28bddda Mon Sep 17 00:00:00 2001
From: david <david@samb.al>
Date: Mon, 18 May 2026 15:46:16 +0200
Subject: [PATCH 08/85] ryzen-smu: fix builds for non-gcc kernels

---
 pkgs/os-specific/linux/ryzen-smu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/ryzen-smu/default.nix b/pkgs/os-specific/linux/ryzen-smu/default.nix
index e8a47cc94770..5551aa798ac3 100644
--- a/pkgs/os-specific/linux/ryzen-smu/default.nix
+++ b/pkgs/os-specific/linux/ryzen-smu/default.nix
@@ -24,6 +24,7 @@ let
 
     makeFlags = [
       "-C userspace"
+      "CC=${stdenv.cc.targetPrefix}cc"
     ];
 
     installPhase = ''
@@ -46,6 +47,7 @@ stdenv.mkDerivation {
   makeFlags = [
     "TARGET=${kernel.modDirVersion}"
     "KERNEL_BUILD=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "CC=${stdenv.cc.targetPrefix}cc"
   ];
 
   installPhase = ''

From 3a0bb52253d13ee14d0f1ef2e948f26913314d09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 05:44:42 +0000
Subject: [PATCH 09/85] notesnook: 3.3.17 -> 3.3.19

---
 pkgs/by-name/no/notesnook/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
index 622315d1e456..493258addfc9 100644
--- a/pkgs/by-name/no/notesnook/package.nix
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "notesnook";
-  version = "3.3.17";
+  version = "3.3.19";
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
@@ -27,10 +27,10 @@ let
     url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
     hash =
       {
-        x86_64-linux = "sha256-AFy5hk7blipFBYAgxbMTJHITGtpaQGkSFFyUhB3TcCE=";
-        aarch64-linux = "sha256-yLnhxnttlSf43jD0dlVLb5j6kXlUY3w5mLsC826z4rI=";
-        x86_64-darwin = "sha256-d4lmmk4gYnpil/oPak7EohyJRjGx9kYmjopn1UxPR6U=";
-        aarch64-darwin = "sha256-4E+UqZOm7NjHpvxIVnrnl5Og9xdMuuyzdwgiWeENZrg=";
+        x86_64-linux = "sha256-l4+SeM6KXLICbHzoIpotwdCkbCaPV83TT8mlvc+Z0Qs=";
+        aarch64-linux = "sha256-9yWClJWI/1F8QGkUQCsPQcqbAqjC+JM4jXA8SmpoKNQ=";
+        x86_64-darwin = "sha256-LAsCRRLAZ0bsHkitXHE4jF6+tgSm0HnWNKG3bSKLy+0=";
+        aarch64-darwin = "sha256-GkhO6iCn+CrLDGhKBGyogm0dNvpAPZS0xH/ED5oSN2U=";
       }
       .${system} or throwSystem;
   };

From e392cf7f39372ad44320cd1fee797a6cbf15ed1e Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 1 May 2026 18:02:54 +0200
Subject: [PATCH 10/85] komikku: 50.2.0 -> 50.4.0

---
 pkgs/by-name/ko/komikku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 8a1432920ffb..3908d86b2586 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -24,14 +24,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "komikku";
-  version = "50.2.0";
+  version = "50.4.0";
   pyproject = false;
 
   src = fetchFromCodeberg {
     owner = "valos";
     repo = "Komikku";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-djC4v2OTRA/UEiI3foiEvRo6gVN5eS2+eENueQzdkds=";
+    hash = "sha256-u/OyWZJIntpeuVoJQmLrdsva3+xvwRX28N89aVZYc2o=";
   };
 
   nativeBuildInputs = [

From ed9004fda8c31095a50a03b90097b97df3353d90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 15:35:35 +0000
Subject: [PATCH 11/85] sone: 0.15.0 -> 0.17.0

---
 pkgs/by-name/so/sone/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/so/sone/package.nix b/pkgs/by-name/so/sone/package.nix
index 2ee76a73c3a6..206f3cc0d1b6 100644
--- a/pkgs/by-name/so/sone/package.nix
+++ b/pkgs/by-name/so/sone/package.nix
@@ -22,21 +22,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sone";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "lullabyX";
     repo = "sone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QxA9ab/BVmYvsZb++ykWZ80TDpIMWQb5LJazdUab+pM=";
+    hash = "sha256-5SeB8PrTZQpXnp3WfSTJjEX5uxQr8vEfyzWinTsPvsA=";
   };
 
-  cargoHash = "sha256-zWW/x92/HAa6AsXe0fIQmQrGKtsR2sX/vyG7uwsl3Bc=";
+  cargoHash = "sha256-6nXwuVKOuHE1SQCkytArs0a2qr7fIEpRndgDX1omYQg=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps-${finalAttrs.version}";
     inherit (finalAttrs) src;
-    hash = "sha256-MORNCIA/LC6DTNUqXvKk4hHnoKDZEC+poANcNOHQPyM=";
+    hash = "sha256-qOapQI+r84aj5aE/wQ4fCFEljeW8UbRHEXhaorBkIzk=";
   };
 
   nativeBuildInputs = [

From 8d2dc6741aefde1bf1a000fcbff07c345e743382 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Tue, 19 May 2026 21:59:22 +0200
Subject: [PATCH 12/85] vinyl-cache: 9.0.0 -> 9.0.1

fixes VSV00019

Co-authored-by:    R. Ryantm <ryantm-bot@ryantm.com>
---
 pkgs/servers/vinyl-cache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/vinyl-cache/default.nix b/pkgs/servers/vinyl-cache/default.nix
index 11f4438ea787..529bba0d7e27 100644
--- a/pkgs/servers/vinyl-cache/default.nix
+++ b/pkgs/servers/vinyl-cache/default.nix
@@ -127,7 +127,7 @@ in
 {
   # EOL 2027-03-16
   vinyl-cache_9 = generic {
-    version = "9.0.0";
-    hash = "sha256-l0DCEMKndifVD9CtbHWdw8oJT8tOZVW6VfynHPSDvRc=";
+    version = "9.0.1";
+    hash = "sha256-Lo7GfNIT6mhkx2OTnWSRICVVc0L60qX/2mx8W1m96xc=";
   };
 }

From 8a9c7ad1dbe27ee98117910636e33e30d5e1c9fb Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Tue, 19 May 2026 22:13:37 +0200
Subject: [PATCH 13/85] varnish60: 6.0.17 -> 6.0.18

fixes VSV00019
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 332ca241d14a..3c0adb9d335e 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -154,8 +154,8 @@ in
 {
   # EOL (LTS) TBA
   varnish60 = common {
-    version = "6.0.17";
-    hash = "sha256-CVmHd1hCDFE/WIZqjc1TfX1O2RqFetdNSO4ihmXoL5k=";
+    version = "6.0.18";
+    hash = "sha256-AULWbT0Mz/12TOcsa6vkiJGmwNIb+lxKJMyyvqo1x/A=";
   };
   # EOL 2026-09-15
   varnish80 = common {

From 53f2c35ac8ced69f509d914b3e22012de9f72920 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Tue, 19 May 2026 22:14:03 +0200
Subject: [PATCH 14/85] varnish: 8.0.1 -> 8.0.2

fixes VSV00019
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 3c0adb9d335e..14b9ccde0eb6 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -159,7 +159,7 @@ in
   };
   # EOL 2026-09-15
   varnish80 = common {
-    version = "8.0.1";
-    hash = "sha256-n1oi1YrNvqw3GhY9683TYSG+XuS8hKoYfrfNDDGP5oI=";
+    version = "8.0.2";
+    hash = "sha256-yGCDuFBGPBiJmCmQncAs5miLKfyoCym6+PbixW6tMI8=";
   };
 }

From cf3ed0174a869838470cac291a63fe6973e6021c Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 20 May 2026 10:30:12 +0200
Subject: [PATCH 15/85] ty: 0.0.37 -> 0.0.38

Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.38
Diff: https://github.com/astral-sh/ty/compare/0.0.37...0.0.38

Automation notice:
I used https://github.com/Mic92/nix-update (nix-update ty --version
0.0.38) to edit the version number and fetch hashes more quickly.
---
 pkgs/by-name/ty/ty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 5dfd15558983..0dde0db10465 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -17,7 +17,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.37";
+  version = "0.0.38";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-JzoZqZO2kACb8O3KuKsG650oYo6f+wG/PGa8zubaGxE=";
+    hash = "sha256-70Y5i9m2h2+Jc44jLOf+gXX/PeDbURRJ80y+6h5SlRk=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-3y7kqhAUXZ+Ui6quGEDSRXrh3ii9NJLoFWnGX/Mp0l4=";
+  cargoHash = "sha256-+c2JfB55w9otmmgTFIDMwkpASJV7bIMEf0uqRXjk/QM=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];

From 6dfb871fdcb1e4f39bb913876cf5e2ea1b1673fe Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Tue, 19 May 2026 21:51:23 +0200
Subject: [PATCH 16/85] varnish,nixos/varnish: expose stateDir from package to
 module

Unfortunately, Vinyl Cache has decided to change the default state dir
in a patch release. As this is a compile-time constant, we
- now explicitly provide a well-chosen stateDir in the package
- basically keep the stateDir as is, beacuse /var/run/ is a symlink to
  /run
- expose it via passthru to the module that picks up the particular
  stateDir of the package used

Note: The patch file has been created from git, but then manually
altered Makefile.am -> Makefile.in to account for the preprocessing of
the release tarball.
---
 .../web-servers/vinyl-cache/default.nix       | 17 ++++++------
 ...kefile-do-not-create-VINYL_STATE_DIR.patch | 26 +++++++++++++++++++
 pkgs/servers/vinyl-cache/default.nix          | 21 ++++++++++++++-
 3 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/servers/vinyl-cache/0001-Makefile-do-not-create-VINYL_STATE_DIR.patch

diff --git a/nixos/modules/services/web-servers/vinyl-cache/default.nix b/nixos/modules/services/web-servers/vinyl-cache/default.nix
index 5efc681247e2..f77b5e4aafd7 100644
--- a/nixos/modules/services/web-servers/vinyl-cache/default.nix
+++ b/nixos/modules/services/web-servers/vinyl-cache/default.nix
@@ -18,12 +18,9 @@ let
   cfg = config.services.vinyl-cache;
 
   # Vinyl Cache has very strong opinions and very complicated code around handling
-  # the stateDir. After a lot of back and forth, we decided that we a)
-  # do not want a configurable option here, as most of the handling depends
-  # on the version and the compile time options. Putting everything into
-  # /var/run (RAM backed) is absolutely recommended by Vinyl Cache anyways.
-  # We do need to pay attention to the version-dependend variations, though!
-  stateDir = "/var/run/vinyld";
+  # the stateDir. After a lot of back and forth, we decided to set the stateDir
+  # at compile time and let the package expose the particular path as passthru.
+  stateDir = cfg.package.stateDir;
 
   # from --help:
   #   -a [<name>=]address[:port][,proto] # HTTP listen address and port
@@ -183,13 +180,13 @@ in
         after = [ "network.target" ];
         serviceConfig = {
           Type = "simple";
-          ExecStart = "${cfg.package}/bin/vinyld ${commandLineAddresses} -n ${stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
+          ExecStart = "${cfg.package}/bin/vinyld ${commandLineAddresses} -F ${cfg.extraCommandLine} ${commandLine}";
           Restart = "always";
           RestartSec = "5s";
           User = "vinyl-cache";
           Group = "vinyl-cache";
           DynamicUser = true;
-          RuntimeDirectory = lib.removePrefix "/var/run/" stateDir;
+          RuntimeDirectory = lib.removePrefix "/run/" stateDir;
           AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
           NoNewPrivileges = true;
           LimitNOFILE = 131072;
@@ -221,6 +218,10 @@ in
             assertion = cfg.package.pname == "vinyl-cache";
             message = "services.vinyl-cache only supports Vinyl Cache. Please use services.varnish.";
           }
+          {
+            assertion = lib.strings.hasPrefix "/run/" stateDir;
+            message = "The vinyl-cache NixOS mosule only supports statedirs in /run/, but vinyl-cache package was compiled with ${stateDir}.";
+          }
         ];
     })
     (lib.mkIf (cfg.enable && cfg.enableFileLogging) {
diff --git a/pkgs/servers/vinyl-cache/0001-Makefile-do-not-create-VINYL_STATE_DIR.patch b/pkgs/servers/vinyl-cache/0001-Makefile-do-not-create-VINYL_STATE_DIR.patch
new file mode 100644
index 000000000000..60e2ce2de754
--- /dev/null
+++ b/pkgs/servers/vinyl-cache/0001-Makefile-do-not-create-VINYL_STATE_DIR.patch
@@ -0,0 +1,26 @@
+From 51ee9140e547eccfae99c6ee0846b8d1023d463e Mon Sep 17 00:00:00 2001
+From: Oliver Schmidt <os@flyingcircus.io>
+Date: Tue, 19 May 2026 23:31:18 +0200
+Subject: [PATCH] Makefile: do not create VINYL_STATE_DIR
+
+In the nix expression, we continue to hardcode /var/run
+as a statedirectory. But trying to create that  top-level
+directory from within the build sandbox fails (and is
+a wrong move anyways).
+
+An upstream solution would need to be more nuanced though.
+
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -44,7 +44,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS += --with-unwind
+ endif
+ 
+ install-data-local:
+-	$(install_sh) -d -m 0755 "${VINYL_STATE_DIR}"
+ 
+ distclean-local:
+ 	-find . '(' -name '*.gcda' -o -name '*.gcda' ')' -exec rm '{}' ';'
+-- 
+2.51.2
+
diff --git a/pkgs/servers/vinyl-cache/default.nix b/pkgs/servers/vinyl-cache/default.nix
index 529bba0d7e27..32e2099aa3c3 100644
--- a/pkgs/servers/vinyl-cache/default.nix
+++ b/pkgs/servers/vinyl-cache/default.nix
@@ -19,6 +19,21 @@
 }:
 
 let
+  # Vinyl Cache has very strong opinions and very complicated code around handling
+  # the stateDir. After a lot of back and forth, we decided that we
+  # a) do not want a configurable option here, as most of the handling depends
+  # on the version and the compile time options.
+  # b) Vinyl Cache prefers RAM backed stateDirs due to shared memory usage.
+  # /var/run (RAM backed) is a very good fit as long as it is *not* mounted as
+  # `noexec`, which is currently not the case in NixOS but in other distros.
+  # https://code.vinyl-cache.org/vinyl-cache/vinyl-cache/issues/4477
+  # c) need to explicitly specify this at compile-time as upstream even changed
+  # defaults in a patch release.
+  # To handle potential version-dependent differences, the path is exposed to a
+  # module using the package via passthru.
+  stateDirPrefix = "/run";
+  # the actual subdirectory is created by vinyld itself within the prefix at runtime
+  stateDir = "${stateDirPrefix}/vinyld";
   generic =
     {
       version,
@@ -60,10 +75,12 @@ let
         "ac_cv_have_tcp_fastopen=yes"
         "ac_cv_have_tcp_keep=yes"
         "ac_cv_have_working_close_range=yes"
+
         "PYTHON=${buildPackages.python3.interpreter}"
+        "--with-statedir=${stateDirPrefix}"
       ];
 
-      buildFlags = [ "localstatedir=/var/run" ];
+      patches = [ ./0001-Makefile-do-not-create-VINYL_STATE_DIR.patch ];
 
       postPatch = ''
         substituteInPlace bin/vinyltest/vtest2/src/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
@@ -109,6 +126,8 @@ let
       passthru = {
         python = python3;
         tests = nixosTests."vinyl-cache_${lib.versions.major version}";
+        # pass-thru compile-time value for usage in module
+        inherit stateDir;
       };
 
       meta = {

From 83e3af5961c26e2ce3ca42b50b21c512880ed65e Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 20 May 2026 18:44:32 +0700
Subject: [PATCH 17/85] gossip: fix vendored SDL2 build with current toolchain

---
 pkgs/by-name/go/gossip/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index 89f78da40c56..0355a9f15e26 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -37,9 +37,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-rE7SErOhl2fcmvLairq+mvdnbDIk1aPo3eYqwRx5kkA=";
 
+  postPatch = ''
+    substituteInPlace $cargoDepsCopy/source-registry-0/sdl2-sys-0.37.0/SDL/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.0.0...3.5)" \
+      --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.4...3.5)"
+  '';
+
   # See https://github.com/mikedilger/gossip/blob/0.9/README.md.
   env.RUSTFLAGS = "--cfg tokio_unstable";
 
+  # Vendored SDL2 uses `bool` / `false` as identifiers, rejected by gcc 15's C23 default.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   # Some users might want to add "rustls-tls(-native)" for Rust TLS instead of OpenSSL.
   buildFeatures = [
     "video-ffmpeg"

From dad494239c036f2ed1d2e143f47476e25bf0259c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 15:47:52 +0000
Subject: [PATCH 18/85] mycelium: 0.7.7 -> 0.7.8

---
 pkgs/by-name/my/mycelium/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index 2350248cad8a..67bc01462662 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mycelium";
-  version = "0.7.7";
+  version = "0.7.8";
 
   sourceRoot = "${finalAttrs.src.name}/myceliumd";
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "threefoldtech";
     repo = "mycelium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-amw0DkPT7As7L9Zhts+s4g3N67uu/BDZmbJXapr89XQ=";
+    hash = "sha256-1jaSQWsq72Q/T/0TLtoqaOtP+zoJLadKuFgTcz+CGeY=";
   };
 
-  cargoHash = "sha256-Shi7AbyuvWwWOm9RuUYYLS/wEqZ7/YiOo+8m2XDFAnM=";
+  cargoHash = "sha256-Mr6yyCzIk+sdOVKW3pvr/IdeIEEXqCKJ/I7IbonTPww=";
 
   nativeBuildInputs = [ versionCheckHook ];
 

From 474f3b3bf5e89421a49fe5eba0d76ebfb3db525e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 20 May 2026 08:54:26 -0700
Subject: [PATCH 19/85] diebahn: 2.10.0 -> 2.10.1

Diff: https://gitlab.com/schmiddi-on-mobile/railway/-/compare/2.10.0...2.10.1

Changelog: https://gitlab.com/schmiddi-on-mobile/railway/-/blob/2.10.1/CHANGELOG.md
---
 pkgs/by-name/di/diebahn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix
index f5be4e37152e..078018b56cf6 100644
--- a/pkgs/by-name/di/diebahn/package.nix
+++ b/pkgs/by-name/di/diebahn/package.nix
@@ -24,18 +24,18 @@
 
 stdenv.mkDerivation rec {
   pname = "diebahn";
-  version = "2.10.0";
+  version = "2.10.1";
 
   src = fetchFromGitLab {
     owner = "schmiddi-on-mobile";
     repo = "railway";
     tag = version;
-    hash = "sha256-+HqCfuolnwQR/7yTITaQDoYcFQ8m82KA/uT+aubK/UM=";
+    hash = "sha256-lmyseWTqOwMgKB3q+SQbpa4XNzZ+2hBe7Ct7o5oZjOc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-38ON9KZbF8JHbel2zPlyPOCxgDiBxG1psQLtNib6uLM=";
+    hash = "sha256-ADJTkR0Lmr2mmhSvLhqryZYKLFjTHA+pGUbZPEBM7r4=";
   };
 
   nativeBuildInputs = [

From 973a6da2b6d04e6bb6a9b7985b340c4a5e94e442 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Wed, 20 May 2026 20:07:11 +0300
Subject: [PATCH 20/85] feishin: bump electron to 40

---
 pkgs/by-name/fe/feishin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index 24c54ce40f5e..a43d25c3d323 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  electron_39,
+  electron_40,
   dart-sass,
   mpv-unwrapped,
   fetchPnpmDeps,
@@ -25,7 +25,7 @@ let
     hash = "sha256-TSjgjNHhPSZ4k7zZTH5e3FCkl6d7B/2w2WCt0S5OW0g=";
   };
 
-  electron = electron_39;
+  electron = electron_40;
 in
 buildNpmPackage {
   inherit pname version;

From b0938815544a7edf92240466ea3fdbb9da9854af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anna=20Fr=C3=BChling?= <git@annafruehling.de>
Date: Mon, 18 May 2026 13:04:17 +0200
Subject: [PATCH 21/85] cobang: 2.3.1 -> 2.5.2

---
 pkgs/by-name/co/cobang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix
index a359d7546564..a9346115640b 100644
--- a/pkgs/by-name/co/cobang/package.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cobang";
-  version = "2.3.1";
+  version = "2.5.2";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "hongquan";
     repo = "CoBang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8qnF1w4zNYdH3QrzBnNjsPnOSMMD48H2tcTxPkemGEM=";
+    hash = "sha256-q28pSvEqWy56qNh7aE05PB6l3Hpu7eazz52REmQDYhY=";
   };
 
   nativeBuildInputs = [

From 57310f091509de7789e0673927f1c7d9e2e6b75a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 20:18:55 +0000
Subject: [PATCH 22/85] cwal: 0.8.5 -> 0.9.0

---
 pkgs/by-name/cw/cwal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cw/cwal/package.nix b/pkgs/by-name/cw/cwal/package.nix
index 8d34b2c00846..0bf13b9a0e1c 100644
--- a/pkgs/by-name/cw/cwal/package.nix
+++ b/pkgs/by-name/cw/cwal/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cwal";
-  version = "0.8.5";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "nitinbhat972";
     repo = "cwal";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xsfSx0ctDR1uep+SPyfFU/aOvN8l0uGzVPsNL3+4vT8=";
+    hash = "sha256-RDtYBgqTG3Ycn1D6QtaHGZVXKxw8UqhzssxXA4temYo=";
   };
 
   strictDeps = true;

From 949ab1ae4e8646de09e799a0cb7e47b788dfacce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 20:45:06 +0000
Subject: [PATCH 23/85] anytype-cli: 0.3.1 -> 0.3.2

---
 pkgs/by-name/an/anytype-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/anytype-cli/package.nix b/pkgs/by-name/an/anytype-cli/package.nix
index 527f651eca3a..1c7b8b4e8722 100644
--- a/pkgs/by-name/an/anytype-cli/package.nix
+++ b/pkgs/by-name/an/anytype-cli/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "anytype-cli";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "anyproto";

From e4a7e36932eadf0cba01cb0919738544b168fd5e Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 20 May 2026 22:51:35 +0200
Subject: [PATCH 24/85] dehinter: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix
index 21eba3ec6309..221c4e226d12 100644
--- a/pkgs/development/python-modules/dehinter/default.nix
+++ b/pkgs/development/python-modules/dehinter/default.nix
@@ -4,12 +4,13 @@
   fetchFromGitHub,
   fonttools,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "dehinter";
   version = "4.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   # PyPI source tarballs omit tests, fetch from Github instead
   src = fetchFromGitHub {
@@ -19,6 +20,8 @@ buildPythonPackage rec {
     hash = "sha256-l988SW6OWKXzJK0WGAJZR/QDFvgnSir+5TwMMvFcOxg=";
   };
 
+  build-system = [ setuptools ];
+
   propagatedBuildInputs = [ fonttools ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 96239303d06ade0d0cb37064018b3594281dd1d6 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 20 May 2026 22:53:56 +0200
Subject: [PATCH 25/85] dehinter: use finalAttrs

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

diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix
index 221c4e226d12..bb4a8a5a87e3 100644
--- a/pkgs/development/python-modules/dehinter/default.nix
+++ b/pkgs/development/python-modules/dehinter/default.nix
@@ -7,7 +7,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dehinter";
   version = "4.0.0";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "source-foundry";
     repo = "dehinter";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-l988SW6OWKXzJK0WGAJZR/QDFvgnSir+5TwMMvFcOxg=";
   };
 
@@ -33,4 +33,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ danc86 ];
   };
-}
+})

From 26d213c487e93c6b055f75514597d840e27ae083 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 21:11:00 +0000
Subject: [PATCH 26/85] libretro.vba-next: 0-unstable-2026-05-12 ->
 0-unstable-2026-05-14

---
 pkgs/applications/emulators/libretro/cores/vba-next.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/vba-next.nix b/pkgs/applications/emulators/libretro/cores/vba-next.nix
index 2555f5959b39..9bf4af085f2e 100644
--- a/pkgs/applications/emulators/libretro/cores/vba-next.nix
+++ b/pkgs/applications/emulators/libretro/cores/vba-next.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vba-next";
-  version = "0-unstable-2026-05-12";
+  version = "0-unstable-2026-05-14";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vba-next";
-    rev = "f56ea99799b51fb107a4d3afe2a97a1364e8d806";
-    hash = "sha256-gbBurV2N6evLnZqvcxAZ2xfKMsybVeu+Nml0p0APTRE=";
+    rev = "f04b19879d929730d199649c5c40b75b1f15b549";
+    hash = "sha256-Mv+vg0NyX1F7u8cRDpwduD+UZfCHKlcSUmB3bQGjCn8=";
   };
 
   meta = {

From f8f070025465d29de268eec8b771d8b61f881ac0 Mon Sep 17 00:00:00 2001
From: Eli Saado <eli5saado@gmail.com>
Date: Thu, 21 May 2026 00:35:20 +0200
Subject: [PATCH 27/85] pdns: 5.0.4 -> 5.0.5

---
 pkgs/by-name/pd/pdns/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix
index b48d4b388bfa..72145c0f82c4 100644
--- a/pkgs/by-name/pd/pdns/package.nix
+++ b/pkgs/by-name/pd/pdns/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns";
-  version = "5.0.4";
+  version = "5.0.5";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-NultkpmZ78iLy3NPlNxF+OKS0QQM7QiR5mS9Co7fnQ4=";
+    hash = "sha256-wUT+sjz8LNR+vzNRMq6gr6tgWttP9PMJVb40RQNODe8=";
   };
   # redact configure flags from version output to reduce closure size
   patches = [ ./version.patch ];

From dc4c2b46b912044a41fff7a60076a49ca1f90153 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 23:26:54 +0000
Subject: [PATCH 28/85] snx-rs: 6.0.5 -> 6.0.6

---
 pkgs/by-name/sn/snx-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index fd0885aaac58..e30221e21c43 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -15,13 +15,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "snx-rs";
-  version = "6.0.5";
+  version = "6.0.6";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ueuIOAw+dhw9Mt3xIlzlUmQuir9FogOtboEgsATNwmQ=";
+    hash = "sha256-B0hMWoN+Pt/UM9HSfpYgV70hLpaj8YeR+MKs+YWUQFQ=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-dCi6ctdjM63Uhny2ppo/ymVAF9KeeRNitZWDQKEFLiw=";
+  cargoHash = "sha256-7SPeVuNXFLH6mT2TBMlOrrzxtoPkeDL5h4FSHzkrMxg=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";

From 31e0d58ad877a6aa5f11f21b8d70c5d503a5c11a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 23:36:48 +0000
Subject: [PATCH 29/85] libretro.swanstation: 0-unstable-2026-05-11 ->
 0-unstable-2026-05-20

---
 pkgs/applications/emulators/libretro/cores/swanstation.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix
index 9c3b64a9fb6b..4c46caf841d1 100644
--- a/pkgs/applications/emulators/libretro/cores/swanstation.nix
+++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2026-05-11";
+  version = "0-unstable-2026-05-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "0f7757b3196ab472c3a8b279206b3ea19a3e5f2d";
-    hash = "sha256-5R+K0NpLdjajT6LV0os569vrgqRCtfXDqMnhM8z7dmk=";
+    rev = "62697276b95848bd35b9c7b81daab899a98e0789";
+    hash = "sha256-jisW5Mk5PF3rxj9mF5FJXtktAKEAq2a6DUvCXBgri3E=";
   };
 
   extraNativeBuildInputs = [ cmake ];

From d6c593d1975948a69c064b14119b2afe50a41d97 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 21 May 2026 02:39:43 +0300
Subject: [PATCH 30/85] gtk-gnutella: rename from gtkgnutella

Aligns better with repology project:

https://repology.org/project/gtk-gnutella/versions
---
 pkgs/by-name/gt/{gtkgnutella => gtk-gnutella}/package.nix | 0
 pkgs/top-level/aliases.nix                                | 1 +
 2 files changed, 1 insertion(+)
 rename pkgs/by-name/gt/{gtkgnutella => gtk-gnutella}/package.nix (100%)

diff --git a/pkgs/by-name/gt/gtkgnutella/package.nix b/pkgs/by-name/gt/gtk-gnutella/package.nix
similarity index 100%
rename from pkgs/by-name/gt/gtkgnutella/package.nix
rename to pkgs/by-name/gt/gtk-gnutella/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 51bb2987a152..8c66d19b1f61 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -923,6 +923,7 @@ mapAliases {
   gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06
   gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
+  gtkgnutella = gtk-gnutella; # Added 2026-05-21
   gtuber = throw "'gtuber' has been removed due to being discontinued by upstream."; # Added 2025-12-12
   guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27
   guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25

From b4c1dd6187d1fde09b6263f24499fcf33c9c8990 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 00:05:02 +0000
Subject: [PATCH 31/85] cog: 0.1.12 -> 0.1.13

---
 pkgs/by-name/co/cog/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix
index c1e921859831..9da532e6d414 100644
--- a/pkgs/by-name/co/cog/package.nix
+++ b/pkgs/by-name/co/cog/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cog";
-  version = "0.1.12";
+  version = "0.1.13";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "cog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6W8b3hgBASpizFoQqP0zw3TqdPmhJ6gZFXxaPfnIiS0=";
+    hash = "sha256-e8PxH09d3n4nDhJzJ/y4KwTZ5UhKgwNupy31Z9VGi7A=";
   };
 
-  vendorHash = "sha256-WR/dfwNBduRokPGAljnXNgA2ZKoYRGtZ3+tKBzCuXI4=";
+  vendorHash = "sha256-0ywSn4JghAfg9KZptpLYp+h1hZju2SmLeOXG5DKPa98=";
 
   subPackages = [ "cmd/cli" ];
 

From 68a07022a6b3bf4590555bcf1bbf9d95e6360d9d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 21 May 2026 02:53:07 +0300
Subject: [PATCH 32/85] gtk-gnutella: fix build with gcc 15

---
 pkgs/by-name/gt/gtk-gnutella/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/gt/gtk-gnutella/package.nix b/pkgs/by-name/gt/gtk-gnutella/package.nix
index eb22ca254827..c5a0f2a989b6 100644
--- a/pkgs/by-name/gt/gtk-gnutella/package.nix
+++ b/pkgs/by-name/gt/gtk-gnutella/package.nix
@@ -53,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
     "--topless"
   ];
 
+  # Classic 'incompatible pointer type'
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   enableParallelBuilding = true;
 
   postInstall = ''

From 777ffa2be349b418a4fd237ac88fde89118861ef Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 21 May 2026 03:03:38 +0300
Subject: [PATCH 33/85] gtk-gnutella: remove old malloc configure flag

Could have been removed when updating to 1.2.2.
---
 pkgs/by-name/gt/gtk-gnutella/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-gnutella/package.nix b/pkgs/by-name/gt/gtk-gnutella/package.nix
index c5a0f2a989b6..08127075b409 100644
--- a/pkgs/by-name/gt/gtk-gnutella/package.nix
+++ b/pkgs/by-name/gt/gtk-gnutella/package.nix
@@ -46,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
   configureScript = "./build.sh";
   configureFlags = [
     "--configure-only"
-    # See https://sourceforge.net/p/gtk-gnutella/bugs/555/
-    "--disable-malloc"
   ]
   ++ lib.optionals (!enableGui) [
     "--topless"

From 74de4a3ccbed94d7a3f6c0815f935c1a1b2fad73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 00:09:53 +0000
Subject: [PATCH 34/85] libretro.gambatte: 0-unstable-2026-05-12 ->
 0-unstable-2026-05-15

---
 pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index 4a5ecce39e96..44b4caaa8c30 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-05-12";
+  version = "0-unstable-2026-05-15";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "4c1b4c26c8db94663196bad187b58fe8e9162b4f";
-    hash = "sha256-uJoHwHJ2KtNk83eEDdWPPxAViMCp8bVq06wsBxQZEPw=";
+    rev = "3262c2aa4adae8dba4f6d51cdd931c15cb11569f";
+    hash = "sha256-JPnpY/43XbT9QnvzrYPkZLCcM3hN+SoQTFZ8J/Dj+Oc=";
   };
 
   meta = {

From 3d8d6b63b46f4c3bdbe7b87e91d63cc1e99d3f26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 00:35:50 +0000
Subject: [PATCH 35/85] cloudflare-dynamic-dns: 4.4.4 -> 4.4.5

---
 pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
index 6b0aae87efd7..661c184be155 100644
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cloudflare-dynamic-dns";
-  version = "4.4.4";
+  version = "4.4.5";
 
   src = fetchFromGitHub {
     owner = "zebradil";
     repo = "cloudflare-dynamic-dns";
     tag = finalAttrs.version;
-    hash = "sha256-VBBuBZ5J5ioLDzlslNahSwVGJ7RFJLmWs4WWs11SQaI=";
+    hash = "sha256-TIun4EZuk4lgtNiNRA8P0x3+hkh3UFMVMUa75YecUk0=";
   };
 
-  vendorHash = "sha256-UPzv8W18vdeTL/Rx32z5rJVcWHjFlImUKlUb9gt3TTM=";
+  vendorHash = "sha256-Pu73TKBgEgLhUktnY4o/fR4KBLT2s2CUGFSf2Jo3SbQ=";
 
   subPackages = ".";
 

From 42a1f85bd37782c985656fd474155433b0b2e8fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 01:46:21 +0000
Subject: [PATCH 36/85] libretro.dosbox-pure: 0-unstable-2026-05-12 ->
 0-unstable-2026-05-21

---
 pkgs/applications/emulators/libretro/cores/dosbox-pure.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index 7064951fc79d..ab59f3357252 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2026-05-12";
+  version = "0-unstable-2026-05-21";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "3a5222c97456e8df90983eb546f4d866b0feb848";
-    hash = "sha256-FeT1VPOJsZaC9SZbJwbiC0fkVV/WOJ+rOcwf8g+wdeM=";
+    rev = "9c5c68f446204b09b12f3f1936072e56d91476c0";
+    hash = "sha256-p2vv9EExJYgR59ycjxc79+itVDf3/4pWKVn671lNjVo=";
   };
 
   hardeningDisable = [ "format" ];

From 7ab5bf6ba1ff3035612929563697c459832df953 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Tue, 24 Mar 2026 09:15:19 +0300
Subject: [PATCH 37/85] turso: 0.4.0 -> 0.6.0

Co-authored-by: GaetanLepage <gaetan@glepage.com>
---
 pkgs/by-name/tu/turso/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tu/turso/package.nix b/pkgs/by-name/tu/turso/package.nix
index 2b5e45919ee8..662eeb806365 100644
--- a/pkgs/by-name/tu/turso/package.nix
+++ b/pkgs/by-name/tu/turso/package.nix
@@ -7,33 +7,35 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "turso";
-  version = "0.4.0";
+  version = "0.6.0";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-94ow9LUouifdE3ml2iyo72Y0nQSSLfnU5qnNHiJHqKw=";
+    hash = "sha256-uOrvQZ16TlgRFt7kiKIPMT84S07PArVdw6OWzDt7rD8=";
   };
 
-  cargoHash = "sha256-c6PIrbRclU/l7wuhOIANBgCnRu2Y/UoUeZA/eg13KoA=";
+  cargoHash = "sha256-Go+KAU4xz4DO585afx7tKpyWY/Glz6ZAETd0p3uOGiE=";
 
   cargoBuildFlags = [
-    "-p"
-    "turso_cli"
+    "--bin"
+    "tursodb"
   ];
+
   cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-
   doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; };
 
   meta = {
     description = "Interactive SQL shell for Turso";
     homepage = "https://github.com/tursodatabase/turso";
-    changelog = "https://github.com/tursodatabase/turso/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/tursodatabase/turso/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "tursodb";

From 620d3d95fbfd48f8c567387fac3b0ca790de9069 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 05:27:42 +0000
Subject: [PATCH 38/85] ledger-live-desktop: 4.2.2 -> 4.4.0

---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index e1c0b7755445..701c4fb7dc0a 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "4.2.2";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-pDSLP+YN13iRLeQ3RWYZ8AwU1VqzbVw+oazPp4NdXNU=";
+    hash = "sha256-diyjhQCA+rF9E8QdTbwJqUKE0N6wdlcN9Oamr81LsOc=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 6af026c2bc70a8841ccb9429de8dd6ce1507b421 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 21 May 2026 07:29:41 +0200
Subject: [PATCH 39/85] nixos/mastodon: fix tootctl runtime path

---
 nixos/modules/services/web-apps/mastodon.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index 8021abb42ede..88a3ff0faf6b 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -145,9 +145,11 @@ let
     pkgs.writeShellScriptBin "mastodon-tootctl" ''
       set -a
       export RAILS_ROOT="${cfg.package}"
+      export HOME="/var/lib/mastodon"
       source "${envFile}"
       source /var/lib/mastodon/.secrets_env
       ${sourceExtraEnv}
+      cd /var/lib/mastodon
 
       sudo=exec
       if [[ "$USER" != ${cfg.user} ]]; then

From 44e15166e02c274c46a34424e85e23d60f724bfa Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 20 May 2026 23:34:07 -0400
Subject: [PATCH 40/85] nixos/system-environment: Export PATH to systemd
 transient environment

Since e73170e38a27be96071b8da0f18c0e2b150dc627, we no longer patch
systemd to prevent it resetting `PATH` for generators. Generators that
depended on this deviating behavior will no longer work, which
ironically includes the upstream `systemd-xdg-autostart-generator`.

Previously, generators would see systemd's actual environment, which
included environment variables set for the PAM session like `PATH`. To
preserve the old behavior *exactly*, we'd really want to be
replicating exactly what the `systemd-user` PAM service sets up, which
could technically include things other than just what we put in
`/etc/pam/environment`. But this is arguably a systemd bug (either
because `systemd-xdg-autostart-generator` shouldn't use the
generator's `PATH`, or because systemd should pass along the `PATH` it
got from PAM), so for now, we can keep it simple and fix it by
replicating what `/etc/pam/environment` does in `/etc/environment.d`.
---
 nixos/modules/config/system-environment.nix | 41 +++++++++++----------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index aaf5e521350f..96cd67d93d40 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -11,6 +11,23 @@ let
 
   cfg = config.environment;
 
+  suffixedVariables = lib.flip lib.mapAttrs cfg.profileRelativeSessionVariables (
+    envVar: suffixes:
+    lib.flip lib.concatMap cfg.profiles (profile: map (suffix: "${profile}${suffix}") suffixes)
+  );
+
+  combinedSessionVars = lib.zipAttrsWith (n: lib.concatLists) [
+    # Make sure security wrappers are prioritized without polluting
+    # shell environments with an extra entry. Sessions which depend on
+    # pam for its environment will otherwise have eg. broken sudo. In
+    # particular Gnome Shell sometimes fails to source a proper
+    # environment from a shell.
+    { PATH = [ config.security.wrapperDir ]; }
+
+    (lib.mapAttrs (n: lib.toList) cfg.sessionVariables)
+    suffixedVariables
+  ];
+
 in
 
 {
@@ -73,13 +90,11 @@ in
   };
 
   config = {
+    environment.etc."environment.d/50-systemd-path.conf".text = ''
+      PATH="${lib.concatStringsSep ":" combinedSessionVars.PATH}"
+    '';
     environment.etc."pam/environment".text =
       let
-        suffixedVariables = lib.flip lib.mapAttrs cfg.profileRelativeSessionVariables (
-          envVar: suffixes:
-          lib.flip lib.concatMap cfg.profiles (profile: map (suffix: "${profile}${suffix}") suffixes)
-        );
-
         # We're trying to use the same syntax for PAM variables and env variables.
         # That means we need to map the env variables that people might use to their
         # equivalent PAM variable.
@@ -88,21 +103,7 @@ in
         pamVariable =
           n: v: ''${n}   DEFAULT="${lib.concatStringsSep ":" (map replaceEnvVars (lib.toList v))}"'';
 
-        pamVariables = lib.concatStringsSep "\n" (
-          lib.mapAttrsToList pamVariable (
-            lib.zipAttrsWith (n: lib.concatLists) [
-              # Make sure security wrappers are prioritized without polluting
-              # shell environments with an extra entry. Sessions which depend on
-              # pam for its environment will otherwise have eg. broken sudo. In
-              # particular Gnome Shell sometimes fails to source a proper
-              # environment from a shell.
-              { PATH = [ config.security.wrapperDir ]; }
-
-              (lib.mapAttrs (n: lib.toList) cfg.sessionVariables)
-              suffixedVariables
-            ]
-          )
-        );
+        pamVariables = lib.concatStringsSep "\n" (lib.mapAttrsToList pamVariable combinedSessionVars);
       in
       ''
         ${pamVariables}

From b6c4779d26cb1edfeabe798307352e1a157b4b64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 06:42:51 +0000
Subject: [PATCH 41/85] clojure: 1.12.5.1638 -> 1.12.5.1645

---
 pkgs/by-name/cl/clojure/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clojure/package.nix b/pkgs/by-name/cl/clojure/package.nix
index 2cbafb4bc8c8..00e5f949bbf1 100644
--- a/pkgs/by-name/cl/clojure/package.nix
+++ b/pkgs/by-name/cl/clojure/package.nix
@@ -13,12 +13,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "clojure";
-  version = "1.12.5.1638";
+  version = "1.12.5.1645";
 
   src = fetchurl {
     # https://github.com/clojure/brew-install/releases
     url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
-    hash = "sha256-eAfhA0RByuQ8IdigJsHYotIPY/kDmLgDRHCw4uHzF5E=";
+    hash = "sha256-SoYS5/1yXsjkU/hwsi1bwaaO7/d0w9eTKamF81HAuDs=";
   };
 
   nativeBuildInputs = [

From 30cc15537724eada47c9dad28e27487247646051 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 20 May 2026 23:42:19 -0700
Subject: [PATCH 42/85] debase: fix darwin build

Hydra: https://hydra.nixos.org/build/328831410
ZHF: https://github.com/NixOS/nixpkgs/issues/516381

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/de/debase/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
index a4c62745cb7d..5afb703d27a7 100644
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     # fix build with gcc15
     substituteInPlace lib/Makefile \
       --replace-fail './configure' './configure cf_cv_type_of_bool=bool'
+
+    sed -i '1s/^/#include <stdbool.h>/' ./lib/ncurses/include/curses.h.in
   '';
 
   patches = [

From f4d58b57ded3f0c6acab9a5f5364fb5386afe0c0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 21 May 2026 03:16:15 +0300
Subject: [PATCH 43/85] gtk-gnutella: enable strictDeps && structured attrs

Mainly for nixpkgs-vet in #522424, but is also justified anyway.
---
 pkgs/by-name/gt/gtk-gnutella/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/gt/gtk-gnutella/package.nix b/pkgs/by-name/gt/gtk-gnutella/package.nix
index 08127075b409..82934d9cd2a3 100644
--- a/pkgs/by-name/gt/gtk-gnutella/package.nix
+++ b/pkgs/by-name/gt/gtk-gnutella/package.nix
@@ -18,6 +18,8 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk-gnutella";
   version = "1.2.2";
+  strictDeps = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "gtk-gnutella";

From c3a760170570cf6d6e094adf687b672bcfcb1f4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 07:09:48 +0000
Subject: [PATCH 44/85] typescript-go: 0-unstable-2026-05-12 ->
 0-unstable-2026-05-20

---
 pkgs/by-name/ty/typescript-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 6f4824a37932..5af243059b90 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -15,13 +15,13 @@ let
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2026-05-12";
+  version = "0-unstable-2026-05-20";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "01cc06960f62a508d26232175e0fcfd16846ed4f";
-    hash = "sha256-0xga15jY472BrOJmuWBaGoqThwhG8Bh4CoV+6Zm7ubk=";
+    rev = "2cf002eed790973677ee285b54bd1687ac2c76cb";
+    hash = "sha256-ViKlU1J8VLjoxQlPpjpijVN4XR63IhZ5o+sO4nt2ZgQ=";
     fetchSubmodules = false;
   };
 

From 5af886c57ff68ed8dfeae45802db40e355e128e3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 21 May 2026 10:09:58 +0300
Subject: [PATCH 45/85] gtk-gnutella: use modern src arguments - tag & hash

---
 pkgs/by-name/gt/gtk-gnutella/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-gnutella/package.nix b/pkgs/by-name/gt/gtk-gnutella/package.nix
index 82934d9cd2a3..3755b8d61c48 100644
--- a/pkgs/by-name/gt/gtk-gnutella/package.nix
+++ b/pkgs/by-name/gt/gtk-gnutella/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gtk-gnutella";
     repo = "gtk-gnutella";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-LbSUdU+a9G8qL7gCZVJQ6UQMATpOMtktY6FeOkUuaYI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LbSUdU+a9G8qL7gCZVJQ6UQMATpOMtktY6FeOkUuaYI=";
   };
 
   nativeBuildInputs = [

From 188fe4bc87d6fe5ba1854ec6d5bb2c06ab41b98f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 21 May 2026 10:11:12 +0300
Subject: [PATCH 46/85] gtk-gnutella: 1.2.2 -> 1.3.1

Diff: https://github.com/gtk-gnutella/gtk-gnutella/compare/v1.2.2...v1.3.1

Changelog: https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v1.3.1/ChangeLog
---
 pkgs/by-name/gt/gtk-gnutella/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-gnutella/package.nix b/pkgs/by-name/gt/gtk-gnutella/package.nix
index 3755b8d61c48..c067a96fcbc1 100644
--- a/pkgs/by-name/gt/gtk-gnutella/package.nix
+++ b/pkgs/by-name/gt/gtk-gnutella/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk-gnutella";
-  version = "1.2.2";
+  version = "1.3.1";
   strictDeps = true;
   __structuredAttrs = true;
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gtk-gnutella";
     repo = "gtk-gnutella";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LbSUdU+a9G8qL7gCZVJQ6UQMATpOMtktY6FeOkUuaYI=";
+    hash = "sha256-xVVmPcXIc5RN1j9PYqHaqllKp+8UQ8S2LU0z23QngFs=";
   };
 
   nativeBuildInputs = [

From 6dc13b3e1314cacdb32e38e784e10344b0b60c4c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 09:25:29 +0200
Subject: [PATCH 47/85] python3Packages.iamdata: 0.1.202605201 -> 0.1.202605211

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202605201...v0.1.202605211

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202605211
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 5d9d3de43e8e..f1955041f57f 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202605201";
+  version = "0.1.202605211";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nUFxppxpk8T5QIWAF6eJL3Y6UE+p3QwBbZEtZWVt+wE=";
+    hash = "sha256-539pWIwXaYOWsXViIxeruU4ZK146jOl0XCf6VohWlyY=";
   };
 
   __darwinAllowLocalNetworking = true;

From 4c1102e499dce83c3fc046d888d2268b6711de42 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 09:27:19 +0200
Subject: [PATCH 48/85] python3Packages.tencentcloud-sdk-python: 3.1.99 ->
 3.1.101

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.99...3.1.101

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.101/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index f6c71a616094..366168b8d618 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.99";
+  version = "3.1.101";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-09CpBVLxz5BjbxgrLoAamK+9lHMWyZFE+bptEmT0CeQ=";
+    hash = "sha256-dvtbn+IoedKulTCM+bEzeYgIxs9Abd+1qtoFVZBvucQ=";
   };
 
   build-system = [ setuptools ];

From 86ada36e02c35a9d47efc886682bc1bd10bed163 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 20 May 2026 01:42:19 +0000
Subject: [PATCH 49/85] build-support/vm: fix unpopulated `debsGrouped` after
 structuredAttrs refactor

debsGrouped was a nested array, like `[ [ drv1 drv2 ] [ drv3 ] ... ]`.
that doesn't map to any bash item, so it would live only in the json attrs.

the `for component in "${debsGrouped[@]}"; ...` part of buildCommand
was thus referring to an unset variable... but the default bash behavior
is to treat that as an empty array even with `set -u` so the loop was
just doing nothing.

instead, flatten the array on the nix side. bash gets something like
`("drv1 drv2" "drv3" ...)` and the existing shell code destructures
that as expected.

verify by building a vm (e.g.
`tests.vmTools.buildPatchelfInDebian.diskImage`) and checking the
nix-log before and after for `INSTALLING COMPONENT` messages.

Co-Authored-By: Stefan Frijters <sfrijters@gmail.com>
---
 pkgs/build-support/vm/default.nix |  2 +-
 pkgs/build-support/vm/test.nix    | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 53cfe9317e28..6be7d9ebb3f4 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -731,7 +731,7 @@ let
             ;
 
           debsFlat = lib.flatten debs;
-          debsGrouped = debs;
+          debsGrouped = map toString debs;
 
           preVM = createEmptyImage { inherit size fullName; };
 
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index 3a7adcbd216e..ec27d06cd7b9 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -2,12 +2,12 @@
   hello,
   patchelf,
   pcmanfm,
+  runCommand,
   stdenv,
   vmTools,
 }:
 let
   inherit (vmTools)
-    buildRPM
     diskImages
     makeImageTestScript
     runInLinuxImage
@@ -46,6 +46,23 @@ in
     })
   );
 
+  # Sanity check to ensure the dpkg --install commands have run
+  checkPerlInstalledInDebian = runInLinuxImage (
+    runCommand "check-perl"
+      {
+        diskImage = diskImages.debian13x86_64;
+        diskImageFormat = "qcow2";
+        memSize = 512;
+      }
+      ''
+        echo Check if perl is present
+        perl -v
+        echo Check if perl is installed
+        dpkg -l | grep 'ii *perl'
+        mkdir $out
+      ''
+  );
+
   # RPM-based distros
   testFedora42Image = makeImageTestScript diskImages.fedora42x86_64;
   testFedora43Image = makeImageTestScript diskImages.fedora43x86_64;

From be0048ac98f0c6eb1ef728c3046798c1deb29e0a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 09:32:09 +0200
Subject: [PATCH 50/85] python3Packages.aioghost: 0.4.14 -> 0.4.16

Diff: https://github.com/TryGhost/aioghost/compare/v0.4.14...v0.4.16

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

diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix
index 39ade383a92e..4aff5398247a 100644
--- a/pkgs/development/python-modules/aioghost/default.nix
+++ b/pkgs/development/python-modules/aioghost/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aioghost";
-  version = "0.4.14";
+  version = "0.4.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TryGhost";
     repo = "aioghost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HZYBBJWP9XscXADtBvovybRh01fhyFGnjHJ5vweo9OA=";
+    hash = "sha256-ZyRPXtQVOEyKHiX1utIukoayHtCNB/gm8i/gUIEYhtg=";
   };
 
   build-system = [ hatchling ];

From a1b0133fb2556f33de27e05f7508375e93edcd86 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 09:33:46 +0200
Subject: [PATCH 51/85] python3Packages.pyjson5: 2.0.0 -> 2.0.1

Diff: https://github.com/Kijewski/pyjson5/compare/v2.0.0...v2.0.1

Changelog: https://github.com/Kijewski/pyjson5/blob/v2.0.1/CHANGELOG.md
---
 pkgs/development/python-modules/pyjson5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix
index 9366b0c5ff66..bfe65a44282c 100644
--- a/pkgs/development/python-modules/pyjson5/default.nix
+++ b/pkgs/development/python-modules/pyjson5/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyjson5";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kijewski";
     repo = "pyjson5";
     tag = "v${version}";
-    hash = "sha256-vHO354ZjaQirOWavfaDvenE+MLQLhWF3bCHa5Z1NNXg=";
+    hash = "sha256-SonObL4watru9+YDiw4K7Mo5BOKWmhp1R/IZ54H9Db0=";
     fetchSubmodules = true;
   };
 

From 40914650d0edfdc3710de6285eaa177d151bb4c3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Jan 2026 09:18:18 +0100
Subject: [PATCH 52/85] python313Packages.rouge-score: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/rouge-score/default.nix b/pkgs/development/python-modules/rouge-score/default.nix
index a3628b7ec737..a9b0e4605df9 100644
--- a/pkgs/development/python-modules/rouge-score/default.nix
+++ b/pkgs/development/python-modules/rouge-score/default.nix
@@ -19,14 +19,14 @@ let
     hash = "sha256-ojqk6U2caS7Xz4iGUC9aQVHrKb2QNvMlPuQAL/jJat0=";
   };
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "rouge-score";
   version = "0.1.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "rouge_score";
-    inherit version;
+    inherit (finalAttrs) version;
     extension = "tar.gz";
     hash = "sha256-x9TaJoPmjJq/ATXvkV1jpGZDZm+EjlWKG59+rRf/DwQ=";
   };
@@ -65,4 +65,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ nviets ];
   };
-}
+})

From c7a9590e18628db6761d1e840f95da23d3aaa1f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 09:35:40 +0200
Subject: [PATCH 53/85] python3Packages.smolagents: 1.24.0 -> 1.25.0

Diff: https://github.com/huggingface/smolagents/compare/v1.24.0...v1.25.0

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

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 8eed65804fcb..5c04bb323a27 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -54,14 +54,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "smolagents";
-  version = "1.24.0";
+  version = "1.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "smolagents";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I+I7XVnYGKuATP4MIN99vx6qvDhIwcn2x25GhDIg0u0=";
+    hash = "sha256-ywjhPqK9Qc0eDN4LvY70o0EhB3FeRwJ5taGURtXUvlY=";
   };
 
   build-system = [ setuptools ];

From 8a02e5b9447eb524b60bb920baaf02790d5c90e3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 21 May 2026 10:37:23 +0300
Subject: [PATCH 54/85] netbird: 0.71.2 -> 0.71.3

Diff: https://github.com/netbirdio/netbird/compare/v0.71.2...v0.71.3

Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.71.3
---
 pkgs/by-name/ne/netbird/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 6d7a36dee66e..2da49dfeb29d 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -67,13 +67,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.71.2";
+  version = "0.71.3";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rmm9NdWNjcEmUp84lad709EoVCZz19/5/N5ssflWzt4=";
+    hash = "sha256-1doOf/rgGbD/YtMY0+j1VM7933zR+G+Vyq6bF5fyuMg=";
   };
 
   vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";

From dbd54065ba3a83112343735377f96f328d60f7f9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 09:37:42 +0200
Subject: [PATCH 55/85] python3Packages.dtfabric: 20260411 -> 20260506

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

diff --git a/pkgs/development/python-modules/dtfabric/default.nix b/pkgs/development/python-modules/dtfabric/default.nix
index e66403b6ca36..0f36bf418936 100644
--- a/pkgs/development/python-modules/dtfabric/default.nix
+++ b/pkgs/development/python-modules/dtfabric/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dtfabric";
-  version = "20260411";
+  version = "20260506";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-0hnJJ76wpINsNXecrGCQILqixo4xUhH8dW6djq9/vH4=";
+    hash = "sha256-n/z2OD3vZrEKoYC3eRVIx6XpgKwTbTaKqp2O2cg11fs=";
   };
 
   pythonRemoveDeps = [ "pip" ];

From 93d31acbf1cebb6aa9dd8d6702e0443dbe8b765d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 07:38:22 +0000
Subject: [PATCH 56/85] olivetin-3k: 3000.11.3 -> 3000.12.0

---
 pkgs/by-name/ol/olivetin/3k.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/3k.nix b/pkgs/by-name/ol/olivetin/3k.nix
index fe8023a74651..d5a1112efc96 100644
--- a/pkgs/by-name/ol/olivetin/3k.nix
+++ b/pkgs/by-name/ol/olivetin/3k.nix
@@ -16,18 +16,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "olivetin";
-  version = "3000.11.3";
+  version = "3000.12.0";
 
   src = fetchFromGitHub {
     owner = "OliveTin";
     repo = "OliveTin";
     tag = finalAttrs.version;
-    hash = "sha256-GSCqtekFj0c2TPSygRiUAfSMQAyPbfuR0dxAGQ/Rghw=";
+    hash = "sha256-xMtvxsDWt9Dpf01rzMxivAL76TVdl1QKs6sz03XeP70=";
   };
 
   modRoot = "service";
 
-  vendorHash = "sha256-iH9tgw4KSER/xIPOIontSQLWrI4ORayRjyHsT1HU0m8=";
+  vendorHash = "sha256-8oWvOeRgmbknd3iOMngAK914ut+230cr7pkw6hF/9Hc=";
 
   subPackages = [ "." ];
 
@@ -82,7 +82,7 @@ buildGoModule (finalAttrs: {
     pname = "olivetin-webui";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-vrvwy96wtXxt0JJDs8YG0Lm3kpVRoJ2Qmu8nlggH6qc=";
+    npmDepsHash = "sha256-Z9ovQRqKFWqp52xDUHvrWMHO9qDWJf9CqoXwlcfnnTU=";
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
 

From 7f6a6b5d417d6be26d7c36a02d0131f076fb025b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 07:46:49 +0000
Subject: [PATCH 57/85] betterleaks: 1.2.0 -> 1.3.0

---
 pkgs/by-name/be/betterleaks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix
index c20bf79d509b..ebac59bb6908 100644
--- a/pkgs/by-name/be/betterleaks/package.nix
+++ b/pkgs/by-name/be/betterleaks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "betterleaks";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "betterleaks";
     repo = "betterleaks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1cP+mOboazalNuGe8LXBVKCSPvrAFBM2HR3keZdY4Bw=";
+    hash = "sha256-65ITYF3PFYuMXsAEEVOXVBlaZnM01w/BpOdCD0LW5Y4=";
   };
 
-  vendorHash = "sha256-bDe3SjKW3zIbDtkkUfk8RGooW9Nir/f5EVOwXCyPiAs=";
+  vendorHash = "sha256-RStdC7M0+bPNXwaATxkMOBGf1OrT0pqlNPTJ7TCelfk=";
 
   ldflags = [
     "-s"

From f3f29b79123c4cf56290e02a5a9736ac6a954617 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 May 2026 02:00:40 +0000
Subject: [PATCH 58/85] python3Packages.pydocket: 0.20.1 -> 0.20.2

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

diff --git a/pkgs/development/python-modules/pydocket/default.nix b/pkgs/development/python-modules/pydocket/default.nix
index 256562709b55..c3055786ee7f 100644
--- a/pkgs/development/python-modules/pydocket/default.nix
+++ b/pkgs/development/python-modules/pydocket/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
 
   # build-system
   hatch-vcs,
@@ -22,24 +21,19 @@
   typer,
   typing-extensions,
   uncalled-for,
-
-  docker,
-  pytest-asyncio,
-  pytest-cov,
-  pytest-timeout,
-  pytest-xdist,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "pydocket";
-  version = "0.20.1";
+  version = "0.20.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "chrisguidry";
     repo = "docket";
     tag = finalAttrs.version;
-    hash = "sha256-QCx1tpiMkyIveay3OwnjcTRb8pTJNcTjOyor59oYHqQ=";
+    hash = "sha256-KEKk9/tewl46GkZ7DV6MixAzz9ZKMIqjwzj5kZ38AFk=";
   };
 
   build-system = [
@@ -74,16 +68,6 @@ buildPythonPackage (finalAttrs: {
 
   # All tests require internet access
   doCheck = false;
-  nativeCheckInputs = [
-    pytestCheckHook
-
-    docker
-    opentelemetry-sdk
-    pytest-asyncio
-    pytest-cov
-    pytest-timeout
-    pytest-xdist
-  ];
 
   meta = {
     description = "Distributed background task system for Python";

From 5bcb9d92e6ee3d2686db97b3074b39add0c5ebb4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 08:36:00 +0000
Subject: [PATCH 59/85] python3Packages.hydra-core: skip failing test

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

diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix
index bf9ab909df67..c24b4b63af13 100644
--- a/pkgs/development/python-modules/hydra-core/default.nix
+++ b/pkgs/development/python-modules/hydra-core/default.nix
@@ -81,8 +81,12 @@ buildPythonPackage (finalAttrs: {
     "test_bash_completion_with_dot_in_path"
     "test_install_uninstall"
     "test_config_search_path"
+
     # does not raise UserWarning
     "test_initialize_compat_version_base"
+
+    # AssertionError: Regex pattern did not match
+    "test_initialize_bad_version_base"
   ]
   ++ lib.optionals (pythonAtLeast "3.13") [
     # AssertionError: Regex pattern did not match

From 52af357125527f5054628017d27b5553e41e9b38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 08:47:06 +0000
Subject: [PATCH 60/85] pvetui: 1.3.2 -> 1.3.3

---
 pkgs/by-name/pv/pvetui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pv/pvetui/package.nix b/pkgs/by-name/pv/pvetui/package.nix
index 44f67fd7290a..578aab1a50b4 100644
--- a/pkgs/by-name/pv/pvetui/package.nix
+++ b/pkgs/by-name/pv/pvetui/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "pvetui";
-  version = "1.3.2";
+  version = "1.3.3";
 
   __structuredAttrs = true;
 
@@ -15,10 +15,10 @@ buildGoModule (finalAttrs: {
     owner = "devnullvoid";
     repo = "pvetui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PgxhfDFP0DBrihtkIWFYEOTbXUvp/WuB47iNPHJGr1Q=";
+    hash = "sha256-nqhfF9ZhQg5Hk37ni5J1D3kd2c2OVQWnbJ/i4QnKyOU=";
   };
 
-  vendorHash = "sha256-gGhEW9owJYjI+59X/yJ+tta9AQh9hoBdOBaO5Rojdy8=";
+  vendorHash = "sha256-S6QjNRuZgB+iGbGmKUGGjQHaHdNjVCdpeNhtMoUEkSA=";
 
   subPackages = [ "cmd/pvetui" ];
 

From 9d3598aee98336c784a3ffb7d0387c554248900a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 08:48:01 +0000
Subject: [PATCH 61/85] python3Packages.hydra-core: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix
index c24b4b63af13..cc4808cdb629 100644
--- a/pkgs/development/python-modules/hydra-core/default.nix
+++ b/pkgs/development/python-modules/hydra-core/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage (finalAttrs: {
   pname = "hydra-core";
   version = "1.3.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "facebookresearch";

From 5c35c9ca145c3c1145a832abc489dfa6f481c1f0 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 21 May 2026 11:09:14 +0200
Subject: [PATCH 62/85] mcp-server-time: fix `meta.mainProgram`

---
 pkgs/by-name/mc/mcp-server-time/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mc/mcp-server-time/package.nix b/pkgs/by-name/mc/mcp-server-time/package.nix
index 0739e45953e3..c49b951a5869 100644
--- a/pkgs/by-name/mc/mcp-server-time/package.nix
+++ b/pkgs/by-name/mc/mcp-server-time/package.nix
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/modelcontextprotocol/servers";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ drupol ];
-    mainProgram = "mcp-server-git";
+    mainProgram = "mcp-server-time";
     platforms = lib.platforms.all;
   };
 })

From ad85c4cc803ecfc9dc1f5314a9a4b35b7b59f15b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 11:10:53 +0200
Subject: [PATCH 63/85] python3Packages.ohme: 1.9.0 -> 1.9.1

Diff: https://github.com/dan-r/ohmepy/compare/v1.9.0...v1.9.1

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

diff --git a/pkgs/development/python-modules/ohme/default.nix b/pkgs/development/python-modules/ohme/default.nix
index b44802940c6b..f437fb65a9aa 100644
--- a/pkgs/development/python-modules/ohme/default.nix
+++ b/pkgs/development/python-modules/ohme/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ohme";
-  version = "1.9.0";
+  version = "1.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dan-r";
     repo = "ohmepy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4Cz08MFtWJomWHQzTubD3s8kMfUt7aZwD7buwEN2yn8=";
+    hash = "sha256-MhFDwEu67Gnk9WJCrWKLs3KSk/KryC/QFEpdkZqbgT4=";
   };
 
   build-system = [ setuptools ];

From df0b358d7ddaa9e6641c39c66fcdcf2ab004ad92 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 11:12:34 +0200
Subject: [PATCH 64/85] python3Packages.pontos: 26.4.3 -> 26.5.0

Diff: https://github.com/greenbone/pontos/compare/v26.4.3...v26.5.0

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

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index a213ea5ac5fa..7c56eb41bc0f 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "26.4.3";
+  version = "26.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "pontos";
     tag = "v${version}";
-    hash = "sha256-8IAAYT3ds+QB0+o9WWOGqKkHJHb7bbBAm5cHfSVXGVo=";
+    hash = "sha256-P18RqOSY2g6R5m79nJbfoP9w1RhYiQ2HPWZrhwIHknI=";
   };
 
   build-system = [ poetry-core ];

From f2243341f903e9ca55113b42b230fd2a758d8d8a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 11:15:49 +0200
Subject: [PATCH 65/85] python3Packages.pytelegrambotapi: 4.30.0 -> 4.33.0

Diff: https://github.com/eternnoir/pyTelegramBotAPI/compare/4.30.0...4.33.0

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

diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 0d8f11491abc..14df51e927cd 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pytelegrambotapi";
-  version = "4.30.0";
+  version = "4.33.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eternnoir";
     repo = "pyTelegramBotAPI";
     tag = version;
-    hash = "sha256-WFikKZxc9PjqcAcKrZIXaFO7XiUBAg8y60/UH2so4Vc=";
+    hash = "sha256-za2krpb8Gll0zjuVFgQApDeROI7YSYo4fG6pi2hdv3g=";
   };
 
   build-system = [ hatchling ];

From a33a781193f516e4d09c477b824038ba927efcc1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 21 May 2026 11:20:58 +0200
Subject: [PATCH 66/85] mcp-server-sequential-thinking: fix `meta.mainProgram`

---
 pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
index 3fd8b4ba0ec5..019fbab0393d 100644
--- a/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
+++ b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
@@ -39,7 +39,7 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://github.com/modelcontextprotocol/servers";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ drupol ];
-    mainProgram = "mcp-server-memory";
+    mainProgram = "mcp-server-sequential-thinking";
     platforms = lib.platforms.all;
   };
 })

From 959939a107a0198836e27b4dc5fa63f03a9597b7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 11:22:24 +0200
Subject: [PATCH 67/85] python3Packages.pytelegrambotapi: migrate to finalAttrs

---
 .../python-modules/pyTelegramBotAPI/default.nix     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 14df51e927cd..219230dd11cf 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -17,7 +17,7 @@
   watchdog,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pytelegrambotapi";
   version = "4.33.0";
   pyproject = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eternnoir";
     repo = "pyTelegramBotAPI";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-za2krpb8Gll0zjuVFgQApDeROI7YSYo4fG6pi2hdv3g=";
   };
 
@@ -44,20 +44,19 @@ buildPythonPackage rec {
     watchdog = [ watchdog ];
   };
 
-  checkInputs = [
+  nativeCheckInputs = [
     pytestCheckHook
     requests
   ]
-  ++ optional-dependencies.watchdog
-  ++ optional-dependencies.aiohttp;
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   pythonImportsCheck = [ "telebot" ];
 
   meta = {
     description = "Python implementation for the Telegram Bot API";
     homepage = "https://github.com/eternnoir/pyTelegramBotAPI";
-    changelog = "https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/${src.tag}";
+    changelog = "https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ das_j ];
   };
-}
+})

From ef14c7bd78ae5acf9545b3cb35992a0c5a16d53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 21 May 2026 11:29:32 +0200
Subject: [PATCH 68/85] gtk4: fixup build on i686-linux

---
 pkgs/by-name/gt/gtk4/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix
index 66e7c7529515..28fd6efc8850 100644
--- a/pkgs/by-name/gt/gtk4/package.nix
+++ b/pkgs/by-name/gt/gtk4/package.nix
@@ -95,6 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Ub2fYMfSOmZaVWxzZMIfsuTiglZrPn4JJFXo+RAzCJM=";
   };
 
+  patches = lib.optional stdenv.hostPlatform.is32bit (fetchpatch {
+    name = "fix-32bit-VkImage-null.patch";
+    url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/10d43de8f4f942cb591ada3103474bd7213425f1.patch";
+    hash = "sha256-DJIL6M3XcsjBoMO77OxNi84d1DxAphAfot3N7Nq1QqQ=";
+  });
+
   depsBuildBuild = [
     pkg-config
   ];

From aa92689cd9ade9968b0f28fa107fd70f6b0ca7d2 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 21 May 2026 12:34:40 +0300
Subject: [PATCH 69/85] vivaldi: 7.9.3970.67 -> 8.0.4033.26

---
 pkgs/by-name/vi/vivaldi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 79872f60b116..f82edf5855c1 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -67,7 +67,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "7.9.3970.67";
+  version = "8.0.4033.26";
 
   suffix =
     {
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-GXG1e5d+wxmrzryDQdGplJlAnxAl6kGWzopgE4qH8Zw=";
-        x86_64-linux = "sha256-fvw2FajFP5Aspwdb+C0XUJLWABrZ7/clD4OX8FLtIKI=";
+        aarch64-linux = "sha256-WJLEdzqF+HBdSSYLlkbxlSwO9IcYeFh7BTAk+2FQln8=";
+        x86_64-linux = "sha256-6BexB3ZQLNqMPjM9XQgX3RowF+cEJcQmV/Z9QpzhKOE=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From b1997e289085b385ad6d9afc5dc84efbb68b6d5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 09:37:37 +0000
Subject: [PATCH 70/85] libretro.play: 0-unstable-2026-05-11 ->
 0-unstable-2026-05-16

---
 pkgs/applications/emulators/libretro/cores/play.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index 1617d2c29e8a..745cec5501a7 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2026-05-11";
+  version = "0-unstable-2026-05-16";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "7a2b8d6058c7b89548283be5d380accc85e310a0";
-    hash = "sha256-AA6l4t+TDz2g/qQM4bVbSnJXsamEXzUqTL7VnvQ1mgc=";
+    rev = "e62ea293ba347dc1fd9d387458d8262bc122053f";
+    hash = "sha256-V0ItXRD1YO7jq/SNoXOh7ZhpWwx9oFs3muIUkzj8FHE=";
     fetchSubmodules = true;
   };
 

From 141dde132f42c07618b026544a9ef608eae4cbbd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 11:39:02 +0200
Subject: [PATCH 71/85] exegol: relax cryptography

---
 pkgs/by-name/ex/exegol/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix
index fa6a966b59be..4a315fd84622 100644
--- a/pkgs/by-name/ex/exegol/package.nix
+++ b/pkgs/by-name/ex/exegol/package.nix
@@ -21,6 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   pythonRelaxDeps = [
     "argcomplete"
+    "cryptography"
     "requests"
     "rich"
     "supabase"

From 808c15d73d6beed74f26083108f389d096b61b1f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 May 2026 11:53:14 +0200
Subject: [PATCH 72/85] python3Packages.types-aiobotocore-*: 3.2.1 -> 3.7.0

---
 .../types-aiobotocore-packages/default.nix    | 1332 ++++++++---------
 1 file changed, 666 insertions(+), 666 deletions(-)

diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
index 39542390f445..df53a308b133 100644
--- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
@@ -56,632 +56,632 @@ let
 in
 {
   types-aiobotocore-accessanalyzer =
-    buildTypesAiobotocorePackage "accessanalyzer" "3.2.1"
-      "sha256-LKwACFaSId1ugUoNLWd4lwZ2S2DvuynJSgI/03M4T70=";
+    buildTypesAiobotocorePackage "accessanalyzer" "3.7.0"
+      "sha256-hN4flHBRlkfH1l1gbe6Q0I3blMgc7pJkYnK3HLGSQbM=";
 
   types-aiobotocore-account =
-    buildTypesAiobotocorePackage "account" "3.2.1"
-      "sha256-0Q/6ob9RYyfFUt5U06u2bGGloqwQBP51nNX/yX5oRC8=";
+    buildTypesAiobotocorePackage "account" "3.7.0"
+      "sha256-Y3TZ2EJqf3xV6qv/eb7GepQQ+v1+lUOeob++oY5bA7I=";
 
   types-aiobotocore-acm =
-    buildTypesAiobotocorePackage "acm" "3.2.1"
-      "sha256-Ghyi7RC7JaLidz3qpwx147Bv/Vzc7SQ5F3gfllPEXPE=";
+    buildTypesAiobotocorePackage "acm" "3.7.0"
+      "sha256-1Bb1khmPLxELWjZQeI0IUK6OH7g7fQoLnfre5t2LO/8=";
 
   types-aiobotocore-acm-pca =
-    buildTypesAiobotocorePackage "acm-pca" "3.2.1"
-      "sha256-PcL2JpFkpCr2Z96StwGhvKsxhN7NlCiCvhn/VDOKmhM=";
+    buildTypesAiobotocorePackage "acm-pca" "3.7.0"
+      "sha256-YkpGQYQtesSvRa7dvZiRGCzl9U7/2i9TMc1N+ZrTmLI=";
 
   types-aiobotocore-aiops =
-    buildTypesAiobotocorePackage "aiops" "3.2.1"
-      "sha256-p3OVeIsmnvNreE4Mq5Ha+VuJrg2aAtXX/aSAXuXnxZg=";
+    buildTypesAiobotocorePackage "aiops" "3.7.0"
+      "sha256-zI9vxHfMGvAUcc191OdU8DIocVCaAUWZZ3+5e1o92Do=";
 
   types-aiobotocore-alexaforbusiness =
     buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0"
       "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao=";
 
   types-aiobotocore-amp =
-    buildTypesAiobotocorePackage "amp" "3.2.1"
-      "sha256-dzwGc02pA6l5FPl/ATgRtFLE5toJs8q7XpqsmJhBKxw=";
+    buildTypesAiobotocorePackage "amp" "3.7.0"
+      "sha256-UxNsUeVcG1IcUsAAoODx++aOJJrrPqLFlo6y7y/5Cpc=";
 
   types-aiobotocore-amplify =
-    buildTypesAiobotocorePackage "amplify" "3.2.1"
-      "sha256-JhsaPzN8lK7cE2sg7BcKonmPikmbzhuJdIRCa5yD1mQ=";
+    buildTypesAiobotocorePackage "amplify" "3.7.0"
+      "sha256-gVfA6bLj27ip4QeddGd8fD3XnB+yHZl1VG3RzCxqOXw=";
 
   types-aiobotocore-amplifybackend =
-    buildTypesAiobotocorePackage "amplifybackend" "3.2.1"
-      "sha256-+oiBhyVCi4D3G69V5ZcD1B5OgIIr/BJjMZIowI4tzaw=";
+    buildTypesAiobotocorePackage "amplifybackend" "3.7.0"
+      "sha256-8gotXVdpNHE+4BAXCAiFCKJ0aDLN8N8ROGgq+rdDMVY=";
 
   types-aiobotocore-amplifyuibuilder =
-    buildTypesAiobotocorePackage "amplifyuibuilder" "3.2.1"
-      "sha256-s/lgpeXOo3CxttRWC8q3DXSlwqj0vwBV89Vv4rGPXDo=";
+    buildTypesAiobotocorePackage "amplifyuibuilder" "3.7.0"
+      "sha256-WV5bLhtQ+TdLfblvtBfL/4eHoF+x5Exaava3WOM86+g=";
 
   types-aiobotocore-apigateway =
-    buildTypesAiobotocorePackage "apigateway" "3.2.1"
-      "sha256-hcKVgCEKiEGvL52djhowKM9hV8ykE9kxQxWErPaZh94=";
+    buildTypesAiobotocorePackage "apigateway" "3.7.0"
+      "sha256-f7UfO264MPyqr4HyIk7sv9tzebHx5HYxKrR+lCczrW8=";
 
   types-aiobotocore-apigatewaymanagementapi =
-    buildTypesAiobotocorePackage "apigatewaymanagementapi" "3.2.1"
-      "sha256-LUGYEjX2KyzuDvjrPGv7L1ATURWfSlRXu0nyqITGJac=";
+    buildTypesAiobotocorePackage "apigatewaymanagementapi" "3.7.0"
+      "sha256-PVKmM72M5w+gvzG6OM3ecInNxhbVI+4Ny/TXNzeqwzs=";
 
   types-aiobotocore-apigatewayv2 =
-    buildTypesAiobotocorePackage "apigatewayv2" "3.2.1"
-      "sha256-RAJdxP2chNPBZ2hdPuoUBlxI1z52ZOdCq7AIESyUDuo=";
+    buildTypesAiobotocorePackage "apigatewayv2" "3.7.0"
+      "sha256-uOsEkffmklTAXOOAXx705I5J5jCh4pITc4KL7lx4Jlw=";
 
   types-aiobotocore-appconfig =
-    buildTypesAiobotocorePackage "appconfig" "3.2.1"
-      "sha256-vQ6zx6AyAGY2oVl8b60FEkkTFYvmpTJRglKYrHxOUiQ=";
+    buildTypesAiobotocorePackage "appconfig" "3.7.0"
+      "sha256-AVQLgT8b25nrspFHiBalxdVqZfq0N2G77FAuf4+JkjI=";
 
   types-aiobotocore-appconfigdata =
-    buildTypesAiobotocorePackage "appconfigdata" "3.2.1"
-      "sha256-qeZ4hs83Cyt5rCWAePBnb5f8RiuYtB2lNnJNmBX2Pps=";
+    buildTypesAiobotocorePackage "appconfigdata" "3.7.0"
+      "sha256-51esYq5HP7Y/wUnw80+WiSKZ4Od8kDZ8ylgoHecGsSo=";
 
   types-aiobotocore-appfabric =
-    buildTypesAiobotocorePackage "appfabric" "3.2.1"
-      "sha256-73jEwdib0lzRHo1x/8CBOTDK/KNXxZaebVVkLGTCnBs=";
+    buildTypesAiobotocorePackage "appfabric" "3.7.0"
+      "sha256-BbCpvi5DAkRitJiSHZ2CxfTi0ZjxKCeev8xItokvqiQ=";
 
   types-aiobotocore-appflow =
-    buildTypesAiobotocorePackage "appflow" "3.2.1"
-      "sha256-oL9q0HzMDQdigF8xvnkzfTDfNiMg8zzI+9L8kZN1v/E=";
+    buildTypesAiobotocorePackage "appflow" "3.7.0"
+      "sha256-qM30c+eZfhnbLJDgKpWoXCQFegib4GPogrEE25KyXKM=";
 
   types-aiobotocore-appintegrations =
-    buildTypesAiobotocorePackage "appintegrations" "3.2.1"
-      "sha256-bFOtA9E5XpeBYBsMiqUBwJnb3yWXfJr5NLZcFPWoNfY=";
+    buildTypesAiobotocorePackage "appintegrations" "3.7.0"
+      "sha256-QIyG4sWYbvDpd4yhjh+oOKEnWrqGPE8cvu5hHdNMEWE=";
 
   types-aiobotocore-application-autoscaling =
-    buildTypesAiobotocorePackage "application-autoscaling" "3.2.1"
-      "sha256-NGZfr5AkgB7LcPZMHvC55rWic1rLwNY0Yz3cmCufS7w=";
+    buildTypesAiobotocorePackage "application-autoscaling" "3.7.0"
+      "sha256-KvjcCJnUUOM9x5yav2N1D/RabTZzH9X6U21pqrLMIAI=";
 
   types-aiobotocore-application-insights =
-    buildTypesAiobotocorePackage "application-insights" "3.2.1"
-      "sha256-VMn2zhIpB0HGvMVFH1WutYHTlJfBFfv5ACr9MXv6oOo=";
+    buildTypesAiobotocorePackage "application-insights" "3.7.0"
+      "sha256-KFbtxYvLTBNqbETnVynXAg+3FufhHAgqllV+LiMqEvI=";
 
   types-aiobotocore-applicationcostprofiler =
-    buildTypesAiobotocorePackage "applicationcostprofiler" "3.2.1"
-      "sha256-G66axJ0W5W1eepD4RMlFU/MAstsGT8254kp4KZG85Kk=";
+    buildTypesAiobotocorePackage "applicationcostprofiler" "3.7.0"
+      "sha256-rL4I6n/Ma8OgSXCkjS5p+tgwVsda8PldHQ4Iwb8I3hc=";
 
   types-aiobotocore-appmesh =
-    buildTypesAiobotocorePackage "appmesh" "3.2.1"
-      "sha256-+SlUgPVNfrrW0ltyAwEWRMda3f9efl5BdjoS3rNOE98=";
+    buildTypesAiobotocorePackage "appmesh" "3.7.0"
+      "sha256-9tHP+aFIoVSC/E47oGyyzg9c1pw88pyTbANwr0Q2qj4=";
 
   types-aiobotocore-apprunner =
-    buildTypesAiobotocorePackage "apprunner" "3.2.1"
-      "sha256-8LHrPciJFxj2UzCxVW9H06RKQy1R5R+RR3EUr9ixYv8=";
+    buildTypesAiobotocorePackage "apprunner" "3.7.0"
+      "sha256-QHi5ZlHY6jybgVjjV+Js1hYuxfNHz88dSYnZYg7DejU=";
 
   types-aiobotocore-appstream =
-    buildTypesAiobotocorePackage "appstream" "3.2.1"
-      "sha256-y7X8QuIdP27lCV+SNWoBtqMxyY3IrDLgFyzCqCC7Bt8=";
+    buildTypesAiobotocorePackage "appstream" "3.7.0"
+      "sha256-DW3cMDgBvN03nDpKXRWCq0Wb65XHl7TZVg67WVz5LD8=";
 
   types-aiobotocore-appsync =
-    buildTypesAiobotocorePackage "appsync" "3.2.1"
-      "sha256-VOECadrcUyT1hQmoCO4xvNaCTmnOqGpW4HDR38Tz+ok=";
+    buildTypesAiobotocorePackage "appsync" "3.7.0"
+      "sha256-fAa52ygaouYw3MsPavXVtuPk6inNETdEjV+6HiRajZ4=";
 
   types-aiobotocore-arc-zonal-shift =
-    buildTypesAiobotocorePackage "arc-zonal-shift" "3.2.1"
-      "sha256-gpAL7T3aRY6bCpOOqvrbVMZcOI74KsQZZCAv5MbZBNk=";
+    buildTypesAiobotocorePackage "arc-zonal-shift" "3.7.0"
+      "sha256-LMPz8jx1Vz4xS90cbkadCyzmkKkk6ajWvtAoisiGpYM=";
 
   types-aiobotocore-athena =
-    buildTypesAiobotocorePackage "athena" "3.2.1"
-      "sha256-nKLtk/Zk53Z/n4Khxnbuw748Smwtmr87Z89DY1v/NJ4=";
+    buildTypesAiobotocorePackage "athena" "3.7.0"
+      "sha256-BvSJ2iNn2YplD2qv5OcFlnzQKltWcfhYnJJrydkFazE=";
 
   types-aiobotocore-auditmanager =
-    buildTypesAiobotocorePackage "auditmanager" "3.2.1"
-      "sha256-EalhjDTHUU9M1m4wHFVZUFDPqlXG/s3jI8oeGIw6nmg=";
+    buildTypesAiobotocorePackage "auditmanager" "3.7.0"
+      "sha256-KgrvKWJf8Y4TjbnaQyAARZvQww5QR9R9IS++kSxgNeg=";
 
   types-aiobotocore-autoscaling =
-    buildTypesAiobotocorePackage "autoscaling" "3.2.1"
-      "sha256-8Lny3FDj9/GwobfHWYZh/esNrYl3t2qBjdShAVWj8Ds=";
+    buildTypesAiobotocorePackage "autoscaling" "3.7.0"
+      "sha256-RqL8kuj35Iu2SnBGSc1EzGhwLSiOhQu0QnuY9CtS6+o=";
 
   types-aiobotocore-autoscaling-plans =
-    buildTypesAiobotocorePackage "autoscaling-plans" "3.2.1"
-      "sha256-6KuwDlEsrtmsbSsu4PobKh5JzjVNkyAqZ40eiFcwZfo=";
+    buildTypesAiobotocorePackage "autoscaling-plans" "3.7.0"
+      "sha256-qDP+ekgwdencTmlDProJKbRVrIY/JPEnccgBENOJxP8=";
 
   types-aiobotocore-backup =
-    buildTypesAiobotocorePackage "backup" "3.2.1"
-      "sha256-4LNTn1/WIORiCYWkCidQtE9nxhu84QKiOXZ2H2Xc8/w=";
+    buildTypesAiobotocorePackage "backup" "3.7.0"
+      "sha256-eqVZXJyX9aJsTEpe9q6GOMY8BwACrtTV+mnozP12GCE=";
 
   types-aiobotocore-backup-gateway =
-    buildTypesAiobotocorePackage "backup-gateway" "3.2.1"
-      "sha256-AwTx4Qsvk1ivUjhEcs6hzvNq7FhuLvXvKNkpCyJ9GoA=";
+    buildTypesAiobotocorePackage "backup-gateway" "3.7.0"
+      "sha256-8LoaUgIUDs4IZOlBJKsRYMvxT1+vlQJtkotM8duCRPo=";
 
   types-aiobotocore-backupstorage =
     buildTypesAiobotocorePackage "backupstorage" "2.13.0"
       "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU=";
 
   types-aiobotocore-batch =
-    buildTypesAiobotocorePackage "batch" "3.2.1"
-      "sha256-CnFOydFD9gP8h+uZ/L8O0lp2BkWwoJD02jUMi4aKSKI=";
+    buildTypesAiobotocorePackage "batch" "3.7.0"
+      "sha256-Zv1QxwgHTPaI7cZ05KlfR22wOwkeDRYsGwj3RdUHNjc=";
 
   types-aiobotocore-billingconductor =
-    buildTypesAiobotocorePackage "billingconductor" "3.2.1"
-      "sha256-PabjRnkDm069mZPwMBqmwAXtUGi+lhDYKmpc1ErlOpo=";
+    buildTypesAiobotocorePackage "billingconductor" "3.7.0"
+      "sha256-ZG/AahoSRd8slVCN1REXrVwzaASNLQ38oSkTHJ2VGYo=";
 
   types-aiobotocore-braket =
-    buildTypesAiobotocorePackage "braket" "3.2.1"
-      "sha256-Y4VnlqF6KaqiUMnurfYdJRc9eGzAjujDAqgTQ/Z2ijc=";
+    buildTypesAiobotocorePackage "braket" "3.7.0"
+      "sha256-KPkylNUiyHgidbwPmWFvzLfpMnYD+rJVQ/ojtYXBcc4=";
 
   types-aiobotocore-budgets =
-    buildTypesAiobotocorePackage "budgets" "3.2.1"
-      "sha256-mV/7pJW8zqgPB0Yv15AwocN32fDLkLZXcL4qmZIVOv8=";
+    buildTypesAiobotocorePackage "budgets" "3.7.0"
+      "sha256-a+vTv09WuO+EvhO0+O/YvnKeIibXH6SHRFGuJHNsgKg=";
 
   types-aiobotocore-ce =
-    buildTypesAiobotocorePackage "ce" "3.2.1"
-      "sha256-TvJB0HC9hf3t0aAjTVenfnJ/mG85aYk/fR6XPkcE5CY=";
+    buildTypesAiobotocorePackage "ce" "3.7.0"
+      "sha256-RWTU5qNV+QDC//CZ+nguM5/fDrT0gfGE/aKBxjeC0kE=";
 
   types-aiobotocore-chime =
-    buildTypesAiobotocorePackage "chime" "3.2.1"
-      "sha256-zk3kr3Mq7KXAlnEzdEGLMmjWGTGZjfJfUl7xPvcI5M4=";
+    buildTypesAiobotocorePackage "chime" "3.7.0"
+      "sha256-FuYd2jjvoqy7rp/7Bglkp+8rfTpHsQzJNSrJxAtABTk=";
 
   types-aiobotocore-chime-sdk-identity =
-    buildTypesAiobotocorePackage "chime-sdk-identity" "3.2.1"
-      "sha256-9/arE0s3x3RzTpfqsZQb0oyPFr3OUmRWaZYolaWVhEo=";
+    buildTypesAiobotocorePackage "chime-sdk-identity" "3.7.0"
+      "sha256-WMgtfmptbUP/0D+KwGAaMBesiGxEyNVh6eQbJr/z+UY=";
 
   types-aiobotocore-chime-sdk-media-pipelines =
-    buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "3.2.1"
-      "sha256-OrjJNfpJLLJeyVSY35bxb/uMyYA22/4NteHrozWLvX4=";
+    buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "3.7.0"
+      "sha256-JY0N+gYkRhiDu2lOGy2xwRAZnHwpUmYg6/yv+s76v6M=";
 
   types-aiobotocore-chime-sdk-meetings =
-    buildTypesAiobotocorePackage "chime-sdk-meetings" "3.2.1"
-      "sha256-N1FSXhOY9WIELG6X/wwDm3H7FFXkWEUknES5eZCaTX8=";
+    buildTypesAiobotocorePackage "chime-sdk-meetings" "3.7.0"
+      "sha256-La/ayhWHzgwQp6V8UcJHrxzB8IezGJf8VtozFZeAroM=";
 
   types-aiobotocore-chime-sdk-messaging =
-    buildTypesAiobotocorePackage "chime-sdk-messaging" "3.2.1"
-      "sha256-f/k4jVNuUhDKQg3x8FEPBJGLRZZ5OoP69kMirKGIk+g=";
+    buildTypesAiobotocorePackage "chime-sdk-messaging" "3.7.0"
+      "sha256-LGAPTc7MtktNeeXb0Cq+ZEfpHK0IYE7dQtPd3c0IAA0=";
 
   types-aiobotocore-chime-sdk-voice =
-    buildTypesAiobotocorePackage "chime-sdk-voice" "3.2.1"
-      "sha256-YTjZYOuLLiZgvKqjO9EINXIO2PZGG3hQHHc1TQbGevw=";
+    buildTypesAiobotocorePackage "chime-sdk-voice" "3.7.0"
+      "sha256-0NPNBVw7P5eTGAhbYueod/XSJKnq76l1wVzC498nqsc=";
 
   types-aiobotocore-cleanrooms =
-    buildTypesAiobotocorePackage "cleanrooms" "3.2.1"
-      "sha256-MKy6SsBrAPcALlEcIv53j5YIdf5EHLhK/quPYkTSkmI=";
+    buildTypesAiobotocorePackage "cleanrooms" "3.7.0"
+      "sha256-R5rA/HiMJcmHUkXEE4oIAIcd6LXGA28kuGuEW8IVYPA=";
 
   types-aiobotocore-cloud9 =
-    buildTypesAiobotocorePackage "cloud9" "3.2.1"
-      "sha256-o6Yhp6Dr/wihzjMfT3ftJ4BG2R7D+9ZRUZ+1yIFUGvQ=";
+    buildTypesAiobotocorePackage "cloud9" "3.7.0"
+      "sha256-xTjjkmJ2fl2zaMrgyeNyD40aHcwpF6UXxn/Y5C8H8xA=";
 
   types-aiobotocore-cloudcontrol =
-    buildTypesAiobotocorePackage "cloudcontrol" "3.2.1"
-      "sha256-gCoaKyyDB5Zt9jVKT3CFdhB7xcLL+mJu14wGwb/7GMY=";
+    buildTypesAiobotocorePackage "cloudcontrol" "3.7.0"
+      "sha256-s0lGQQOxRnTy/+jkxEB5iPG9AAf1hRKSZzxjZOavcW4=";
 
   types-aiobotocore-clouddirectory =
-    buildTypesAiobotocorePackage "clouddirectory" "3.2.1"
-      "sha256-HmsRg0NeBv3s6lqPxke/x4Ix+cvx+FLfIkqpeaeCcc0=";
+    buildTypesAiobotocorePackage "clouddirectory" "3.7.0"
+      "sha256-yw2equ0/nFY1Jgntz0/uCadSXYunMXKdoMcwENmxvHM=";
 
   types-aiobotocore-cloudformation =
-    buildTypesAiobotocorePackage "cloudformation" "3.2.1"
-      "sha256-QjtSWh/rqtX1RJClkc3dAZ56T8PELzBqM7yUyYZxxiw=";
+    buildTypesAiobotocorePackage "cloudformation" "3.7.0"
+      "sha256-jdknoRGB2saxvACfuJfe1WsrtGRag6YX3Ar99nf5IxU=";
 
   types-aiobotocore-cloudfront =
-    buildTypesAiobotocorePackage "cloudfront" "3.2.1"
-      "sha256-/3Lg+E1hR1d08Yn7fMQxTu+6TS8Zpd8Tpc8uIOjKm30=";
+    buildTypesAiobotocorePackage "cloudfront" "3.7.0"
+      "sha256-xo59zro/dZNiE2elY9chVyAmbe7l27+duOKtBO5ubHM=";
 
   types-aiobotocore-cloudhsm =
-    buildTypesAiobotocorePackage "cloudhsm" "3.2.1"
-      "sha256-qD7aD4XZhl/tCP5TykJ43gArPWFdnAO1bycv6Ft2bzA=";
+    buildTypesAiobotocorePackage "cloudhsm" "3.7.0"
+      "sha256-jNYy4RqVM6EFqv6f2OMU7i8DrFPI6LUFeCwywdTJgKM=";
 
   types-aiobotocore-cloudhsmv2 =
-    buildTypesAiobotocorePackage "cloudhsmv2" "3.2.1"
-      "sha256-cRSylvQOZwTC4he5wBnWAmV3ElXSLfvvF77FafKJO6M=";
+    buildTypesAiobotocorePackage "cloudhsmv2" "3.7.0"
+      "sha256-W06pYhG9tf/sipjRNQKwnVMDPdgGAoeYcIYtTao62Sk=";
 
   types-aiobotocore-cloudsearch =
-    buildTypesAiobotocorePackage "cloudsearch" "3.2.1"
-      "sha256-QVn/4DwIJ6xW2VYz3mFfFn8HMNnob409TMndBDvz4Ag=";
+    buildTypesAiobotocorePackage "cloudsearch" "3.7.0"
+      "sha256-R2SqB3l31HgXDO0MJh23eWtmMCN22kETpcKInqBZQe0=";
 
   types-aiobotocore-cloudsearchdomain =
-    buildTypesAiobotocorePackage "cloudsearchdomain" "3.2.1"
-      "sha256-YLnhSCHaA3JN2tN3fdxWoN6FO0xRKAfiA8uMgl3wh9c=";
+    buildTypesAiobotocorePackage "cloudsearchdomain" "3.7.0"
+      "sha256-aVCQhAFfJxjBTybddLwNoZFxnRYgnw42xZc1mrlSSy8=";
 
   types-aiobotocore-cloudtrail =
-    buildTypesAiobotocorePackage "cloudtrail" "3.2.1"
-      "sha256-UWhjObXhZJpyEwA956zM/RSOsRp3B2XwmIWjTYOKDNM=";
+    buildTypesAiobotocorePackage "cloudtrail" "3.7.0"
+      "sha256-v7LogXqKff7ht+nHNu33EW2l7gDYITF63R+CMGim/Os=";
 
   types-aiobotocore-cloudtrail-data =
-    buildTypesAiobotocorePackage "cloudtrail-data" "3.2.1"
-      "sha256-1UlynfSddXWzzvOeUc33jQw49lp/nk6fE84AfKak2Ng=";
+    buildTypesAiobotocorePackage "cloudtrail-data" "3.7.0"
+      "sha256-WO5MpjVFJ3T52s7ErlIaS6n0kvbRxeKChRCeZGDCjWI=";
 
   types-aiobotocore-cloudwatch =
-    buildTypesAiobotocorePackage "cloudwatch" "3.2.1"
-      "sha256-JjjS7tIBYWaY09Pyac/1+SvPFsJFlSI8P0D5VRTeSuY=";
+    buildTypesAiobotocorePackage "cloudwatch" "3.7.0"
+      "sha256-+b1Exmy7k3B9/rfhAPRRTPJgLBJHa0VGCUJ7jjoZX2k=";
 
   types-aiobotocore-codeartifact =
-    buildTypesAiobotocorePackage "codeartifact" "3.2.1"
-      "sha256-2gPSRwcrYaoJ1p6GBnjSJrFHJKbyORD5regRyAlPaNY=";
+    buildTypesAiobotocorePackage "codeartifact" "3.7.0"
+      "sha256-ioutudILLyYw5RWN2mKkKWQ/G/VIoHozmnFr2gfGv9c=";
 
   types-aiobotocore-codebuild =
-    buildTypesAiobotocorePackage "codebuild" "3.2.1"
-      "sha256-2EFD8V4dAYV1yadRguNFuQlOfCzYjtYFHSXVMhjacHA=";
+    buildTypesAiobotocorePackage "codebuild" "3.7.0"
+      "sha256-SiyH0cnHGobGHY0b016tzlfEvxAWeK7o/hf7VjIu/mk=";
 
   types-aiobotocore-codecatalyst =
-    buildTypesAiobotocorePackage "codecatalyst" "3.2.1"
-      "sha256-7ZgutdbK5fdNE/aVlJ9zEaWr6YZO/qmZViCusOFVUy8=";
+    buildTypesAiobotocorePackage "codecatalyst" "3.7.0"
+      "sha256-53J3i2FOoMscK9F5axvBf32s+VrCE1e4wVsf2JS5k/k=";
 
   types-aiobotocore-codecommit =
-    buildTypesAiobotocorePackage "codecommit" "3.2.1"
-      "sha256-ktP+CgtG5pfRI/58Wa5frKgGMKiDR3KarWQkeexjdM0=";
+    buildTypesAiobotocorePackage "codecommit" "3.7.0"
+      "sha256-rvClmbFk62L8EIqxD1uRzNAWMAvPPfbfAEOvmVWlEsg=";
 
   types-aiobotocore-codeconnections =
-    buildTypesAiobotocorePackage "codeconnections" "3.2.1"
-      "sha256-AqmRmvw1hmp6jaQcoIsz44s9PRSoNupAi/zC7QYIDz4=";
+    buildTypesAiobotocorePackage "codeconnections" "3.7.0"
+      "sha256-0ri/DlF8t86tLy3IkTaZLH/ZOLR9v/kQO2asJlwD6qc=";
 
   types-aiobotocore-codedeploy =
-    buildTypesAiobotocorePackage "codedeploy" "3.2.1"
-      "sha256-Kd1nAzs5wT8VOu8DOJBN0BymN6+WyU22qV9FXLjU660=";
+    buildTypesAiobotocorePackage "codedeploy" "3.7.0"
+      "sha256-M2oVkK/bA5v8Nq1m1QnA+1EX0Bo76xNGPyXeysq8NXI=";
 
   types-aiobotocore-codeguru-reviewer =
-    buildTypesAiobotocorePackage "codeguru-reviewer" "3.2.1"
-      "sha256-KMNlx9UaTgpKGlXO0vu6eOXadYA1GqEae8n686/sF2g=";
+    buildTypesAiobotocorePackage "codeguru-reviewer" "3.7.0"
+      "sha256-cJIlVDaoaC5eW92f6276qLlbMI8o+ReAbSJa/9CglKw=";
 
   types-aiobotocore-codeguru-security =
-    buildTypesAiobotocorePackage "codeguru-security" "3.2.1"
-      "sha256-RAvYvmCnilENQ4gReRHSlhyPgG+/DPlF8Spa0b3iRb0=";
+    buildTypesAiobotocorePackage "codeguru-security" "3.7.0"
+      "sha256-COcNBKEiuUwNdMPX/GxPolFJj+P2/eqjHBAE95rQf2M=";
 
   types-aiobotocore-codeguruprofiler =
-    buildTypesAiobotocorePackage "codeguruprofiler" "3.2.1"
-      "sha256-FwxO7tTurkldpF1AoPk4RLOdvNprMUcG+/XyBqFBERw=";
+    buildTypesAiobotocorePackage "codeguruprofiler" "3.7.0"
+      "sha256-dcXGwUGXZdy8w6++IFNzc6Lcb22FG10RpSp+lJTMnSM=";
 
   types-aiobotocore-codepipeline =
-    buildTypesAiobotocorePackage "codepipeline" "3.2.1"
-      "sha256-ZOwt3WD/necA4Iw4x6jI9ocZuilf+sZVugjyvLw/WRE=";
+    buildTypesAiobotocorePackage "codepipeline" "3.7.0"
+      "sha256-7IrdHV674OjUW1m7PTM3G5+hSe500sY8rY3m3VTHkqQ=";
 
   types-aiobotocore-codestar =
     buildTypesAiobotocorePackage "codestar" "2.13.3"
       "sha256-Z1ewx2RjmxbOQZ7wXaN54PVOuRs6LP3rMpsrVTacwjo=";
 
   types-aiobotocore-codestar-connections =
-    buildTypesAiobotocorePackage "codestar-connections" "3.2.1"
-      "sha256-AQVvlojsMjpajtb1J0hvG0YtzAedVz/g13e9pyC9vdU=";
+    buildTypesAiobotocorePackage "codestar-connections" "3.7.0"
+      "sha256-C8c5SsKP882yrgNNbVM2gyqqadt7LVHjCwt/EC0aHhA=";
 
   types-aiobotocore-codestar-notifications =
-    buildTypesAiobotocorePackage "codestar-notifications" "3.2.1"
-      "sha256-YrDkhrd+9GpHXpfyQ24RlXQ9bAIUsRMN86JSH79ni/A=";
+    buildTypesAiobotocorePackage "codestar-notifications" "3.7.0"
+      "sha256-XVas2vKprWZrWRSzQ50XsZc4bjBK5fmyJ9jRAaBZyWg=";
 
   types-aiobotocore-cognito-identity =
-    buildTypesAiobotocorePackage "cognito-identity" "3.2.1"
-      "sha256-2r6pZRq+PjffQwOf92Rb/6CQIliv9aTu9+iW5ro3hvg=";
+    buildTypesAiobotocorePackage "cognito-identity" "3.7.0"
+      "sha256-ICI+kiRFPP9ddpEsIEpan1RXDMvRzIzSrzP6E3Jkzpc=";
 
   types-aiobotocore-cognito-idp =
-    buildTypesAiobotocorePackage "cognito-idp" "3.2.1"
-      "sha256-SQIfFqmGuB5VUqFQyX9QtNQv5COEpXM33johxXBLJSU=";
+    buildTypesAiobotocorePackage "cognito-idp" "3.7.0"
+      "sha256-XLXJp0nVPsszs0z7qS3rD+C9IovozcX+Tr2FLvFkXXM=";
 
   types-aiobotocore-cognito-sync =
-    buildTypesAiobotocorePackage "cognito-sync" "3.2.1"
-      "sha256-Xr91cu3lmfjfgrO+8x6ppTMAMLo1nhLgpAMcKympeSo=";
+    buildTypesAiobotocorePackage "cognito-sync" "3.7.0"
+      "sha256-ak+hXx1NAw9tL9iT6iOG09tQYHV5CxQywxbHkRR5EyM=";
 
   types-aiobotocore-comprehend =
-    buildTypesAiobotocorePackage "comprehend" "3.2.1"
-      "sha256-yWxaPnjjTybegCuMTwTdJHSFOJwzanG874PFV9crmqE=";
+    buildTypesAiobotocorePackage "comprehend" "3.7.0"
+      "sha256-FIo2q77bP78+nTynZiEMlKaQ7NMesrl325Uj9WTtg78=";
 
   types-aiobotocore-comprehendmedical =
-    buildTypesAiobotocorePackage "comprehendmedical" "3.2.1"
-      "sha256-qqPVt51S0OvdifLTKkP4fMdkBuyy6H7QSBWe99tJdeo=";
+    buildTypesAiobotocorePackage "comprehendmedical" "3.7.0"
+      "sha256-rPEbxlmWJG3mg2Ithk4ZOU5NbxRA7+QXbHZsycBUeWU=";
 
   types-aiobotocore-compute-optimizer =
-    buildTypesAiobotocorePackage "compute-optimizer" "3.2.1"
-      "sha256-GuAEwZN/hlMsW2whrKsrPcAKpIr1i9iS1i8Xtn6/AR0=";
+    buildTypesAiobotocorePackage "compute-optimizer" "3.7.0"
+      "sha256-0F0iIpmwcivX0r7SP7EogYCaKG0j1iujWgGkUdXWYUo=";
 
   types-aiobotocore-config =
-    buildTypesAiobotocorePackage "config" "3.2.1"
-      "sha256-euCAN2Bn1TuzVJw/D8PADzFeFngE5EZXbiqYbYEpFco=";
+    buildTypesAiobotocorePackage "config" "3.7.0"
+      "sha256-J9G0qMTXaOyW6RTY1jIEFCxUswElkdPx1hqHlFtTXgw=";
 
   types-aiobotocore-connect =
-    buildTypesAiobotocorePackage "connect" "3.2.1"
-      "sha256-LVqDhDopGqTRGIkfohTuwOZjc6dwibC61uw0HqDSzdI=";
+    buildTypesAiobotocorePackage "connect" "3.7.0"
+      "sha256-Ie9B4OuYjzePqNf6Bvc4tq777YWIljN9sNWQWVgyszA=";
 
   types-aiobotocore-connect-contact-lens =
-    buildTypesAiobotocorePackage "connect-contact-lens" "3.2.1"
-      "sha256-dknYp7bxyQc+DD2fVA7iV9929LSQVuBhrJ0xEOsJk6M=";
+    buildTypesAiobotocorePackage "connect-contact-lens" "3.7.0"
+      "sha256-/RUg/woLn9qm6bonp/8DumKP8auEWdrtqne8+2s+kdQ=";
 
   types-aiobotocore-connectcampaigns =
-    buildTypesAiobotocorePackage "connectcampaigns" "3.2.1"
-      "sha256-YG90F8LJUwTuCIudQkZAbHiQWlN+9IGo748NE1u0DWw=";
+    buildTypesAiobotocorePackage "connectcampaigns" "3.7.0"
+      "sha256-q7Kffps5ugA14xf9DHynAhHNZLcOP9HO85GTCTyuMq8=";
 
   types-aiobotocore-connectcases =
-    buildTypesAiobotocorePackage "connectcases" "3.2.1"
-      "sha256-YXSyU9DTJX3QnyuWn0M/ijeovzDH9EcQWwuuaii8Mo8=";
+    buildTypesAiobotocorePackage "connectcases" "3.7.0"
+      "sha256-EVE6JD9a20FX1ASvY3jJyXn5SquyG+n/mUHzXS3EM64=";
 
   types-aiobotocore-connectparticipant =
-    buildTypesAiobotocorePackage "connectparticipant" "3.2.1"
-      "sha256-8PUmPyV9hg3lJ9Wh3EF4e/RaJ1IvzzBEQ2q0vwfGbM4=";
+    buildTypesAiobotocorePackage "connectparticipant" "3.7.0"
+      "sha256-8tIUgHaTd1mNN0na3vi6K8vFf9aCDn8OhlJyymJVqZM=";
 
   types-aiobotocore-controltower =
-    buildTypesAiobotocorePackage "controltower" "3.2.1"
-      "sha256-S9F+1oAyF7mG2gLfOUtBB5baAYi0QgL4D3hXlKYFOuQ=";
+    buildTypesAiobotocorePackage "controltower" "3.7.0"
+      "sha256-h8+gkONNokS2n4u0nkijcNdblsHHC449B2wQjDIC+uo=";
 
   types-aiobotocore-cur =
-    buildTypesAiobotocorePackage "cur" "3.2.1"
-      "sha256-L49VAhO+ac3fkcfteqKQdX/WN1/rTeyMLOjg6P8BYGM=";
+    buildTypesAiobotocorePackage "cur" "3.7.0"
+      "sha256-O7s257Pb7kDbhgKxVYR3pStZmbVjP5MDE0ZN9Z3oGG4=";
 
   types-aiobotocore-customer-profiles =
-    buildTypesAiobotocorePackage "customer-profiles" "3.2.1"
-      "sha256-z3Rx7K6Uwur0Pdr4eYzTpO729FxezR98MhhMZWPy1rk=";
+    buildTypesAiobotocorePackage "customer-profiles" "3.7.0"
+      "sha256-aiTOMWHCVVXNQjyaYnqnUn+AvJddfe1Onxqq+7C8siE=";
 
   types-aiobotocore-databrew =
-    buildTypesAiobotocorePackage "databrew" "3.2.1"
-      "sha256-XfZDzcYLG+zhzS4ydUs2/r9V/WG4HkHJZLXXehwi0Ak=";
+    buildTypesAiobotocorePackage "databrew" "3.7.0"
+      "sha256-X0ccuclYoQ4YsBkFnevEzGq2uVuU5twu+CbEEM/zUeE=";
 
   types-aiobotocore-dataexchange =
-    buildTypesAiobotocorePackage "dataexchange" "3.2.1"
-      "sha256-dkY0bvtUVnjXQWo1HTfBnvXYN9+RRkIRqQuovZv1QZ4=";
+    buildTypesAiobotocorePackage "dataexchange" "3.7.0"
+      "sha256-19hTbA1UNLzybIZxiV2oSPAKJ36YkdfWIU/Wks63UQk=";
 
   types-aiobotocore-datapipeline =
-    buildTypesAiobotocorePackage "datapipeline" "3.2.1"
-      "sha256-kvF6vjubCnYxiptJvZaVezYk9x5m6JwHuCfJ6ojpgrA=";
+    buildTypesAiobotocorePackage "datapipeline" "3.7.0"
+      "sha256-IHr4Az6ZRdSI/v7NUO/2FsUSdnVYtqG2jb6+CqNa9Zs=";
 
   types-aiobotocore-datasync =
-    buildTypesAiobotocorePackage "datasync" "3.2.1"
-      "sha256-UTDvdjpY/urqk5ede6rKo2yUOBWLUlud+u+gaEcVYsI=";
+    buildTypesAiobotocorePackage "datasync" "3.7.0"
+      "sha256-AP0XaRclqTJ8fMAdJzazLrfjeM5vx7ejcVF9+WOg5dg=";
 
   types-aiobotocore-dax =
-    buildTypesAiobotocorePackage "dax" "3.2.1"
-      "sha256-H2ipRxcJeKOZzxeIFrYBZT1LPrUuP/RoJkanGcXYfbs=";
+    buildTypesAiobotocorePackage "dax" "3.7.0"
+      "sha256-vjFmcHKGerivLXGruRA6fLFTxrAKBfeGOv1rgvVlYd0=";
 
   types-aiobotocore-detective =
-    buildTypesAiobotocorePackage "detective" "3.2.1"
-      "sha256-sqVBTk8wBvTX3H2IJPCDUoZVLGaqfeUgCLYa2Es0Dy4=";
+    buildTypesAiobotocorePackage "detective" "3.7.0"
+      "sha256-gr9C3CIZnj/I0+GkJ8FfkYTUnMcr+h/MU2Wi+G1pFws=";
 
   types-aiobotocore-devicefarm =
-    buildTypesAiobotocorePackage "devicefarm" "3.2.1"
-      "sha256-6grjSkzkL0YLk7o75WsBfkqhL66BcPw5sZlJLsPjsTU=";
+    buildTypesAiobotocorePackage "devicefarm" "3.7.0"
+      "sha256-rsiBPL6JG68BvhExf0fCsK5BI1zGajkAx5ySOy3JB2c=";
 
   types-aiobotocore-devops-guru =
-    buildTypesAiobotocorePackage "devops-guru" "3.2.1"
-      "sha256-OJA1GvS+0FoReJOXgdZjRp44aGmW4OrQlnkthWISwCI=";
+    buildTypesAiobotocorePackage "devops-guru" "3.7.0"
+      "sha256-VgE4PnoqaEu8rV0TKGtQ4XDp2rD/gXpxBIj73HSeGJI=";
 
   types-aiobotocore-directconnect =
-    buildTypesAiobotocorePackage "directconnect" "3.2.1"
-      "sha256-MqYoasLY658x1vS9Xe3rXLYmN1q5nvw5B2bRtGtPCcs=";
+    buildTypesAiobotocorePackage "directconnect" "3.7.0"
+      "sha256-Q0F3q6//CmcPrC0LybjzjzBBwvQJgZGk4wZHYJ6PAJ4=";
 
   types-aiobotocore-discovery =
-    buildTypesAiobotocorePackage "discovery" "3.2.1"
-      "sha256-+jzYNIVwbC1CvH9tJhYRAKFn8YgSRAZwE4qNg+4p3Mo=";
+    buildTypesAiobotocorePackage "discovery" "3.7.0"
+      "sha256-tPDm9pG53NW6bLbcIbXmjrVDJDeIJ07wMylvCvM4+yk=";
 
   types-aiobotocore-dlm =
-    buildTypesAiobotocorePackage "dlm" "3.2.1"
-      "sha256-j0NlhhEVQtzY/XtmAlHi3cv8DNhrs+wey52YKlneVlA=";
+    buildTypesAiobotocorePackage "dlm" "3.7.0"
+      "sha256-eKeYRnLRSk+PQCYgWFEFnnsUmtrhNKtZPa+M3GMM1t4=";
 
   types-aiobotocore-dms =
-    buildTypesAiobotocorePackage "dms" "3.2.1"
-      "sha256-cbwWa/ByQ84Ag9LYSICpiU5+l4VhGo2kow+prVTWeD0=";
+    buildTypesAiobotocorePackage "dms" "3.7.0"
+      "sha256-08KznNVQCoGqGS2mDtbYISW3JtpHRPpa/WIKfbQ/i/M=";
 
   types-aiobotocore-docdb =
-    buildTypesAiobotocorePackage "docdb" "3.2.1"
-      "sha256-pxIFr/V/ZpGiYeIG55aWYaojyVejmhOidXe23vR65QM=";
+    buildTypesAiobotocorePackage "docdb" "3.7.0"
+      "sha256-2RrVq3pGIQWfU8uI2fhSBV+6VjSnEFFnb9FcYEzTLl8=";
 
   types-aiobotocore-docdb-elastic =
-    buildTypesAiobotocorePackage "docdb-elastic" "3.2.1"
-      "sha256-L+ybxfHUu6lxf/LDgYAiCG6WucEuVAgjGNZVkTQwAZ8=";
+    buildTypesAiobotocorePackage "docdb-elastic" "3.7.0"
+      "sha256-oH+3JqSoeHPI4OXMzZa33QJiMea3Xw5DDZl9DmFMXVQ=";
 
   types-aiobotocore-drs =
-    buildTypesAiobotocorePackage "drs" "3.2.1"
-      "sha256-w53fLAoZntOMctG2tXL6ZzIokaNFLSK8LMYHYN+nXYE=";
+    buildTypesAiobotocorePackage "drs" "3.7.0"
+      "sha256-2q2UqQ+mCOA3aW0fOmZL/Upi1b0GPuQn9DyvOIkNsMc=";
 
   types-aiobotocore-ds =
-    buildTypesAiobotocorePackage "ds" "3.2.1"
-      "sha256-fsK23lR6jeitkAG3ROn+uWGRcXyRxDJ3qlrcMsZYPyc=";
+    buildTypesAiobotocorePackage "ds" "3.7.0"
+      "sha256-UFeXnz877xxdWnYIKMUNubj3LKU20sTCsORYf7sgt6g=";
 
   types-aiobotocore-dynamodb =
-    buildTypesAiobotocorePackage "dynamodb" "3.2.1"
-      "sha256-ViDfx7QOIoNMLbMDc5A8WzD1DKTuLpnbvZb+JbCMHtw=";
+    buildTypesAiobotocorePackage "dynamodb" "3.7.0"
+      "sha256-uyPJkjc07Y1GHaC4oRZqC42QgOY8LmXjLNA95XCAVV0=";
 
   types-aiobotocore-dynamodbstreams =
-    buildTypesAiobotocorePackage "dynamodbstreams" "3.2.1"
-      "sha256-87ZAw0XiAIX0+LIH6Hvzk5IEf9LIEwdwhqU4hZnQ8mQ=";
+    buildTypesAiobotocorePackage "dynamodbstreams" "3.7.0"
+      "sha256-ir0ffWxtGEPihKirKzeEytZbrTLb6FdEH7NZHxBJlmQ=";
 
   types-aiobotocore-ebs =
-    buildTypesAiobotocorePackage "ebs" "3.2.1"
-      "sha256-JPTpNLkxmCA5ffkknL3TsGkkM8SHKc5UOLB5pj4Y52E=";
+    buildTypesAiobotocorePackage "ebs" "3.7.0"
+      "sha256-3lZv6kh52tiJ2txUQFKrLxFwkKY2+LPAAa1gcxzr4Ds=";
 
   types-aiobotocore-ec2 =
-    buildTypesAiobotocorePackage "ec2" "3.2.1"
-      "sha256-AoHnBoD1/5g2EUBOtP5AAr2+rcJDCKFz6JP4aTXfeao=";
+    buildTypesAiobotocorePackage "ec2" "3.7.0"
+      "sha256-sr+Iqn/vW2jxXCYw3qXi7O9tqOaPdiuAMABkr45KkPs=";
 
   types-aiobotocore-ec2-instance-connect =
-    buildTypesAiobotocorePackage "ec2-instance-connect" "3.2.1"
-      "sha256-ZFveuk15AR/8501sRhsJmv4BZyerfGjJjTc+fMR2gnA=";
+    buildTypesAiobotocorePackage "ec2-instance-connect" "3.7.0"
+      "sha256-kBduFFziwpclOQlKa/acLfHhG9CKl7JFn04vYkqFnEQ=";
 
   types-aiobotocore-ecr =
-    buildTypesAiobotocorePackage "ecr" "3.2.1"
-      "sha256-QIwIDsAC1jVx4B3RZulJ0mHF/ND9bGR2ZrbI8UKTkTs=";
+    buildTypesAiobotocorePackage "ecr" "3.7.0"
+      "sha256-jwO16n53l+jLA/zHpNG3PU/iWUdCuT+mgipyjs4I2hw=";
 
   types-aiobotocore-ecr-public =
-    buildTypesAiobotocorePackage "ecr-public" "3.2.1"
-      "sha256-uojcKxNKY5AlamiO3kSEfX3XedsNFDSeM0qYLnwk8GE=";
+    buildTypesAiobotocorePackage "ecr-public" "3.7.0"
+      "sha256-DiEksJtfYzDJnBXGRtnMQdWQoWF+g3VqIXwJ0q2sZxU=";
 
   types-aiobotocore-ecs =
-    buildTypesAiobotocorePackage "ecs" "3.2.1"
-      "sha256-91HfKCI+RSFNZiL6o6C0d/q/LL1ZfXLvN5vDAHBHUZc=";
+    buildTypesAiobotocorePackage "ecs" "3.7.0"
+      "sha256-1BPbC4S2TTyT2WquZS5IMKCjcuDFC89Bt0CKUnTBP3M=";
 
   types-aiobotocore-efs =
-    buildTypesAiobotocorePackage "efs" "3.2.1"
-      "sha256-aqbG7JRx1y557BN9K2zZNCPTGh4M5sY1Ov+qMealGYQ=";
+    buildTypesAiobotocorePackage "efs" "3.7.0"
+      "sha256-wT8rpC+EUwQp/Pk+9hfegciidAhBmN0mWNcQ2qbv4N4=";
 
   types-aiobotocore-eks =
-    buildTypesAiobotocorePackage "eks" "3.2.1"
-      "sha256-E+zl4Z2+DoXtC/dZijqTVqB38YzKwZF8gOVc5f1L/3U=";
+    buildTypesAiobotocorePackage "eks" "3.7.0"
+      "sha256-j3ZSATOlw8t4mR9np6qlI40P2cmK0H4n+RgUr+tw/P8=";
 
   types-aiobotocore-elastic-inference =
     buildTypesAiobotocorePackage "elastic-inference" "2.20.0"
       "sha256-jFSY7JBVjDQi6dCqlX2LG7jxpSKfILv3XWbYidvtGos=";
 
   types-aiobotocore-elasticache =
-    buildTypesAiobotocorePackage "elasticache" "3.2.1"
-      "sha256-kNOlmDryMv/ddfL8Ef99hbuDEy9IUrJQ65ldbs6mlnU=";
+    buildTypesAiobotocorePackage "elasticache" "3.7.0"
+      "sha256-mDnDkYsSk2Qx8mQ0I/wCGylvGed9EPS6ivxQ04xyKBQ=";
 
   types-aiobotocore-elasticbeanstalk =
-    buildTypesAiobotocorePackage "elasticbeanstalk" "3.2.1"
-      "sha256-FIJRZa7ZqAhvNLWblQ4a1f2mvSU2Q/xwW74LbsQIZhk=";
+    buildTypesAiobotocorePackage "elasticbeanstalk" "3.7.0"
+      "sha256-/8YzvK0QuVukrgPI6L8myiQs1SPucHejJ8h8rHSNWj8=";
 
   types-aiobotocore-elastictranscoder =
     buildTypesAiobotocorePackage "elastictranscoder" "2.25.2"
       "sha256-5t214U60d2kSf8bmUiEkj4OMFf3+SbNRGqLif1Rj28E=";
 
   types-aiobotocore-elb =
-    buildTypesAiobotocorePackage "elb" "3.2.1"
-      "sha256-H6ejZLwIDdIRZJiB6o40wm4ooe0NXrMiQtXJVP3pzYc=";
+    buildTypesAiobotocorePackage "elb" "3.7.0"
+      "sha256-vj+lD8Ua3rECLi4k/iDOOKq/K3qXeWgwkDyWEA010co=";
 
   types-aiobotocore-elbv2 =
-    buildTypesAiobotocorePackage "elbv2" "3.2.1"
-      "sha256-nHP8BmUYum/rh5sr1+IvMu33+smh/+g1d2pj77sDwq0=";
+    buildTypesAiobotocorePackage "elbv2" "3.7.0"
+      "sha256-2lb6+htHa0KH+hCoCyTqoZFLSKC4xy06U9+gaPWvkw8=";
 
   types-aiobotocore-emr =
-    buildTypesAiobotocorePackage "emr" "3.2.1"
-      "sha256-ejv/9CZNQYB0FUr0iE3BDzcwQO05nBOUriNPoQi6UgU=";
+    buildTypesAiobotocorePackage "emr" "3.7.0"
+      "sha256-yCjZyhPmgO8OCtSsvqC4zob8pSueU3QxlksHk4kMpkQ=";
 
   types-aiobotocore-emr-containers =
-    buildTypesAiobotocorePackage "emr-containers" "3.2.1"
-      "sha256-bDBHtMBmS7CZlpZVcnQWwjZYkjtPYj6Me6epiMH/fj4=";
+    buildTypesAiobotocorePackage "emr-containers" "3.7.0"
+      "sha256-PvUdlmKyamrb74vB+A05VbzL4Okv12yYL0R4RGFKTj8=";
 
   types-aiobotocore-emr-serverless =
-    buildTypesAiobotocorePackage "emr-serverless" "3.2.1"
-      "sha256-V2UKyjSVZcJObD8MxSuKqpkRxDGNMjBL2ymXjq+FUNA=";
+    buildTypesAiobotocorePackage "emr-serverless" "3.7.0"
+      "sha256-Eqx3r+g0T4o3btTjd3xW22MiYyJmODL7/52j8PMZhKo=";
 
   types-aiobotocore-entityresolution =
-    buildTypesAiobotocorePackage "entityresolution" "3.2.1"
-      "sha256-SUJxzIOlWozII7wTtngKhKMlY2PZOdeGl7WulU9/KV4=";
+    buildTypesAiobotocorePackage "entityresolution" "3.7.0"
+      "sha256-KsPRUUuFpw6Fwzni+1chWOX1d5N5YTMIPcmRhsZs+QQ=";
 
   types-aiobotocore-es =
-    buildTypesAiobotocorePackage "es" "3.2.1"
-      "sha256-OUrNnK7dk12zQHk5rJGYkq2jAkmctoACJXHjBlFVgUw=";
+    buildTypesAiobotocorePackage "es" "3.7.0"
+      "sha256-rXSIfNV7ZDzH9j4zDdyeD9vEYmpu8H12HCNOUCyTk3M=";
 
   types-aiobotocore-events =
-    buildTypesAiobotocorePackage "events" "3.2.1"
-      "sha256-pnb1rQSx9saqywByRavCVUNrJYpmPs71N18SGY6yDPo=";
+    buildTypesAiobotocorePackage "events" "3.7.0"
+      "sha256-qKTQ8cv9xj/E541i/IWWYtOSd7n3I8vO4INQEws4gvY=";
 
   types-aiobotocore-evidently =
     buildTypesAiobotocorePackage "evidently" "3.1.1"
       "sha256-g+XQEgqqZul8kOg0kstdYMvw2tu6zhC9GZGgs7WH3Mo=";
 
   types-aiobotocore-finspace =
-    buildTypesAiobotocorePackage "finspace" "3.1.1"
-      "sha256-91tfoDjQoRqrcEcvEhBpIoB01KCZGMptnhT1jPhwSLI=";
+    buildTypesAiobotocorePackage "finspace" "3.7.0"
+      "sha256-t8g9Lom5iJi2qLfaLf47VkYYL55CcNFPrUcGRIWCJ+c=";
 
   types-aiobotocore-finspace-data =
-    buildTypesAiobotocorePackage "finspace-data" "3.2.1"
-      "sha256-2vLEv5tkSnOyP7xnXQM7foj9LtsKt0jr27RJrkn18jQ=";
+    buildTypesAiobotocorePackage "finspace-data" "3.7.0"
+      "sha256-0sObPw4IwlgJaz4OBBzPXmfXXdIhBvMTjrGZC4BEm7M=";
 
   types-aiobotocore-firehose =
-    buildTypesAiobotocorePackage "firehose" "3.2.1"
-      "sha256-PauOGozty1cFz8MKB3gOrsHiJBIqou0FsJ4fxPmw0eY=";
+    buildTypesAiobotocorePackage "firehose" "3.7.0"
+      "sha256-6PJCcEqA7WU4KI0I7un/WAHJlGYefmHsvz2wZzVoOZU=";
 
   types-aiobotocore-fis =
-    buildTypesAiobotocorePackage "fis" "3.2.1"
-      "sha256-dA36hWseFbqVeqs/q9NHvXSsKb7w/vZbClecKdHQxmM=";
+    buildTypesAiobotocorePackage "fis" "3.7.0"
+      "sha256-w3KkeY2i795vZk7SJHN+LIhscs8rt9HjhnWDnVbE12Q=";
 
   types-aiobotocore-fms =
-    buildTypesAiobotocorePackage "fms" "3.2.1"
-      "sha256-omOj1TdjCnogJ3/7fXjRM6Z30jTJUGLVpXoK//hnUW4=";
+    buildTypesAiobotocorePackage "fms" "3.7.0"
+      "sha256-28IP5s87+Dzl7VbuEtfXeVD5d8M/Gg7DMiy7pp6g2t8=";
 
   types-aiobotocore-forecast =
-    buildTypesAiobotocorePackage "forecast" "3.2.1"
-      "sha256-oJLjNjRp0kF4eklm8GeFnEJFTrkmJukS2ACwnE/KENU=";
+    buildTypesAiobotocorePackage "forecast" "3.7.0"
+      "sha256-V8126NUZHRY3Jn/vSZZZbyCH6OhZy1Di6oJrq0wjSkU=";
 
   types-aiobotocore-forecastquery =
-    buildTypesAiobotocorePackage "forecastquery" "3.2.1"
-      "sha256-cri15TpHfYUOoXy1Mh0zVKOs2gPsI5UvjlJOU+Szkyk=";
+    buildTypesAiobotocorePackage "forecastquery" "3.7.0"
+      "sha256-8IUJNiOh9iFfoThoj2AcGasifp7/nJHtE/6pjrmf0Zs=";
 
   types-aiobotocore-frauddetector =
-    buildTypesAiobotocorePackage "frauddetector" "3.2.1"
-      "sha256-eLRV9FIkbdvurf+o4Dh03JwrSkBmC1gqoxWYTmmniTQ=";
+    buildTypesAiobotocorePackage "frauddetector" "3.7.0"
+      "sha256-nSeI67wVdDKP6VV4+EW/zCWYNtXq87db6cKI2qgTkrA=";
 
   types-aiobotocore-freetier =
-    buildTypesAiobotocorePackage "freetier" "3.2.1"
-      "sha256-/rHJTvgFvbGzd9G3/nekHdEZ8LNQ9wYd4gTwW8q5Q+Q=";
+    buildTypesAiobotocorePackage "freetier" "3.7.0"
+      "sha256-6LoNmKGMSUFkO2Wmu31ZIdEGf6aOGqYaO4mSOP6inM8=";
 
   types-aiobotocore-fsx =
-    buildTypesAiobotocorePackage "fsx" "3.2.1"
-      "sha256-GC6Hy1aarU26qvE7/Ralyp3rDXfP5vK6S4t9mKgPOVQ=";
+    buildTypesAiobotocorePackage "fsx" "3.7.0"
+      "sha256-FpSKdklaIzkvpDjbCFZcRDRrKevDNJHaXMcg63H3xbI=";
 
   types-aiobotocore-gamelift =
-    buildTypesAiobotocorePackage "gamelift" "3.2.1"
-      "sha256-zyWZdWdNI9WYFzH50G4ee+L6KAjRZO/8HlDcRCLIx6M=";
+    buildTypesAiobotocorePackage "gamelift" "3.7.0"
+      "sha256-1oTB45z6BWf2eH66AsCkEspteBL+374Kwp/JliSQaMA=";
 
   types-aiobotocore-gamesparks =
     buildTypesAiobotocorePackage "gamesparks" "2.7.0"
       "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8=";
 
   types-aiobotocore-glacier =
-    buildTypesAiobotocorePackage "glacier" "3.2.1"
-      "sha256-RgsVt4yCAx/QWcjVePVGQE63JZhFRzmFVXCG9FYFF5Q=";
+    buildTypesAiobotocorePackage "glacier" "3.7.0"
+      "sha256-bmdHgVjAEJ5mS7CaHtR37giYYyVGenASbSDUhsPyQGQ=";
 
   types-aiobotocore-globalaccelerator =
-    buildTypesAiobotocorePackage "globalaccelerator" "3.2.1"
-      "sha256-+L+Tk0yKCHlKXE+Alz/Dy6WeJ7gzSwkKM+qnDnP6dro=";
+    buildTypesAiobotocorePackage "globalaccelerator" "3.7.0"
+      "sha256-fXtV1XhEYW8bWE0C2nbMK9BCr/dO6tCIskANVi8SA4Q=";
 
   types-aiobotocore-glue =
-    buildTypesAiobotocorePackage "glue" "3.2.1"
-      "sha256-cdToQBx5PYym+pF51brZ5KHAyRrChcbveIxLg1cEF9o=";
+    buildTypesAiobotocorePackage "glue" "3.7.0"
+      "sha256-5WlTOidHtsVh3rKxpfIufALneg+9g9o+D5xfrLSEFPo=";
 
   types-aiobotocore-grafana =
-    buildTypesAiobotocorePackage "grafana" "3.2.1"
-      "sha256-v5f/22MseAvs4mr8JzSGzZ+XupsU5K2apDDfBK8PvDo=";
+    buildTypesAiobotocorePackage "grafana" "3.7.0"
+      "sha256-/qUvIz/Li2P/Bh5wEY+TaYgNqFGvHrl5OOoeV550ofE=";
 
   types-aiobotocore-greengrass =
-    buildTypesAiobotocorePackage "greengrass" "3.2.1"
-      "sha256-EpP4arTgD08qugQTi+hD7tTbxUqFuWf82TSlGwC6Pjo=";
+    buildTypesAiobotocorePackage "greengrass" "3.7.0"
+      "sha256-KHcqQIUtGuW2x/ETnvscsNZFbovB+qM5O/WE2o/8lL4=";
 
   types-aiobotocore-greengrassv2 =
-    buildTypesAiobotocorePackage "greengrassv2" "3.2.1"
-      "sha256-AiwG8aQ5sUCL0lvsE4paacWPDC/yrtt0tYlxfs7ZyZg=";
+    buildTypesAiobotocorePackage "greengrassv2" "3.7.0"
+      "sha256-Qm1UqudmcuKKghvAlxU8EclyUEtcnOld2Xt7Z4ihF+8=";
 
   types-aiobotocore-groundstation =
-    buildTypesAiobotocorePackage "groundstation" "3.2.1"
-      "sha256-kqLeDSUN88R45pALL6aOfMTQd68peEvNn8FjWLUMjrg=";
+    buildTypesAiobotocorePackage "groundstation" "3.7.0"
+      "sha256-3/13REWwu1NoIp//wwKMEV37Gvz+guE7Cogo74kCPr4=";
 
   types-aiobotocore-guardduty =
-    buildTypesAiobotocorePackage "guardduty" "3.2.1"
-      "sha256-ZFVv+n1TYdzaqgfc9ZaEh3TbpNTGYpw+v5njCBvN9oA=";
+    buildTypesAiobotocorePackage "guardduty" "3.7.0"
+      "sha256-PxBziC4y1XuBbXj/+rHgkXY3OlI6tTSKIFW4IrhKG6E=";
 
   types-aiobotocore-health =
-    buildTypesAiobotocorePackage "health" "3.2.1"
-      "sha256-psB0ByglXTySUoAumdX68/JVHn6sW4lp6QJSamlFo+0=";
+    buildTypesAiobotocorePackage "health" "3.7.0"
+      "sha256-UFSnAnmBFmTGJ9dcFBV36wY8RwVGUrASNyk6Z0Yifi0=";
 
   types-aiobotocore-healthlake =
-    buildTypesAiobotocorePackage "healthlake" "3.2.1"
-      "sha256-pmGlBAxZI/ijx7VTh9wiJcfTJWOdQYNZF6QcwiwHsJA=";
+    buildTypesAiobotocorePackage "healthlake" "3.7.0"
+      "sha256-Y7rDElgnSITjTebtlR0b2m5PbuNNtW95vzCtXnJj2s4=";
 
   types-aiobotocore-honeycode =
     buildTypesAiobotocorePackage "honeycode" "2.13.0"
       "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io=";
 
   types-aiobotocore-iam =
-    buildTypesAiobotocorePackage "iam" "3.2.1"
-      "sha256-QmSmLk8XJzgbO3tJkKZkHy4JdMve2nRn3bPq4+8GOJY=";
+    buildTypesAiobotocorePackage "iam" "3.7.0"
+      "sha256-oLxt2MuYxZvaicJT6plpLlBCHKNcW6Njv2EfuDtWqQs=";
 
   types-aiobotocore-identitystore =
-    buildTypesAiobotocorePackage "identitystore" "3.2.1"
-      "sha256-YdRNHMjzBWAv7JqriytCh4ma/tbKaq6WdoYx9FWQ8ps=";
+    buildTypesAiobotocorePackage "identitystore" "3.7.0"
+      "sha256-OhEGCdrz/CZdsaiMyQa3+VNhK3SEk4fq0Hgt5UPcr44=";
 
   types-aiobotocore-imagebuilder =
-    buildTypesAiobotocorePackage "imagebuilder" "3.2.1"
-      "sha256-VAtCPVpnl0mk23RQaCOuZr5oEaJNwm0rRnb8Y4iDWqw=";
+    buildTypesAiobotocorePackage "imagebuilder" "3.7.0"
+      "sha256-C6RQGD6FEbIiuEGtvTp//fTFsYRVyFVyXFY6Ke6aUko=";
 
   types-aiobotocore-importexport =
-    buildTypesAiobotocorePackage "importexport" "3.2.1"
-      "sha256-AmDRPzBGPEEemYv34mfc6ZEsarsEG4fRa1RKmUl8FcE=";
+    buildTypesAiobotocorePackage "importexport" "3.7.0"
+      "sha256-HfKDrkpoaEBME0yvifeIKZmDhr95eJLti7v7k1226y0=";
 
   types-aiobotocore-inspector =
-    buildTypesAiobotocorePackage "inspector" "3.2.1"
-      "sha256-QNpwlDgw/GNco1e1LyHS1lZr/9Q+han11yxzI/kN/xc=";
+    buildTypesAiobotocorePackage "inspector" "3.7.0"
+      "sha256-Ym9XIYxZ2ufr8YAi4aKDRvN6LUBfC3pNvqjzZB7KMe4=";
 
   types-aiobotocore-inspector2 =
-    buildTypesAiobotocorePackage "inspector2" "3.2.1"
-      "sha256-1gfym8uWOin2y+JHR2+o/QR/4DL6gdQjTiY0wi/QNY0=";
+    buildTypesAiobotocorePackage "inspector2" "3.7.0"
+      "sha256-oIKsmv6K9HJlq6KTmbTr/Xj0k2Hu899zxAQXp27GF/E=";
 
   types-aiobotocore-internetmonitor =
-    buildTypesAiobotocorePackage "internetmonitor" "3.2.1"
-      "sha256-lIIw8MPEmC2dZdTJZXGBRXZeHXiW06f5JM8aI4/QIR0=";
+    buildTypesAiobotocorePackage "internetmonitor" "3.7.0"
+      "sha256-SWzP/8wLy44f4zL+aV3Th758DW52ABuVQd0sgC1umtk=";
 
   types-aiobotocore-iot =
-    buildTypesAiobotocorePackage "iot" "3.2.1"
-      "sha256-qyG1Hae2a/Z0RwZQ7Aukcu63KrONMQF2Ihpk7qor8RI=";
+    buildTypesAiobotocorePackage "iot" "3.7.0"
+      "sha256-tnA7BpHJ4CexvLbhnZoE4vQbb3tFEklZXTbmoUzetpg=";
 
   types-aiobotocore-iot-data =
-    buildTypesAiobotocorePackage "iot-data" "3.2.1"
-      "sha256-BT09f9w9+nfRrFRDQWB29pZrmoCm9nA4skb8en8pWUo=";
+    buildTypesAiobotocorePackage "iot-data" "3.7.0"
+      "sha256-gjikqLNIOKC98pddZMncHdlWLQzjQmHoL6E9RQ4D1jQ=";
 
   types-aiobotocore-iot-jobs-data =
-    buildTypesAiobotocorePackage "iot-jobs-data" "3.2.1"
-      "sha256-BZINFb3Xaxr7lULFTsKwnfQCUfGrcjHzpsXbj5gGqVY=";
+    buildTypesAiobotocorePackage "iot-jobs-data" "3.7.0"
+      "sha256-esbnmtowzZ7lyVOpPV28D8xJ5/FPkQX0Qwm+XMAfv3E=";
 
   types-aiobotocore-iot-roborunner =
     buildTypesAiobotocorePackage "iot-roborunner" "2.12.2"
@@ -700,164 +700,164 @@ in
       "sha256-Yf1vvasgtUxFiEfSrlPq0Q2yhbAOGyRATzid+qYjlj8=";
 
   types-aiobotocore-iotdeviceadvisor =
-    buildTypesAiobotocorePackage "iotdeviceadvisor" "3.2.1"
-      "sha256-9HuIiXz9ob2KtL6fz20zzvngDmniOzTWZYvWzZP0snQ=";
+    buildTypesAiobotocorePackage "iotdeviceadvisor" "3.7.0"
+      "sha256-pAMFk90d66BOEqKkNH+QY1GI5vkf0qFXUlBCgWNcE50=";
 
   types-aiobotocore-iotevents =
-    buildTypesAiobotocorePackage "iotevents" "3.2.1"
-      "sha256-eR/F4PaHjGZSHtpbXoZi3COMntlZBZHyZyYEL+abQ3Q=";
+    buildTypesAiobotocorePackage "iotevents" "3.7.0"
+      "sha256-isYjEnViFGsgtRDb3Y2i9vTCjqDcB88rM8JmxhpxIII=";
 
   types-aiobotocore-iotevents-data =
-    buildTypesAiobotocorePackage "iotevents-data" "3.2.1"
-      "sha256-T44lWUJGxOWZU/L+knpQbYZE6AIrgmki3K1S+k0ZtRI=";
+    buildTypesAiobotocorePackage "iotevents-data" "3.7.0"
+      "sha256-FZZowHBNWFF3pWDNZIG12vR9NbWfWNWxt+IJvZYlp3Y=";
 
   types-aiobotocore-iotfleethub =
     buildTypesAiobotocorePackage "iotfleethub" "2.24.2"
       "sha256-WzdCGMVRCl8x+UswlyApMYMYT3Rvtng0ID2YyV08NzA=";
 
   types-aiobotocore-iotfleetwise =
-    buildTypesAiobotocorePackage "iotfleetwise" "3.2.1"
-      "sha256-vbWcFdU+RUonBLoaq+yMcMGeRTSruvFVUj2unpLPa4c=";
+    buildTypesAiobotocorePackage "iotfleetwise" "3.7.0"
+      "sha256-55pKYrOWYbBoC01qzwB39yqeLwo6itjsLkPn0x8t1TI=";
 
   types-aiobotocore-iotsecuretunneling =
-    buildTypesAiobotocorePackage "iotsecuretunneling" "3.2.1"
-      "sha256-FL4HjOI9HTL6XY3KSNX+Uj854ZTGOuOB9at1Aho3MRY=";
+    buildTypesAiobotocorePackage "iotsecuretunneling" "3.7.0"
+      "sha256-FC1oSqIHnxlIgf3HzIIvfdkQ5kpY+AnAvZBGmY9k8q0=";
 
   types-aiobotocore-iotsitewise =
-    buildTypesAiobotocorePackage "iotsitewise" "3.2.1"
-      "sha256-DRvHhkR85Ahr4jai0jJ6TRHuBBtSFq6UkQnLjYChwuI=";
+    buildTypesAiobotocorePackage "iotsitewise" "3.7.0"
+      "sha256-ev+EX394ua/ZNHMZdWfdvY5JRJi7NHOWvsbxhE1djWc=";
 
   types-aiobotocore-iotthingsgraph =
-    buildTypesAiobotocorePackage "iotthingsgraph" "3.2.1"
-      "sha256-YlMesaZPyavJbNOwYdX2L8lrA826x9IlDof+Z5so9Is=";
+    buildTypesAiobotocorePackage "iotthingsgraph" "3.7.0"
+      "sha256-RAGnwWmRW9BeqxK2qldFMY8fh4Y3QUG4usWFUVJc6ac=";
 
   types-aiobotocore-iottwinmaker =
-    buildTypesAiobotocorePackage "iottwinmaker" "3.2.1"
-      "sha256-EGhPHBtCNhrxqfhDLBSGTiz1m0PAOE/+VTp9pfyte1g=";
+    buildTypesAiobotocorePackage "iottwinmaker" "3.7.0"
+      "sha256-3x/g1dYdAn6B5z+Qc3tIk13LsQx73W+uI91rVrF239o=";
 
   types-aiobotocore-iotwireless =
-    buildTypesAiobotocorePackage "iotwireless" "3.2.1"
-      "sha256-MtprSOnvZNVmRck5WhASSAux+vsYp7mjVqw82DuWG6o=";
+    buildTypesAiobotocorePackage "iotwireless" "3.7.0"
+      "sha256-b25l5Ol+apkVJgq/TCzikX22MU00H9PKLlfF4uaNHLQ=";
 
   types-aiobotocore-ivs =
-    buildTypesAiobotocorePackage "ivs" "3.2.1"
-      "sha256-9duaFRstc0CdyrtG+IkyKRQF+MsnRWC3TRZQ0pyfgbg=";
+    buildTypesAiobotocorePackage "ivs" "3.7.0"
+      "sha256-re7NmI5Qj9tb9+RzxqIlAug6voMuOXi6+xjgptsidfg=";
 
   types-aiobotocore-ivs-realtime =
-    buildTypesAiobotocorePackage "ivs-realtime" "3.2.1"
-      "sha256-f7eZZcQ3XpqPJRMyqTWpONtssbQxbkq7UjftLmbqttM=";
+    buildTypesAiobotocorePackage "ivs-realtime" "3.7.0"
+      "sha256-HvvLL6PYWW/WUUBpDE3PfB7+hRvLLtCOmwobEdPsyYY=";
 
   types-aiobotocore-ivschat =
-    buildTypesAiobotocorePackage "ivschat" "3.2.1"
-      "sha256-ELVyUPZ5HG9tPLfeQPTCroAPCmnSdlPFIEaovXh5G04=";
+    buildTypesAiobotocorePackage "ivschat" "3.7.0"
+      "sha256-3+cJAl1h7w75HvmMvDoG2brOfMzTBvnHh88BhXmkyic=";
 
   types-aiobotocore-kafka =
-    buildTypesAiobotocorePackage "kafka" "3.2.1"
-      "sha256-BV1jDRSBWhJA0PHpX69AsW/zNk8157lD5TEtd2XMrrU=";
+    buildTypesAiobotocorePackage "kafka" "3.7.0"
+      "sha256-W5hU71ZZdOTl1dtlAIKqnAUv39ovzPs4vl/w6KA0gxs=";
 
   types-aiobotocore-kafkaconnect =
-    buildTypesAiobotocorePackage "kafkaconnect" "3.2.1"
-      "sha256-Vqoz8fZKE0VM75V3MX2rzTPJ2UMhauD7F/3/0fHneU0=";
+    buildTypesAiobotocorePackage "kafkaconnect" "3.7.0"
+      "sha256-Gyk43kjQmNt47MR2VbDq4bFWTWJ0UnNDHt2UBFb5tVY=";
 
   types-aiobotocore-kendra =
-    buildTypesAiobotocorePackage "kendra" "3.2.1"
-      "sha256-9F409tTUXcMrO5WW1W+icYPa50uNGoFRgaPVrii7XHo=";
+    buildTypesAiobotocorePackage "kendra" "3.7.0"
+      "sha256-ebBScLc20kfdnKm2os6n7MUrGTeZo6eXYR7nJCzergc=";
 
   types-aiobotocore-kendra-ranking =
-    buildTypesAiobotocorePackage "kendra-ranking" "3.2.1"
-      "sha256-FTfgUGJ1Kuqij4N34WsKAb6XgilfJq1//wmEqtY9XP4=";
+    buildTypesAiobotocorePackage "kendra-ranking" "3.7.0"
+      "sha256-SMSIoG34aeFm197vQAe2KQHEtGApUya2sY6othhRYRQ=";
 
   types-aiobotocore-keyspaces =
-    buildTypesAiobotocorePackage "keyspaces" "3.2.1"
-      "sha256-9o1dX1IGic5HswhpU6+EanVQy46Lr8DvxnCekiGMBEk=";
+    buildTypesAiobotocorePackage "keyspaces" "3.7.0"
+      "sha256-OIb4U993Ofjb11F5Rr0B722LrT280M9bAgebbrqcdlU=";
 
   types-aiobotocore-kinesis =
-    buildTypesAiobotocorePackage "kinesis" "3.2.1"
-      "sha256-WczxTlmTLeUsxnVKDMcmbt63ybMScJRpc3sCXG4Kl/Y=";
+    buildTypesAiobotocorePackage "kinesis" "3.7.0"
+      "sha256-0kUorAAX8c85DaK1tLCB3+kfRhSLgLeymwW+P07lh70=";
 
   types-aiobotocore-kinesis-video-archived-media =
-    buildTypesAiobotocorePackage "kinesis-video-archived-media" "3.2.1"
-      "sha256-TwofOitJ1Ow7ekYtI8nsujFvaTBhPWqE/Vz6vntbYU4=";
+    buildTypesAiobotocorePackage "kinesis-video-archived-media" "3.7.0"
+      "sha256-/+d8uU49ECUa8n54rHI+35fG7wwXBHpblf1HZiAKSu4=";
 
   types-aiobotocore-kinesis-video-media =
-    buildTypesAiobotocorePackage "kinesis-video-media" "3.2.1"
-      "sha256-8sQnf4WriPXkRh3InfjuxFfSDhYf3kl3J47T1CJKwLU=";
+    buildTypesAiobotocorePackage "kinesis-video-media" "3.7.0"
+      "sha256-R+guEYKMgzXxZUF8QKi833hJ6XaLMmxWAWy91ncXll4=";
 
   types-aiobotocore-kinesis-video-signaling =
-    buildTypesAiobotocorePackage "kinesis-video-signaling" "3.2.1"
-      "sha256-uioUpzxKT1Xj1iNcOkrlZaUgdYoagqKV21CEKD/HTIs=";
+    buildTypesAiobotocorePackage "kinesis-video-signaling" "3.7.0"
+      "sha256-BVcx4TGVRYZTuOOZzg2Iks5TXeq+vAFcij+QSeQ9svE=";
 
   types-aiobotocore-kinesis-video-webrtc-storage =
-    buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "3.2.1"
-      "sha256-S52o0JK/cbeC9YBspUiZDrnXlSPQ5eh/hrj3nP+Zby8=";
+    buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "3.7.0"
+      "sha256-TEfXDpFrxyyiEzkzPUQsA+m6nmkGH/HeeGX4BroBuNo=";
 
   types-aiobotocore-kinesisanalytics =
-    buildTypesAiobotocorePackage "kinesisanalytics" "3.2.1"
-      "sha256-3N2rxTc+iL4UeQN0wvrmiFWnh5gY3+JbunTP+bhhWjs=";
+    buildTypesAiobotocorePackage "kinesisanalytics" "3.7.0"
+      "sha256-A+WSXNq/LSaMeAvBKSk9VQWysF29DoJydiyDwyZFuus=";
 
   types-aiobotocore-kinesisanalyticsv2 =
-    buildTypesAiobotocorePackage "kinesisanalyticsv2" "3.2.1"
-      "sha256-XTtHrbXtXzfcU/Y9/BFOIrCd5H5824dmCRhBz/3JUnA=";
+    buildTypesAiobotocorePackage "kinesisanalyticsv2" "3.7.0"
+      "sha256-iI3raCdgb2HEECR24HsqRDma9aJKR16gxWPLjsxpTEQ=";
 
   types-aiobotocore-kinesisvideo =
-    buildTypesAiobotocorePackage "kinesisvideo" "3.2.1"
-      "sha256-d9r8IfRbaGErkPJmJXGvbCNxCUU6xkTykbyfUVtKx1w=";
+    buildTypesAiobotocorePackage "kinesisvideo" "3.7.0"
+      "sha256-K4gHQR6Brhb/kV0Cwkq9Oi9VsQD+3AgerzOIegrbgCc=";
 
   types-aiobotocore-kms =
-    buildTypesAiobotocorePackage "kms" "3.2.1"
-      "sha256-xG28gKqBmpQ59GqK7YaKpxezhwc+aVlTnAnl7U9LQTE=";
+    buildTypesAiobotocorePackage "kms" "3.7.0"
+      "sha256-DSa+PtKezDfUDyY2SGSZw373zWrrRTe6s08lUK/DAz0=";
 
   types-aiobotocore-lakeformation =
-    buildTypesAiobotocorePackage "lakeformation" "3.2.1"
-      "sha256-E7XWRHvbwZW8hgpE/xqKJBsT/V67+bfWmhoBlVBKLLQ=";
+    buildTypesAiobotocorePackage "lakeformation" "3.7.0"
+      "sha256-hS3yT+IU7Xcaw1xZX70d3wj3T+7r00jbmrVARsLp39c=";
 
   types-aiobotocore-lambda =
-    buildTypesAiobotocorePackage "lambda" "3.2.1"
-      "sha256-738hgZjnnZiEUOMPK49Om6+PcoZ6NqegS15nKMAeCO4=";
+    buildTypesAiobotocorePackage "lambda" "3.7.0"
+      "sha256-KTfLhBF5045trIEuHci7qjqvNVdJhAKaHcrIv/T4sxw=";
 
   types-aiobotocore-lex-models =
-    buildTypesAiobotocorePackage "lex-models" "3.2.1"
-      "sha256-lNJcZgjb1pJEiJdVX2eESt4ock7lPM8wfejuc8XBbio=";
+    buildTypesAiobotocorePackage "lex-models" "3.7.0"
+      "sha256-b4anWJAGn8cL9SQjCMFf9xNcOOY0MclOU9ecEnJotCk=";
 
   types-aiobotocore-lex-runtime =
-    buildTypesAiobotocorePackage "lex-runtime" "3.2.1"
-      "sha256-O4B4Aq7BfIgQnxSqd6O/xu1kIBJ/0QbG0hJSuWC2Hzs=";
+    buildTypesAiobotocorePackage "lex-runtime" "3.7.0"
+      "sha256-hhjmbBwTzimKrqE159ibSh+DtoTHzA9YlnkYGwJJnJc=";
 
   types-aiobotocore-lexv2-models =
-    buildTypesAiobotocorePackage "lexv2-models" "3.2.1"
-      "sha256-pEzFmkUdiICdK8E5rS6UckzKSAc5O4HnqvOFc7X8BjU=";
+    buildTypesAiobotocorePackage "lexv2-models" "3.7.0"
+      "sha256-vV/4Nl3ELcNSV7lZ65ViOHvpioqOEtTRSyHOVQfT73s=";
 
   types-aiobotocore-lexv2-runtime =
-    buildTypesAiobotocorePackage "lexv2-runtime" "3.2.1"
-      "sha256-I/JgmAOnCcM5D9leooAVDiTCbQmF5bYy7Sknqov6csQ=";
+    buildTypesAiobotocorePackage "lexv2-runtime" "3.7.0"
+      "sha256-2UYtKDytIwMT1zLAn4dUxICrpNFWR+kBsThvCxK8aJQ=";
 
   types-aiobotocore-license-manager =
-    buildTypesAiobotocorePackage "license-manager" "3.2.1"
-      "sha256-boEkvX1S5ryyJvMgqc+wOUkLW4k4T2vEFUn3gT3cKgI=";
+    buildTypesAiobotocorePackage "license-manager" "3.7.0"
+      "sha256-nKN9IeGRw61x19GZ4y5icE+dAMB0GXHIRT8oh4WpRKw=";
 
   types-aiobotocore-license-manager-linux-subscriptions =
-    buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "3.2.1"
-      "sha256-6/h4W6J8qXRVFlHfr5FFrMxOKDPPvjdO8/Q5IZxFqcQ=";
+    buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "3.7.0"
+      "sha256-p4NDE7+zD79nrrIYOaVz8lkBD90AfhCevcbkfqfY1Eg=";
 
   types-aiobotocore-license-manager-user-subscriptions =
-    buildTypesAiobotocorePackage "license-manager-user-subscriptions" "3.2.1"
-      "sha256-1ynYmau1NOiax29w9lgqDTx0DfE+kztcQsAQoG7AZVU=";
+    buildTypesAiobotocorePackage "license-manager-user-subscriptions" "3.7.0"
+      "sha256-mGF2VTVdjbLl8BHd3UY0qoC9YsffI2q118O+s9tTQxI=";
 
   types-aiobotocore-lightsail =
-    buildTypesAiobotocorePackage "lightsail" "3.2.1"
-      "sha256-PGiMTl2XheFBiIicH0efeLPduEjkh4MBXSD4Gk5X2Go=";
+    buildTypesAiobotocorePackage "lightsail" "3.7.0"
+      "sha256-pV3XxpkyNwhhhPcxm6oKYqvYblQs2YljltZqo1uMlq8=";
 
   types-aiobotocore-location =
-    buildTypesAiobotocorePackage "location" "3.2.1"
-      "sha256-hTX+mATs050pJN+L8ABOs7Uv1Za6jzAtZ3BDLg75+Hc=";
+    buildTypesAiobotocorePackage "location" "3.7.0"
+      "sha256-aKRDwrS6IJXcLr/YDFAsdfOHW7z9yOGALqwDcTd22UY=";
 
   types-aiobotocore-logs =
-    buildTypesAiobotocorePackage "logs" "3.2.1"
-      "sha256-Z8+SYDyxC4VHzjkeRFU5ZIzBWS27odZc9e+WVsPlrog=";
+    buildTypesAiobotocorePackage "logs" "3.7.0"
+      "sha256-rLnfIWBZb/NlO7JJ3l6H/1upo5QXl7ti1cSZfwjzzKs=";
 
   types-aiobotocore-lookoutequipment =
-    buildTypesAiobotocorePackage "lookoutequipment" "3.2.1"
-      "sha256-SSICvtlyLtFavBp8D9vjHOl7GDHN+eSWLM4vfpw4dnQ=";
+    buildTypesAiobotocorePackage "lookoutequipment" "3.7.0"
+      "sha256-50MhZxpCiPxReKMwF0W+5QGXwPNU4Y//TwHKHvlhxA8=";
 
   types-aiobotocore-lookoutmetrics =
     buildTypesAiobotocorePackage "lookoutmetrics" "2.24.2"
@@ -868,164 +868,164 @@ in
       "sha256-HvNqynXLpYFJceCmrlncodqWuoczilMB8QtbCS5pcDM=";
 
   types-aiobotocore-m2 =
-    buildTypesAiobotocorePackage "m2" "3.2.1"
-      "sha256-BN6xRifz7jMUOBqXHZdJB77RuB/7ZRB/vxh0aOSB4F4=";
+    buildTypesAiobotocorePackage "m2" "3.7.0"
+      "sha256-2cKO/R6yT7uP7+CFfPPMi/e+yR7O/14hqp6XY8CaalM=";
 
   types-aiobotocore-machinelearning =
-    buildTypesAiobotocorePackage "machinelearning" "3.2.1"
-      "sha256-nRlA+RelYP85DRJxccihMaKKnDXy0fzVXsGc+hvrYaU=";
+    buildTypesAiobotocorePackage "machinelearning" "3.7.0"
+      "sha256-0n8nOUlpG2DwLItruS0rV9f5tPLNb1FxQilq02+qvBM=";
 
   types-aiobotocore-macie =
     buildTypesAiobotocorePackage "macie" "2.7.0"
       "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw=";
 
   types-aiobotocore-macie2 =
-    buildTypesAiobotocorePackage "macie2" "3.2.1"
-      "sha256-HMODETSrEtk1CaHsNeN9bHC44B37JCIhWk13epeCP/8=";
+    buildTypesAiobotocorePackage "macie2" "3.7.0"
+      "sha256-26ohDMcZu1D2LdKL4+g6nGnJj1wA37Ap7hpnwk1ndYM=";
 
   types-aiobotocore-managedblockchain =
-    buildTypesAiobotocorePackage "managedblockchain" "3.2.1"
-      "sha256-Q7oNqI+TYRrscYEa7V1+Iqg7W2hQLzBGCGVCV83AfYk=";
+    buildTypesAiobotocorePackage "managedblockchain" "3.7.0"
+      "sha256-h0FB2boqcLTxH41i354OXTd7K3KORVSn/kaBaHXuCIg=";
 
   types-aiobotocore-managedblockchain-query =
-    buildTypesAiobotocorePackage "managedblockchain-query" "3.2.1"
-      "sha256-ZeeNrUp6PL5xKaqCXOFGxHN5Y+rUP4wMXFWBlSZY0Yc=";
+    buildTypesAiobotocorePackage "managedblockchain-query" "3.7.0"
+      "sha256-Z93SanbnjcJNE6LMsQ1nXoTBvXziH0cDA6QpLUZgfdM=";
 
   types-aiobotocore-marketplace-catalog =
-    buildTypesAiobotocorePackage "marketplace-catalog" "3.2.1"
-      "sha256-vWGYan8Z1T8TFQsCkZwNVVEcMkyUKz6w0iS/Kei4iNI=";
+    buildTypesAiobotocorePackage "marketplace-catalog" "3.7.0"
+      "sha256-50F8u/yNHqPP9ajuQxsaswZ7/THwa6Qb3tN0dH5KJ6A=";
 
   types-aiobotocore-marketplace-entitlement =
-    buildTypesAiobotocorePackage "marketplace-entitlement" "3.2.1"
-      "sha256-+AJBzPJ9JuUdRjZllHl0OK8H53l+byDUkyKbCxDcfck=";
+    buildTypesAiobotocorePackage "marketplace-entitlement" "3.7.0"
+      "sha256-EDOLl8tLN9bkkY5xlvJ0DriSUd6zKDN69FWvy4d1iNE=";
 
   types-aiobotocore-marketplacecommerceanalytics =
-    buildTypesAiobotocorePackage "marketplacecommerceanalytics" "3.2.1"
-      "sha256-QBYh0o2BQKbLCBr/+HmpEc6JIQa00ePywQpK1yYCitI=";
+    buildTypesAiobotocorePackage "marketplacecommerceanalytics" "3.7.0"
+      "sha256-O6rRe0lXvmRJT2rWuxtedQTKURsa8JtcIsWbKqEQrx4=";
 
   types-aiobotocore-mediaconnect =
-    buildTypesAiobotocorePackage "mediaconnect" "3.2.1"
-      "sha256-g6OQ3H71h+N7qNqIoF6sOQMlXPlChIHUN1o29oVNFSs=";
+    buildTypesAiobotocorePackage "mediaconnect" "3.7.0"
+      "sha256-RbLOw72DKVB2FVEvXMDa8Ouio338eVbjvQFrl7tgyv8=";
 
   types-aiobotocore-mediaconvert =
-    buildTypesAiobotocorePackage "mediaconvert" "3.2.1"
-      "sha256-dX4W8faUuJUrwI1UUBD4+Mnj0PQgO8tyA+0kkse3qA0=";
+    buildTypesAiobotocorePackage "mediaconvert" "3.7.0"
+      "sha256-GVkMEMBN+gZ5uNs9OIGUJdqP4xu9r4Lfmqx9PQhr/5o=";
 
   types-aiobotocore-medialive =
-    buildTypesAiobotocorePackage "medialive" "3.2.1"
-      "sha256-Y+WCrFmL0yuRHLJfMwRct3ReIUEtWPHOgz9nq/gE9e4=";
+    buildTypesAiobotocorePackage "medialive" "3.7.0"
+      "sha256-bgPnY/uoux2DMJLXckptUZ8i+JykTuGHpI0Rryee0x0=";
 
   types-aiobotocore-mediapackage =
-    buildTypesAiobotocorePackage "mediapackage" "3.2.1"
-      "sha256-rmODBsHNWvO/qTdSiBgyoGT3hur+8jLnnD3U7Vh3EbM=";
+    buildTypesAiobotocorePackage "mediapackage" "3.7.0"
+      "sha256-IbyWAA75EW+gdgoNuAjSmoJPowfWN9QXAcu/PAqHfp4=";
 
   types-aiobotocore-mediapackage-vod =
-    buildTypesAiobotocorePackage "mediapackage-vod" "3.2.1"
-      "sha256-vx/QkfQAz43XA9+cCLE5E9ktHUwjfn/DKgwPMsnl0Ko=";
+    buildTypesAiobotocorePackage "mediapackage-vod" "3.7.0"
+      "sha256-+IN5LP5YXdPMD0bFtV7fTbdCSfHUBnYVwv/9ViSbTbY=";
 
   types-aiobotocore-mediapackagev2 =
-    buildTypesAiobotocorePackage "mediapackagev2" "3.2.1"
-      "sha256-0tj2uhkWUT2XwQnTsrqDiL+D/UJmbGCLPxReacQFbT8=";
+    buildTypesAiobotocorePackage "mediapackagev2" "3.7.0"
+      "sha256-cdanrM2oyC1WB1A7QqHwWP05TSMM5znFsBuMEywpqRk=";
 
   types-aiobotocore-mediastore =
-    buildTypesAiobotocorePackage "mediastore" "3.2.1"
-      "sha256-bGHz8CN5FDJn4KA/v1tjBQc4sTkV0ERMdUEa4Gl8WMU=";
+    buildTypesAiobotocorePackage "mediastore" "3.7.0"
+      "sha256-fH7AhkoSIS8H/WpDCFPMGoHysKm7om5WOvxQV0PRpkw=";
 
   types-aiobotocore-mediastore-data =
-    buildTypesAiobotocorePackage "mediastore-data" "3.2.1"
-      "sha256-3kDlrFVbtEtG11iCn9w28x5O+PXDAaGrNyjAxtXBdBU=";
+    buildTypesAiobotocorePackage "mediastore-data" "3.7.0"
+      "sha256-Rf/YMU/+87Ow46SYOTo31Bw4f4vNa2ehl/+MviHAiBU=";
 
   types-aiobotocore-mediatailor =
-    buildTypesAiobotocorePackage "mediatailor" "3.2.1"
-      "sha256-9v1DJKboH/0yPV4U1vN40QJyxW/ZdJxuSmIe0ypMgug=";
+    buildTypesAiobotocorePackage "mediatailor" "3.7.0"
+      "sha256-f0oWra49sGxwHanbiGL/Tr4jtmW+L/ZebuoihIbJ8RI=";
 
   types-aiobotocore-medical-imaging =
-    buildTypesAiobotocorePackage "medical-imaging" "3.2.1"
-      "sha256-0IWgZUW0y5M5cn1C6u4XbRmsLmxabxuYipcA3TnpPaM=";
+    buildTypesAiobotocorePackage "medical-imaging" "3.7.0"
+      "sha256-LiXRPLNDdD3EZtxA91KE7PwQeuu7UTMy4h2+2UyvAu4=";
 
   types-aiobotocore-memorydb =
-    buildTypesAiobotocorePackage "memorydb" "3.2.1"
-      "sha256-M6LN5N95I07Y29HUaoaXOmOf6oCj5+Ghcw2EhOC9uNo=";
+    buildTypesAiobotocorePackage "memorydb" "3.7.0"
+      "sha256-4koH10MxS7Fspt/46Fl9fDP2n9qQZr+xjBbIkB6neFE=";
 
   types-aiobotocore-meteringmarketplace =
-    buildTypesAiobotocorePackage "meteringmarketplace" "3.2.1"
-      "sha256-Fty1B+miLuYOeSkBvVxvC1VeVoDRvbUsnTEm3Yt1wIU=";
+    buildTypesAiobotocorePackage "meteringmarketplace" "3.7.0"
+      "sha256-QfWmkSyhQaGvKJUzouVjuvuMZNKI05D9z711X8JXwqA=";
 
   types-aiobotocore-mgh =
-    buildTypesAiobotocorePackage "mgh" "3.2.1"
-      "sha256-sw/dRCudCHwXO6oOZi1bEa7i4hqyqyZsYJJ3ivHBAGU=";
+    buildTypesAiobotocorePackage "mgh" "3.7.0"
+      "sha256-Fblevjw0kgxdiGZiDOW9weTde0/bvOJnbxy6SYzbeJQ=";
 
   types-aiobotocore-mgn =
-    buildTypesAiobotocorePackage "mgn" "3.2.1"
-      "sha256-O061rdUehKtWhJH6ApMumc4t1oZhriKufC8iL7Fg1AY=";
+    buildTypesAiobotocorePackage "mgn" "3.7.0"
+      "sha256-7pHSbM1pbFCFYyZyVHtNeR4I1NpzVn5PJTHCGSQOTI0=";
 
   types-aiobotocore-migration-hub-refactor-spaces =
-    buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "3.2.1"
-      "sha256-J4JOv8+lmgsDVhu9ywUV4/YwaM/uemmCNN/VIKAlcHE=";
+    buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "3.7.0"
+      "sha256-i6mS7XiOv2p01gGEYG6Fxfrv8pu/gBSTUTbPKmIZqTw=";
 
   types-aiobotocore-migrationhub-config =
-    buildTypesAiobotocorePackage "migrationhub-config" "3.2.1"
-      "sha256-SrigwJu9Bpmx3Lm3CA+OLaV/ckj3x6BbO0aeZ4Ipay0=";
+    buildTypesAiobotocorePackage "migrationhub-config" "3.7.0"
+      "sha256-BqDHdM/QIuPZJGmFPULrcd4iBmgtIbZ9/YJgpkFyN7E=";
 
   types-aiobotocore-migrationhuborchestrator =
-    buildTypesAiobotocorePackage "migrationhuborchestrator" "3.2.1"
-      "sha256-4NiHFSsqo7RJTsWSJj8/tcrmXmSgsPsc7gn9j7ZNJcY=";
+    buildTypesAiobotocorePackage "migrationhuborchestrator" "3.7.0"
+      "sha256-y60op/mf/uCaRS2/VVVEV5rFnjRwgX7KuS3Londw6wM=";
 
   types-aiobotocore-migrationhubstrategy =
-    buildTypesAiobotocorePackage "migrationhubstrategy" "3.2.1"
-      "sha256-+rvM2g2VfaDw4CRaqhdoKHvs22OEUFFeU7zYXD8iYDw=";
+    buildTypesAiobotocorePackage "migrationhubstrategy" "3.7.0"
+      "sha256-ajIv0gOby+w/hFcsqJGVZavdNtwSOyopLW1eV3piQTg=";
 
   types-aiobotocore-mobile =
     buildTypesAiobotocorePackage "mobile" "2.13.2"
       "sha256-OxB91BCAmYnY72JBWZaBlEkpAxN2Q5aY4i1Pt3eD9hc=";
 
   types-aiobotocore-mq =
-    buildTypesAiobotocorePackage "mq" "3.2.1"
-      "sha256-27kI5jdOfoZYy571GDVhuk4htdTUOTPGI7Mt2CDYBa4=";
+    buildTypesAiobotocorePackage "mq" "3.7.0"
+      "sha256-/GatR9n9ILxDnvBH0pTYAD1kQIm3NYPt4P8/au2YYAY=";
 
   types-aiobotocore-mturk =
-    buildTypesAiobotocorePackage "mturk" "3.2.1"
-      "sha256-v2hpNF8CBlIgIMOyDTQi4LCvwLw3+K/+KyLr1ERM/xE=";
+    buildTypesAiobotocorePackage "mturk" "3.7.0"
+      "sha256-C4nnrlJ967Y5GKawRd+r6pUddZis2J+p+GZJPtWU7w8=";
 
   types-aiobotocore-mwaa =
-    buildTypesAiobotocorePackage "mwaa" "3.2.1"
-      "sha256-Y5/HElUo9gj6hNS+vwh4CbHBP62H37VvE9vu0YyD1jk=";
+    buildTypesAiobotocorePackage "mwaa" "3.7.0"
+      "sha256-zHeGd6dmRpzPsKIFNxlD3OZbNCFH7MHGvy1efCOdvDo=";
 
   types-aiobotocore-neptune =
-    buildTypesAiobotocorePackage "neptune" "3.2.1"
-      "sha256-0yj1fLd/dNlfM600TgfjFvG3gDtOXB8Tl8TVCqJmHoY=";
+    buildTypesAiobotocorePackage "neptune" "3.7.0"
+      "sha256-097F7wyV2MDe6PQb0FVPEBl3lbjASxuBN2L2/OD7Gy8=";
 
   types-aiobotocore-network-firewall =
-    buildTypesAiobotocorePackage "network-firewall" "3.2.1"
-      "sha256-rBozUWkGMBQxn7ip199Scu8Th02Ud/Uk8epPqeZSqwI=";
+    buildTypesAiobotocorePackage "network-firewall" "3.7.0"
+      "sha256-MHIv0SSsCfHTL/toCQIZ3sbS6qNEUgPdtLLFLUzsewU=";
 
   types-aiobotocore-networkmanager =
-    buildTypesAiobotocorePackage "networkmanager" "3.2.1"
-      "sha256-4FkJtmFJnBGIywbHrbCGTd6UM7jBuM+cUNDoQQIqV5Y=";
+    buildTypesAiobotocorePackage "networkmanager" "3.7.0"
+      "sha256-+mrwp/UZkYABXKsj8QCEYPIMWkKKkucrleYZstb2p2c=";
 
   types-aiobotocore-networkmonitor =
-    buildTypesAiobotocorePackage "networkmonitor" "3.2.1"
-      "sha256-EZFVXmK0hm6ygIMC9Ls1BaaFDVSJGYQn6fN4kM9qAEk=";
+    buildTypesAiobotocorePackage "networkmonitor" "3.7.0"
+      "sha256-TACN40HBZMyFJauZxyl/zkZ3E0hpKClXQ7Zu+IQIl4U=";
 
   types-aiobotocore-nimble =
     buildTypesAiobotocorePackage "nimble" "2.15.2"
       "sha256-PChX5Jbgr0d1YaTZU9AbX3cM7NrhkyunK6/X3l+I8Q0=";
 
   types-aiobotocore-oam =
-    buildTypesAiobotocorePackage "oam" "3.2.1"
-      "sha256-Cn70pwIz4hlYaYVXy23yA3Tg9ghIhxyOv0P/pKuCDqY=";
+    buildTypesAiobotocorePackage "oam" "3.7.0"
+      "sha256-MpE/onrGp8MojaOsG7W9XQXmpRBpTg1omX4C3XWRjJE=";
 
   types-aiobotocore-omics =
-    buildTypesAiobotocorePackage "omics" "3.2.1"
-      "sha256-OHIa8WWdH6EVJCz20Rb3rjWewnO3r+/QdjCtYOMWd3Y=";
+    buildTypesAiobotocorePackage "omics" "3.7.0"
+      "sha256-Xl7L6xJuJqrylDv5+TDN6QXlNP9mwcedfOaQVdOBhuw=";
 
   types-aiobotocore-opensearch =
-    buildTypesAiobotocorePackage "opensearch" "3.2.1"
-      "sha256-wg4NREM5zqVf6x9AJA3Vvx8Ed9WOgKWKkw3H1QEUYb8=";
+    buildTypesAiobotocorePackage "opensearch" "3.7.0"
+      "sha256-ICDHHEGzqZjhwJhz6ixzYmbkbi8BAx2xwKMA5VGwxk8=";
 
   types-aiobotocore-opensearchserverless =
-    buildTypesAiobotocorePackage "opensearchserverless" "3.2.1"
-      "sha256-5iJtkLAiXwD6jFAxAsqKuqw3WxI5SGSVeMravUtLMaE=";
+    buildTypesAiobotocorePackage "opensearchserverless" "3.7.0"
+      "sha256-n+Ql55Ez1yBoBPz9liiIBvAd7EOfb426CAI9YnrBnlg=";
 
   types-aiobotocore-opsworks =
     buildTypesAiobotocorePackage "opsworks" "2.24.2"
@@ -1036,92 +1036,92 @@ in
       "sha256-i+qoE5XXWpZ7dQeDagkD2MhnBjwbKTJYyZxATDh8h9M=";
 
   types-aiobotocore-organizations =
-    buildTypesAiobotocorePackage "organizations" "3.2.1"
-      "sha256-pz1b38H9c4vmzVqOfeiilGHaEH5L2iD8EJapJ+Z3hNo=";
+    buildTypesAiobotocorePackage "organizations" "3.7.0"
+      "sha256-hy0V/KEpom/cLWqA05M2gIanqfgwssDmpX8lQRvxrlw=";
 
   types-aiobotocore-osis =
-    buildTypesAiobotocorePackage "osis" "3.2.1"
-      "sha256-chBT9NaQWRybWMEZyunahAwRmxvP8BzqqbkffVYGGdQ=";
+    buildTypesAiobotocorePackage "osis" "3.7.0"
+      "sha256-MScBO8kqGTyiR7QPPHBKiWoRYPumJFKpWMpk3Or9dFQ=";
 
   types-aiobotocore-outposts =
-    buildTypesAiobotocorePackage "outposts" "3.2.1"
-      "sha256-7O8UnA7rwJ+EFMQ1IxslIjk8TFYXuK0DK7yTn1MqrRI=";
+    buildTypesAiobotocorePackage "outposts" "3.7.0"
+      "sha256-X6OpBYzayqIBgf/d7xNjvykOu6F4fBc9wPCsL1EkzLs=";
 
   types-aiobotocore-panorama =
-    buildTypesAiobotocorePackage "panorama" "3.2.1"
-      "sha256-K2CahO6dAokejWGa1nhdWWhEUHitgAhHPiBB6W4c24E=";
+    buildTypesAiobotocorePackage "panorama" "3.7.0"
+      "sha256-yn1EAIvzNfFR1a3r8y9Ri5nOdprgEAYBuXw2Wt1hYIs=";
 
   types-aiobotocore-payment-cryptography =
-    buildTypesAiobotocorePackage "payment-cryptography" "3.2.1"
-      "sha256-/9+APJV5lAK/6PnE3bBqSgxm55Uh26exWB+So/FAdCo=";
+    buildTypesAiobotocorePackage "payment-cryptography" "3.7.0"
+      "sha256-pFRQxEnL6iaxCbPNF3veZE1cUhpdLF/H2+e8BFzRmjI=";
 
   types-aiobotocore-payment-cryptography-data =
-    buildTypesAiobotocorePackage "payment-cryptography-data" "3.2.1"
-      "sha256-yvSZc1F6knLu8Ci+s6SeddHN8b/Kd0qhzisaHXANLOI=";
+    buildTypesAiobotocorePackage "payment-cryptography-data" "3.7.0"
+      "sha256-2JqM7rFvb+GOJj9g34RfnvC658DGxmR2zCmfSn5P3oo=";
 
   types-aiobotocore-personalize =
-    buildTypesAiobotocorePackage "personalize" "3.2.1"
-      "sha256-ZNgyr4S+Uo6fOrLtC2FTSkQ0Fsufw+coG+RtRDoN75o=";
+    buildTypesAiobotocorePackage "personalize" "3.7.0"
+      "sha256-6sYcu1dPGuNButE/QiFxekliyy9FrKwo/56lVe08VbI=";
 
   types-aiobotocore-personalize-events =
-    buildTypesAiobotocorePackage "personalize-events" "3.2.1"
-      "sha256-9OLQnip1AOZW4aGu9ax5ZVB4f+7MNp2oGmT8WQ2MIIk=";
+    buildTypesAiobotocorePackage "personalize-events" "3.7.0"
+      "sha256-LiOfdcaJccXv1gCwIqdJ4mO6BgwR0Qe8+W3/caMA5Zg=";
 
   types-aiobotocore-personalize-runtime =
-    buildTypesAiobotocorePackage "personalize-runtime" "3.2.1"
-      "sha256-JpoMishy4riLZrfg7soCOOkzmtUHQzTa8AWLOoGWk+0=";
+    buildTypesAiobotocorePackage "personalize-runtime" "3.7.0"
+      "sha256-CAvnEMX7hfAKnl8VSUAVk1KLvm4SXMRNR7HlthSzy0k=";
 
   types-aiobotocore-pi =
-    buildTypesAiobotocorePackage "pi" "3.2.1"
-      "sha256-FZY/lMCSe2ftEG4Mi7qiQIGbu6Itxvv3EFQ9Zx5Hcls=";
+    buildTypesAiobotocorePackage "pi" "3.7.0"
+      "sha256-oj2oswbo0sZ9lJ8Sa7Vb9w+Fq2LQTqBK/krZpSyWnzQ=";
 
   types-aiobotocore-pinpoint =
-    buildTypesAiobotocorePackage "pinpoint" "3.2.1"
-      "sha256-7ZzbL/J9DDTdEHRPgJBnas0DgE6iC4POf2HZlVgyoMI=";
+    buildTypesAiobotocorePackage "pinpoint" "3.7.0"
+      "sha256-Od3FqXiKKb0JlpY0xh5RLylKGA6HMmvb4KqeXm/aeKU=";
 
   types-aiobotocore-pinpoint-email =
-    buildTypesAiobotocorePackage "pinpoint-email" "3.2.1"
-      "sha256-xbx3Ln0t3rYWweEiVozRqtge8TRaCX4nr2nxppBws7w=";
+    buildTypesAiobotocorePackage "pinpoint-email" "3.7.0"
+      "sha256-A30vr6kQKDsfHfvmrslKJdbsXLAmhT+pmqFHmQ6q9kc=";
 
   types-aiobotocore-pinpoint-sms-voice =
-    buildTypesAiobotocorePackage "pinpoint-sms-voice" "3.2.1"
-      "sha256-ZW8w0/w+fhnPpTnVxOSTdfWz4kgeP+okMcQCGNywVsY=";
+    buildTypesAiobotocorePackage "pinpoint-sms-voice" "3.7.0"
+      "sha256-t/ijYqFZfqGSUrA1UshxCV4PZsDWQWzcGmUugD5DNgY=";
 
   types-aiobotocore-pinpoint-sms-voice-v2 =
-    buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "3.2.1"
-      "sha256-TWz9Zy5gVdAuEJs0Y0ckDzNjHUlwEsmzsIKmP0Z5laA=";
+    buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "3.7.0"
+      "sha256-0DAOHdYMd/YNmtTOoNcQXh4UDr9A2dJacmck9b2fL8M=";
 
   types-aiobotocore-pipes =
-    buildTypesAiobotocorePackage "pipes" "3.2.1"
-      "sha256-Ryofyph+nzlpbyeykgkRsROhuZqAUuvBx52+B99Wkx8=";
+    buildTypesAiobotocorePackage "pipes" "3.7.0"
+      "sha256-kJXcyOgXif+mmUbU1uKXfsOm94WfgsIcVeymaOHr99U=";
 
   types-aiobotocore-polly =
-    buildTypesAiobotocorePackage "polly" "3.2.1"
-      "sha256-xDELssTDlpKivy3g8lUdZ+w9YCcmtVc/1AjZoS6+bdI=";
+    buildTypesAiobotocorePackage "polly" "3.7.0"
+      "sha256-Ps/gSJwoAMX1NN961uSM5Sxe3hMQewlJgn7A2zwYCis=";
 
   types-aiobotocore-pricing =
-    buildTypesAiobotocorePackage "pricing" "3.2.1"
-      "sha256-IxlKFeqJF4KtV1bvHYbAfuIvawV43thyrlp5xqM0vPQ=";
+    buildTypesAiobotocorePackage "pricing" "3.7.0"
+      "sha256-S+03Ujuxg+PdJzedB3kbDHxBC3JKrdTRiOXtcY2kbfQ=";
 
   types-aiobotocore-privatenetworks =
     buildTypesAiobotocorePackage "privatenetworks" "2.22.0"
       "sha256-yaYvgVKcr3l2eq0dMzmQEZHxgblTLlVF9cZRnObiB7M=";
 
   types-aiobotocore-proton =
-    buildTypesAiobotocorePackage "proton" "3.2.1"
-      "sha256-SbO4tpkbv/ujGQqTyWqbFwHoWjtaHPkdYYI3/C109D8=";
+    buildTypesAiobotocorePackage "proton" "3.7.0"
+      "sha256-muGL/lOWt2mRCQduEOC0jYxPEECeHqNIaIszXwNVCJI=";
 
   types-aiobotocore-qapps =
-    buildTypesAiobotocorePackage "qapps" "3.2.1"
-      "sha256-drb4BNL78H7Rx7YiAHGzvMLqrmh18f2l9vHJqg3Mx/k=";
+    buildTypesAiobotocorePackage "qapps" "3.7.0"
+      "sha256-TKuyEigjUuqx5pNU3CPXce+vpp5l9vvp1vOjL8sr3ec=";
 
   types-aiobotocore-qbusiness =
-    buildTypesAiobotocorePackage "qbusiness" "3.2.1"
-      "sha256-CA+sCkhQYQAcLK5k1G8kqOb/n08uwuJiERDEhVoVgzg=";
+    buildTypesAiobotocorePackage "qbusiness" "3.7.0"
+      "sha256-3OMotaulvLUsnEkpRicSyQNnHfwfG190fSem2+yfKIg=";
 
   types-aiobotocore-qconnect =
-    buildTypesAiobotocorePackage "qconnect" "3.2.1"
-      "sha256-cb+pJvi7TYzJpEQUhyr7q8CVgvPi8fOKg4uc/7yvYJY=";
+    buildTypesAiobotocorePackage "qconnect" "3.7.0"
+      "sha256-PoUit9W0/vnqQIdEUjzAoq8wgLGCN5+Z0gh7MK/akXU=";
 
   types-aiobotocore-qldb =
     buildTypesAiobotocorePackage "qldb" "2.24.2"
@@ -1132,200 +1132,200 @@ in
       "sha256-Lk9RLigcg4F/AsgKneBUoyPyeUh46ra+BLCw94b74eU=";
 
   types-aiobotocore-quicksight =
-    buildTypesAiobotocorePackage "quicksight" "3.2.1"
-      "sha256-yMfVNyz5Zs8FX8Vaqyqj/zaaukmee1m+fNoK3C+Q7YU=";
+    buildTypesAiobotocorePackage "quicksight" "3.7.0"
+      "sha256-XPpNfJlaH5+S1lXX9ExJ/Z7InAira93TQpI73/x+Gck=";
 
   types-aiobotocore-ram =
-    buildTypesAiobotocorePackage "ram" "3.2.1"
-      "sha256-N6Kta9ipM5p+vZiruDTssdX3cCzhEjOXMTtD6HtbEm0=";
+    buildTypesAiobotocorePackage "ram" "3.7.0"
+      "sha256-xXjZghdJfD63mEPatjo3we+wXr+RhUm5SyBLM9DvmbY=";
 
   types-aiobotocore-rbin =
-    buildTypesAiobotocorePackage "rbin" "3.2.1"
-      "sha256-wleDOoYpUs5NC3DZ3wk0/juq5H3CeudDCEbMKUZhtfw=";
+    buildTypesAiobotocorePackage "rbin" "3.7.0"
+      "sha256-lOkl3CjpOZjjpOQT3J8bsP4H7l9JybJX5w352LEAXR0=";
 
   types-aiobotocore-rds =
-    buildTypesAiobotocorePackage "rds" "3.2.1"
-      "sha256-x8J1Iq3XETbsUlmICjiSObe00aEms90CqLTFJl9dhqg=";
+    buildTypesAiobotocorePackage "rds" "3.7.0"
+      "sha256-N1f/0k1IlBzg7UbF/Xuty6DvJLnPdUOxhqDYalVOxJ0=";
 
   types-aiobotocore-rds-data =
-    buildTypesAiobotocorePackage "rds-data" "3.2.1"
-      "sha256-7IR5EN+obGVa21tbypj7jupBvn4jPyO81NKXKshnd0I=";
+    buildTypesAiobotocorePackage "rds-data" "3.7.0"
+      "sha256-9c/PWUy/c/7vrF95M/lZUJ6Fp8PvhBX1Jzff3MeAnpE=";
 
   types-aiobotocore-redshift =
-    buildTypesAiobotocorePackage "redshift" "3.2.1"
-      "sha256-iHrorMUVXyjtP/83uDcutVjIwHdleuF+TeNg6tOjUg0=";
+    buildTypesAiobotocorePackage "redshift" "3.7.0"
+      "sha256-fo9upMExqXAjcQmCeXz9pDXBW4ppOe+EHHj1sOuQvfg=";
 
   types-aiobotocore-redshift-data =
-    buildTypesAiobotocorePackage "redshift-data" "3.2.1"
-      "sha256-GQv46nPIc+4Im4h/U/aD3dqyCaAOLIhSaeMDdlR48ak=";
+    buildTypesAiobotocorePackage "redshift-data" "3.7.0"
+      "sha256-H00XQfkDIBtmhEuAiy2+V+er+P2MsJl841xQAipAcHo=";
 
   types-aiobotocore-redshift-serverless =
-    buildTypesAiobotocorePackage "redshift-serverless" "3.2.1"
-      "sha256-dQZSLQS1s07W6yyTW4hH8TfDSUA6G1zmNeoR2+yRGeU=";
+    buildTypesAiobotocorePackage "redshift-serverless" "3.7.0"
+      "sha256-0PUZiN7F9iQxYxN9ZXb6q60UNu4Ce7sC34TSPOOzyg0=";
 
   types-aiobotocore-rekognition =
-    buildTypesAiobotocorePackage "rekognition" "3.2.1"
-      "sha256-w3lYR88KvRNm6WVqgFaGmgI8qCbrIuoxc+b2nJjIGjk=";
+    buildTypesAiobotocorePackage "rekognition" "3.7.0"
+      "sha256-YEPKovf1EwVjK8MOBfCdASiEYEHoamd+qe+2OcJLO4M=";
 
   types-aiobotocore-resiliencehub =
-    buildTypesAiobotocorePackage "resiliencehub" "3.2.1"
-      "sha256-7iGc+VdUXgoOWHrR3dJAp+SKyk8bBLXBXxi+vT98ODM=";
+    buildTypesAiobotocorePackage "resiliencehub" "3.7.0"
+      "sha256-L+r4SEpkqJ8N06aep1cqUEO8f5fUjJ7tnQs3fCPeIoI=";
 
   types-aiobotocore-resource-explorer-2 =
-    buildTypesAiobotocorePackage "resource-explorer-2" "3.2.1"
-      "sha256-4l0siyoydPTAT6wkRemx9/NxU3+iYq03y1dXhiXabiM=";
+    buildTypesAiobotocorePackage "resource-explorer-2" "3.7.0"
+      "sha256-rxnUK4zmqzgZ7IfnUzSE/koWjbcNoJHMPlLty6Bduz8=";
 
   types-aiobotocore-resource-groups =
-    buildTypesAiobotocorePackage "resource-groups" "3.2.1"
-      "sha256-34CPWuTG6p4yTuRcGz8sGuEL51BkbdIkB0fFl0YmB6k=";
+    buildTypesAiobotocorePackage "resource-groups" "3.7.0"
+      "sha256-Vb1COcRDR4EP2n2bfkAevkzkaFjyQHTIlu9S/mq0TPY=";
 
   types-aiobotocore-resourcegroupstaggingapi =
-    buildTypesAiobotocorePackage "resourcegroupstaggingapi" "3.2.1"
-      "sha256-0FGrUwtPWAqF3RAoShfjG66IeA6JyXoCY8fypeUeLxs=";
+    buildTypesAiobotocorePackage "resourcegroupstaggingapi" "3.7.0"
+      "sha256-67P+o1UgbPWbPUrBBDKlY6CMtobnWn9jb1nKmvesauw=";
 
   types-aiobotocore-robomaker =
     buildTypesAiobotocorePackage "robomaker" "2.24.2"
       "sha256-EczunxMisSO9t2iYzXuzTeFiNalu2EyDRIOE7TW5fOg=";
 
   types-aiobotocore-rolesanywhere =
-    buildTypesAiobotocorePackage "rolesanywhere" "3.2.1"
-      "sha256-RW0b3lAq4bKHx1M1f6P3Xi51SZkgIwM1eIbxOKrVu5U=";
+    buildTypesAiobotocorePackage "rolesanywhere" "3.7.0"
+      "sha256-CyQAy6oRXDsSJV3fGwIJ6oJR8qpnFsh8/hzIV6/LSWI=";
 
   types-aiobotocore-route53 =
-    buildTypesAiobotocorePackage "route53" "3.2.1"
-      "sha256-DD0UA4EPQGlJNsVhOtk4oM3KkYs+3J4KnTDNkIBxbrU=";
+    buildTypesAiobotocorePackage "route53" "3.7.0"
+      "sha256-mxb/hw3iqG9GJk3Wd4ONt0PaMq+7lygpvrdaPuToAAY=";
 
   types-aiobotocore-route53-recovery-cluster =
-    buildTypesAiobotocorePackage "route53-recovery-cluster" "3.2.1"
-      "sha256-qo4vEPHdsHGSyiRJRKTwHsJexL2xf33TzdCbGBgisIE=";
+    buildTypesAiobotocorePackage "route53-recovery-cluster" "3.7.0"
+      "sha256-mWsX2sEiVWRBksrSe47GUB3WM96xcDhN0xJnloCmPVU=";
 
   types-aiobotocore-route53-recovery-control-config =
-    buildTypesAiobotocorePackage "route53-recovery-control-config" "3.2.1"
-      "sha256-Ocaem8tcDUUqoXH+6Milcr/RznX8RG/RhEVDcHKnEd8=";
+    buildTypesAiobotocorePackage "route53-recovery-control-config" "3.7.0"
+      "sha256-3JJvVX0doMsYqLxXJvltUo+NqP1JI9FZTDQU3vGG97w=";
 
   types-aiobotocore-route53-recovery-readiness =
-    buildTypesAiobotocorePackage "route53-recovery-readiness" "3.2.1"
-      "sha256-3dJwWSPU0rBJGB0XU8PS0pIW0FUmBJo5gCxKwUeADek=";
+    buildTypesAiobotocorePackage "route53-recovery-readiness" "3.7.0"
+      "sha256-Oas2bcddDi1jXMtzp3qzYxS/39vWY991hQ56qgVUH2Q=";
 
   types-aiobotocore-route53domains =
-    buildTypesAiobotocorePackage "route53domains" "3.2.1"
-      "sha256-imMNgW31tuywO1xwaevphvNunBxGiiE7md6acTDEw9w=";
+    buildTypesAiobotocorePackage "route53domains" "3.7.0"
+      "sha256-QykAWBDH8SmjG+NKiYxwjGD9YMZ91FGRZCl1z/qfHos=";
 
   types-aiobotocore-route53resolver =
-    buildTypesAiobotocorePackage "route53resolver" "3.2.1"
-      "sha256-kdO+4O1DTOHb+3rQBOL4Xd6oMsxnZsMxz8554ml0fig=";
+    buildTypesAiobotocorePackage "route53resolver" "3.7.0"
+      "sha256-TJx9I+olL/8DZjykkaxwxiGj/MiiCo6/9C6u7ApK/Ss=";
 
   types-aiobotocore-rum =
-    buildTypesAiobotocorePackage "rum" "3.2.1"
-      "sha256-ib+L50tNmn/vOPJq1DPgJvmwh/6JHt7X0Uq9A6htlbE=";
+    buildTypesAiobotocorePackage "rum" "3.7.0"
+      "sha256-BvwQD5G+XSMOGfjIHPi8maS545KRz5h2H/lecsUn9p0=";
 
   types-aiobotocore-s3 =
-    buildTypesAiobotocorePackage "s3" "3.2.1"
-      "sha256-dk8I01LyzE+LhId86aTRAUtFsjJccPEJPtCcDOQfGr0=";
+    buildTypesAiobotocorePackage "s3" "3.7.0"
+      "sha256-bsc4hT27qRM3B5kbmOpNqxn3xi4Cs8ygFubNjj1oRXY=";
 
   types-aiobotocore-s3control =
-    buildTypesAiobotocorePackage "s3control" "3.2.1"
-      "sha256-GlgdKwD/GoTO16Az97Uy1pbDXC8XKi8/jbF/GS1SXro=";
+    buildTypesAiobotocorePackage "s3control" "3.7.0"
+      "sha256-k9XJ+Md/6cehqW4fdDtcqPNqaavwtKN2n86wjmCsX2Y=";
 
   types-aiobotocore-s3outposts =
-    buildTypesAiobotocorePackage "s3outposts" "3.2.1"
-      "sha256-1WQlJ1eb1QV0Vafep7fjQudbuE0J3slMKYldO+Mz1P0=";
+    buildTypesAiobotocorePackage "s3outposts" "3.7.0"
+      "sha256-fHup/cVHoqAPRCZlJ4k/E7GWv5qOBaFjgUJ/gxmW8gY=";
 
   types-aiobotocore-sagemaker =
-    buildTypesAiobotocorePackage "sagemaker" "3.2.1"
-      "sha256-oHO31YDRcuqPHqRuF5UWEfMw/d8XXY45OcMBSf9fYd0=";
+    buildTypesAiobotocorePackage "sagemaker" "3.7.0"
+      "sha256-4/4HYEQaKkwBDaEWAxPsMdCTdxe5s5sC3V75dLfomdA=";
 
   types-aiobotocore-sagemaker-a2i-runtime =
-    buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "3.2.1"
-      "sha256-l1+tAyECU5T/HFLql6X89p5TVSc13wYp6821a1LZVaY=";
+    buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "3.7.0"
+      "sha256-GuYO59sV8hlm9XldWDvf6ZZk8Zaq1sYhHNufrj8fMyA=";
 
   types-aiobotocore-sagemaker-edge =
-    buildTypesAiobotocorePackage "sagemaker-edge" "3.2.1"
-      "sha256-YGkb+KAXlyxrBR/RS3KaxeDC8VFfQ6Kg4DvE0rrC4lI=";
+    buildTypesAiobotocorePackage "sagemaker-edge" "3.7.0"
+      "sha256-AF8Mac03UB+D8D+mRExpHQWfRKRmbvH4vndmErpMxvY=";
 
   types-aiobotocore-sagemaker-featurestore-runtime =
-    buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "3.2.1"
-      "sha256-WEgn+iHqGSZiR/unCdsNTvUPL+l9tYE2YI9ZGtmfHYM=";
+    buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "3.7.0"
+      "sha256-xi4QbdA63RXZ06kuQRtlBujUD9pPZmf54qaULnRAXLE=";
 
   types-aiobotocore-sagemaker-geospatial =
-    buildTypesAiobotocorePackage "sagemaker-geospatial" "3.2.1"
-      "sha256-YM2VJqs/st283b0KUdpNkJbvm+G/c3+hSuZwrCTsBH4=";
+    buildTypesAiobotocorePackage "sagemaker-geospatial" "3.7.0"
+      "sha256-ciTDcE97Z5M/1+cBYMyeMFh2LS+/3xgodw48W9NUpyA=";
 
   types-aiobotocore-sagemaker-metrics =
-    buildTypesAiobotocorePackage "sagemaker-metrics" "3.2.1"
-      "sha256-JZzjrZiEqpp5UCQZI7W9beL/Ro386SZ6eJeeRiCeLXw=";
+    buildTypesAiobotocorePackage "sagemaker-metrics" "3.7.0"
+      "sha256-c8tPLcfg+UNrgUedC4JGEaCtcH3jAk6Ze7Tsgp6I+ew=";
 
   types-aiobotocore-sagemaker-runtime =
-    buildTypesAiobotocorePackage "sagemaker-runtime" "3.2.1"
-      "sha256-jIsggsRIxPLDfUZTy2za0h0wd2tgrQf2glEE6zMrj6E=";
+    buildTypesAiobotocorePackage "sagemaker-runtime" "3.7.0"
+      "sha256-Oi79+FCQgwWve4L2R9505dj8FPi7wD0QjQm9rJHF/0I=";
 
   types-aiobotocore-savingsplans =
-    buildTypesAiobotocorePackage "savingsplans" "3.2.1"
-      "sha256-OckOGxR7NO+5cKLM5tXfxeiJYTgCTfIdncnFMnommbg=";
+    buildTypesAiobotocorePackage "savingsplans" "3.7.0"
+      "sha256-GAWKfDaMToJ/G3djeb8XSIS/+RyCf47ayLF1fpU6XEc=";
 
   types-aiobotocore-scheduler =
-    buildTypesAiobotocorePackage "scheduler" "3.2.1"
-      "sha256-l8FQkWlHdPVRYr7a0qqSF+n6eQEf8+nwjSsGpuyh7Ck=";
+    buildTypesAiobotocorePackage "scheduler" "3.7.0"
+      "sha256-u3QpAhtFisanKievtIuEh8klEeD4IYndPIZ2Nhs7b2U=";
 
   types-aiobotocore-schemas =
-    buildTypesAiobotocorePackage "schemas" "3.2.1"
-      "sha256-WaT2EXW4ElPcD5ydCjef31Es4P2cVNcAsCU+hq5N5aE=";
+    buildTypesAiobotocorePackage "schemas" "3.7.0"
+      "sha256-dtAoC5n52YYx7jGK4Lh8w1onHOrVATM18umOtaCgyBI=";
 
   types-aiobotocore-sdb =
-    buildTypesAiobotocorePackage "sdb" "3.2.1"
-      "sha256-bQQgqCQUALs2o7KQfPYGiXu3NxvqxurT5KGcaj5QkR8=";
+    buildTypesAiobotocorePackage "sdb" "3.7.0"
+      "sha256-ODbg//Vt5WVGWNXWOVL4A7KIvsCuxIaHFL6vwiH4Sso=";
 
   types-aiobotocore-secretsmanager =
-    buildTypesAiobotocorePackage "secretsmanager" "3.2.1"
-      "sha256-SiuMRDx2n1gPA0o6XfPqrdEU3kVdj02WUHLiXhmp/I4=";
+    buildTypesAiobotocorePackage "secretsmanager" "3.7.0"
+      "sha256-Q34iqqWkzProVV2jE28eGsf2xauMp83QTCgQlfbP6d4=";
 
   types-aiobotocore-securityhub =
-    buildTypesAiobotocorePackage "securityhub" "3.2.1"
-      "sha256-OKyyhx2bMIsJ5HwIYAbl9oqYTmaWpGUAI7gGZA5r+S0=";
+    buildTypesAiobotocorePackage "securityhub" "3.7.0"
+      "sha256-zeLPiM5MJa9Rpt+KQD3wZ32qzREmORlcyGlKgc76fQM=";
 
   types-aiobotocore-securitylake =
-    buildTypesAiobotocorePackage "securitylake" "3.2.1"
-      "sha256-r1G7Rfo5KsaTYOd/FYAWO0EUTPMBYZc1vrZiO8RJ8Mo=";
+    buildTypesAiobotocorePackage "securitylake" "3.7.0"
+      "sha256-yCjlmybslu4XxHh2YMnAPg5izH5OFn+vhlcVC1/041Y=";
 
   types-aiobotocore-serverlessrepo =
-    buildTypesAiobotocorePackage "serverlessrepo" "3.2.1"
-      "sha256-kbmRI+sXnHjPM7eAg4/HbG7GPICugK4wVxYzTLbKyTE=";
+    buildTypesAiobotocorePackage "serverlessrepo" "3.7.0"
+      "sha256-e/Cnt9VmuYiv2bTjefIGxp/EwCQjxvNfDvjr5uhL9DU=";
 
   types-aiobotocore-service-quotas =
-    buildTypesAiobotocorePackage "service-quotas" "3.2.1"
-      "sha256-aEsDKuYbigDeLxdnZGIrjsl/63t6MGVJZWVsgyKhzk0=";
+    buildTypesAiobotocorePackage "service-quotas" "3.7.0"
+      "sha256-HpZWg8tYeYg8dwHfxrkukhhPs8fT7fotRMBdVpuWXQw=";
 
   types-aiobotocore-servicecatalog =
-    buildTypesAiobotocorePackage "servicecatalog" "3.2.1"
-      "sha256-WqzkfEHCJoNstqZVZuLCJEE8heyxxxwZw4imEEb9Rlg=";
+    buildTypesAiobotocorePackage "servicecatalog" "3.7.0"
+      "sha256-MsLC/FeRUtLE3tE77WP1uYcewy9yy/6KZFBllyDD0P0=";
 
   types-aiobotocore-servicecatalog-appregistry =
-    buildTypesAiobotocorePackage "servicecatalog-appregistry" "3.2.1"
-      "sha256-+m31s4V2p9oYLN6qKs5TpOWeHzdnJ0QXblq9R8TreWo=";
+    buildTypesAiobotocorePackage "servicecatalog-appregistry" "3.7.0"
+      "sha256-Fj3v0n/jPe8Dk6AoN0AV6jQOMXO3iTpyVg/q7n/GZYY=";
 
   types-aiobotocore-servicediscovery =
-    buildTypesAiobotocorePackage "servicediscovery" "3.2.1"
-      "sha256-4E5myqfcIPFFQ7otx48T9A/gCrUrpDjl+oWeA1wSgwc=";
+    buildTypesAiobotocorePackage "servicediscovery" "3.7.0"
+      "sha256-G2OASowQXGO+aZO3rs/mVQkamhpcXFRGuhUdJsDCugY=";
 
   types-aiobotocore-ses =
-    buildTypesAiobotocorePackage "ses" "3.2.1"
-      "sha256-H3KFx2SyFeWfYB+xue/8FR8r+vLV1JWI+RUBTeY8OdM=";
+    buildTypesAiobotocorePackage "ses" "3.7.0"
+      "sha256-IhpkDDISDM3V8bLoPZ/coORNF2RiaP/tH3IfwfcUcFQ=";
 
   types-aiobotocore-sesv2 =
-    buildTypesAiobotocorePackage "sesv2" "3.2.1"
-      "sha256-NmooLRnWSfNjjek/4S2/YfUrM8iGG8RPw9WvDuoKT5w=";
+    buildTypesAiobotocorePackage "sesv2" "3.7.0"
+      "sha256-7kavM49331R56b+jTP9Wr2Ck3L47HSXlxhWN3zx6fBY=";
 
   types-aiobotocore-shield =
-    buildTypesAiobotocorePackage "shield" "3.2.1"
-      "sha256-a4Hze1HDvvE+wVE2POvy6MIUxmKFO6gP7n7OYdOsE6o=";
+    buildTypesAiobotocorePackage "shield" "3.7.0"
+      "sha256-9cRSeJZANIHvYw0jQiq9miMlOoyyQbc532GZR012ZN0=";
 
   types-aiobotocore-signer =
-    buildTypesAiobotocorePackage "signer" "3.2.1"
-      "sha256-QQw4ci3AfhhDBf1m3oK9L90jHDqBk+RMBnYd47d11ME=";
+    buildTypesAiobotocorePackage "signer" "3.7.0"
+      "sha256-bnVdO2iVvxS5OIf77onZG/mURhiXCq9TnCVZnOnTXjQ=";
 
   types-aiobotocore-simspaceweaver =
-    buildTypesAiobotocorePackage "simspaceweaver" "3.2.1"
-      "sha256-5wLihc+ysV+/1E56VgVe3vWEOcmFPR+rQV4yGJdYZgU=";
+    buildTypesAiobotocorePackage "simspaceweaver" "3.7.0"
+      "sha256-tZQL781zQI+vVvO0S3cHzw5RGAHKXeNeJW7E8tzCHA4=";
 
   types-aiobotocore-sms =
     buildTypesAiobotocorePackage "sms" "2.24.2"
@@ -1336,162 +1336,162 @@ in
       "sha256-nlg8QppdMa4MMLUQZXcxnypzv5II9PqEtuVc09UmjKU=";
 
   types-aiobotocore-snow-device-management =
-    buildTypesAiobotocorePackage "snow-device-management" "3.2.1"
-      "sha256-llCNV+0mjmSuCIgbCa8lyktXA3LGZItO9GWaidr9p7c=";
+    buildTypesAiobotocorePackage "snow-device-management" "3.7.0"
+      "sha256-Jj/YTv6RrQa5/l8N55cqS8PhileL8+2g9SM7d2ZPGjw=";
 
   types-aiobotocore-snowball =
-    buildTypesAiobotocorePackage "snowball" "3.2.1"
-      "sha256-3pSluisKy9jKhT0zBhAmSdvjwcbbwX+MyYIKlBtW4lY=";
+    buildTypesAiobotocorePackage "snowball" "3.7.0"
+      "sha256-PoXUp2MHUPWUT54hFcFXwsbDtCIE+ueAh0Gyk8KgWFw=";
 
   types-aiobotocore-sns =
-    buildTypesAiobotocorePackage "sns" "3.2.1"
-      "sha256-T5E08DIC0dQD6nL5jU4Gh5/2YEUaVzkWbQxqTAiihKo=";
+    buildTypesAiobotocorePackage "sns" "3.7.0"
+      "sha256-+efzRKUthVbllsHY7SHOoUW4OvZpCTfqkU6ZoTgFBuw=";
 
   types-aiobotocore-sqs =
-    buildTypesAiobotocorePackage "sqs" "3.2.1"
-      "sha256-ezdoSf7BpRxiwekVMig3/eAEzRW4BzaMq7UmBeOSKR8=";
+    buildTypesAiobotocorePackage "sqs" "3.7.0"
+      "sha256-UgABZPkqtuwY/S9qmYmZeiaQ0bHEqFHTxXlqUobRfQA=";
 
   types-aiobotocore-ssm =
-    buildTypesAiobotocorePackage "ssm" "3.2.1"
-      "sha256-izy2pJjeqtAag4BHBcqVg8P0cw3OcJaE46blyYzaxNo=";
+    buildTypesAiobotocorePackage "ssm" "3.7.0"
+      "sha256-2qhF5kquinBlwFSV76nTBr1w1Ji3TQl+UuozG+t3ugM=";
 
   types-aiobotocore-ssm-contacts =
-    buildTypesAiobotocorePackage "ssm-contacts" "3.2.1"
-      "sha256-k2R0UoZQ9Pk3sPGdYkJo8zmKmFRTWMgnlDsWCPSuN4M=";
+    buildTypesAiobotocorePackage "ssm-contacts" "3.7.0"
+      "sha256-mbmikPYw67D+qDiIuZfDCv+/dv1lupa9nAvsmWS1A2E=";
 
   types-aiobotocore-ssm-incidents =
-    buildTypesAiobotocorePackage "ssm-incidents" "3.2.1"
-      "sha256-20X6btjnJZqY+P29VevS7R7FPR5qgv6JrmLzIO2Vf2A=";
+    buildTypesAiobotocorePackage "ssm-incidents" "3.7.0"
+      "sha256-k0A4HqUfoR4D2WtslVunbja0bZ/fkTmmiivUg1Z5U7g=";
 
   types-aiobotocore-ssm-sap =
-    buildTypesAiobotocorePackage "ssm-sap" "3.2.1"
-      "sha256-nh5k/voQ9zAa0eWrIFul76RU0XC78CfjalNFrVyLA/g=";
+    buildTypesAiobotocorePackage "ssm-sap" "3.7.0"
+      "sha256-zsV2Nb79imZ8MzbeuDVeDy8VNc4Nl4JRn0Rxkm0cQo0=";
 
   types-aiobotocore-sso =
-    buildTypesAiobotocorePackage "sso" "3.2.1"
-      "sha256-haNNqchIECaKk5V5sjrLdttsKUJchd+UMFAny7eqpDc=";
+    buildTypesAiobotocorePackage "sso" "3.7.0"
+      "sha256-w78lj+KbaI6Oi8tv4FFi44FI05xOS90EP5IKVct9qhA=";
 
   types-aiobotocore-sso-admin =
-    buildTypesAiobotocorePackage "sso-admin" "3.2.1"
-      "sha256-2T9HQlVH12X9VW4DDojcd1rnY8c6svR1k4GJZu/7pI4=";
+    buildTypesAiobotocorePackage "sso-admin" "3.7.0"
+      "sha256-NOgV845NrnVhMh8pNq++Mk3+YjdKFqpo8Q45EdFfE7c=";
 
   types-aiobotocore-sso-oidc =
-    buildTypesAiobotocorePackage "sso-oidc" "3.2.1"
-      "sha256-RDKosaChT4na/BQEH4tR4TT6QfMH9sm6BkjdJRpWL9o=";
+    buildTypesAiobotocorePackage "sso-oidc" "3.7.0"
+      "sha256-9dLnw04eLgPW2lZ9KdP9qfndT6/mj48gohOmRFpVa+c=";
 
   types-aiobotocore-stepfunctions =
-    buildTypesAiobotocorePackage "stepfunctions" "3.2.1"
-      "sha256-SSFjXz/5vJQspODERcBks9lMmd7ySo90Q27NQdv/BNs=";
+    buildTypesAiobotocorePackage "stepfunctions" "3.7.0"
+      "sha256-zLT7wuqpOIGi2JbfD9D1+9sdPnfvGs7BETQqLCSUjMY=";
 
   types-aiobotocore-storagegateway =
-    buildTypesAiobotocorePackage "storagegateway" "3.2.1"
-      "sha256-SZDNsYibr/whd6BNY/CQna7Mq49nxyQQOaW6N16Wh0Y=";
+    buildTypesAiobotocorePackage "storagegateway" "3.7.0"
+      "sha256-s+CAKtIiRQo/CIlFSl05Qguf4jg18b02KRTPWe/NtsU=";
 
   types-aiobotocore-sts =
-    buildTypesAiobotocorePackage "sts" "3.2.1"
-      "sha256-8BMOt+2iD1E43j07JxWdBTpDlwydb84G90VkzP5qa1Q=";
+    buildTypesAiobotocorePackage "sts" "3.7.0"
+      "sha256-pXEJ5Quh41XCX+Q5LFuBh3SpiD/c4/04USa7QURBOzs=";
 
   types-aiobotocore-support =
-    buildTypesAiobotocorePackage "support" "3.2.1"
-      "sha256-5J9f6zjbECSwORGi5DC8g8iY2yftY2PrY6gwgqBKlvA=";
+    buildTypesAiobotocorePackage "support" "3.7.0"
+      "sha256-HdWai/n4XaPOFsuKZlLMMZiXOH42MmOPgDzzZab6klE=";
 
   types-aiobotocore-support-app =
-    buildTypesAiobotocorePackage "support-app" "3.2.1"
-      "sha256-f7qqMLbiSgK4epSdVwaftyjDOhIn8BCUuWMsjZViEgk=";
+    buildTypesAiobotocorePackage "support-app" "3.7.0"
+      "sha256-bv4qaMc+qbdpUrGpVzxH5TdG+vlA8nP5s+vlfINtnVU=";
 
   types-aiobotocore-swf =
-    buildTypesAiobotocorePackage "swf" "3.2.1"
-      "sha256-rgxSWlC6HyKqK5AkqMGVDweqV4ib75QCVAzMT9j3FKg=";
+    buildTypesAiobotocorePackage "swf" "3.7.0"
+      "sha256-uBuoOqboxr/hIU5iPrwNYS8VhofJ50YyAZw5h1Mnctg=";
 
   types-aiobotocore-synthetics =
-    buildTypesAiobotocorePackage "synthetics" "3.2.1"
-      "sha256-3hFYV+9gYF2ND/4AwI+vx1mGQz/VuAF7isYhG9oYkh0=";
+    buildTypesAiobotocorePackage "synthetics" "3.7.0"
+      "sha256-bn+T6M+U7kcwpuYnPEH3MbgbU/HDX7M3z8S2MDpofe8=";
 
   types-aiobotocore-textract =
-    buildTypesAiobotocorePackage "textract" "3.2.1"
-      "sha256-F1aPcwbjlo+o/GTxg4b1KEccXiXQdv9rnCNP1qrLoNI=";
+    buildTypesAiobotocorePackage "textract" "3.7.0"
+      "sha256-zanugixBwYpCW07zFgrpWOgmPiIivcCU2E9rDGE71Rs=";
 
   types-aiobotocore-timestream-query =
-    buildTypesAiobotocorePackage "timestream-query" "3.2.1"
-      "sha256-SyI9y9b8HHBIUn+u92LKPxUo09ZSojRF/kqY9d8VLF0=";
+    buildTypesAiobotocorePackage "timestream-query" "3.7.0"
+      "sha256-lV+xoBwmwDN43DwKSFgnDhQIOg+TCmW4p8UGzuceB5c=";
 
   types-aiobotocore-timestream-write =
-    buildTypesAiobotocorePackage "timestream-write" "3.2.1"
-      "sha256-gfk9EVwH2KXxRemlvCQ6cMXELi5JSXXepxZ4RAfSCy0=";
+    buildTypesAiobotocorePackage "timestream-write" "3.7.0"
+      "sha256-az1b5MfaxOoky0LK5RmSwhjyi3wiBwiEdjtec64vVJQ=";
 
   types-aiobotocore-tnb =
-    buildTypesAiobotocorePackage "tnb" "3.2.1"
-      "sha256-XXf9V/e/mdFZkTV8R1Zq9rf8hmS7x6FIXovsftRr2/A=";
+    buildTypesAiobotocorePackage "tnb" "3.7.0"
+      "sha256-WztQK0vAAS9+kaAbJadW7l2K+1AqjDvELA/kL4vT2oE=";
 
   types-aiobotocore-transcribe =
-    buildTypesAiobotocorePackage "transcribe" "3.2.1"
-      "sha256-eY0kT6Qt2qqG7InUfXuHyeDXc7W67LUwYe62bikbUGo=";
+    buildTypesAiobotocorePackage "transcribe" "3.7.0"
+      "sha256-vH5hQv6AMRw2Hbffty1MUjNaCkxF5s0sauZG/68Xdd8=";
 
   types-aiobotocore-transfer =
-    buildTypesAiobotocorePackage "transfer" "3.2.1"
-      "sha256-Ne5UfyHaw8GWDpzdlexcfl6AkkCW9PnBoRN2auOFUjY=";
+    buildTypesAiobotocorePackage "transfer" "3.7.0"
+      "sha256-FWcxoAqj4/H3N+NuauCZl16sFyfIwfWOsksLYztlA60=";
 
   types-aiobotocore-translate =
-    buildTypesAiobotocorePackage "translate" "3.2.1"
-      "sha256-iiwbQ/zHO8wDH+Y2NtmSrh2pt0MpqM/+VHaqKfbtlXE=";
+    buildTypesAiobotocorePackage "translate" "3.7.0"
+      "sha256-z6WlR/lNlKShy3rFJOhYZg8X0LuKh55BH5egM2OI5vQ=";
 
   types-aiobotocore-verifiedpermissions =
-    buildTypesAiobotocorePackage "verifiedpermissions" "3.2.1"
-      "sha256-ELayfahnDEs5NgcFkCZQgueNDk4yUTmrC2yZDouApsk=";
+    buildTypesAiobotocorePackage "verifiedpermissions" "3.7.0"
+      "sha256-N9AR7PVpiZu7UhRH60Bh524cNwIhD2eOeffYTgJbX6I=";
 
   types-aiobotocore-voice-id =
-    buildTypesAiobotocorePackage "voice-id" "3.2.1"
-      "sha256-vzozTlsYUv3TdcPnjkRmbbIjIs2NURDsGNzz4WZxaPk=";
+    buildTypesAiobotocorePackage "voice-id" "3.7.0"
+      "sha256-MWGa8UDcfxT/hTSZoB/eh80x6os8tjPZOG3oH5hrBtI=";
 
   types-aiobotocore-vpc-lattice =
-    buildTypesAiobotocorePackage "vpc-lattice" "3.2.1"
-      "sha256-2TVVu/UvAj29n7TvubHkBv16bWORP1EU9ghQatw+Emw=";
+    buildTypesAiobotocorePackage "vpc-lattice" "3.7.0"
+      "sha256-YMwg73zvYq+/j8gYlnOiNbJcXBG1wH4bU9AyhODxZJ8=";
 
   types-aiobotocore-waf =
-    buildTypesAiobotocorePackage "waf" "3.2.1"
-      "sha256-cnQIAurLdsk1qCtbtKsvrf7pnMvtTHr/1gEZPi5T8vQ=";
+    buildTypesAiobotocorePackage "waf" "3.7.0"
+      "sha256-8Q3slnNW50o1eVFvI18TCyOZYj33kdT4hDE5GyrXZBY=";
 
   types-aiobotocore-waf-regional =
-    buildTypesAiobotocorePackage "waf-regional" "3.2.1"
-      "sha256-y8QDvmY9DEeV/WdDFjeQx6AY81BtT/DxEbZ8QKtW+ZY=";
+    buildTypesAiobotocorePackage "waf-regional" "3.7.0"
+      "sha256-sdA/KAqDo6yVrzY2X5H1FYGwDgxB3JEsLNzbCy3tsBI=";
 
   types-aiobotocore-wafv2 =
-    buildTypesAiobotocorePackage "wafv2" "3.2.1"
-      "sha256-yeWtezgcK0bsY7GNHCy9UuHo+XlD37+Nclb6yefAD6Y=";
+    buildTypesAiobotocorePackage "wafv2" "3.7.0"
+      "sha256-CqvBSyY83nIYoaIn/1wAF1rM+t55y2fZZMOmu6DABZ8=";
 
   types-aiobotocore-wellarchitected =
-    buildTypesAiobotocorePackage "wellarchitected" "3.2.1"
-      "sha256-5VDzJnSubrexGvmPLPq3SQAIIprIhxZWLE6HO5IIbGs=";
+    buildTypesAiobotocorePackage "wellarchitected" "3.7.0"
+      "sha256-9c7lpZJt7W+Xd3FmGk8qXVhzlWW2u5KsWYoL9NHku6s=";
 
   types-aiobotocore-wisdom =
-    buildTypesAiobotocorePackage "wisdom" "3.2.1"
-      "sha256-8CaQ4FPVV8Vca3lq1045AubWXH4N3pSOjElSQwBwtOc=";
+    buildTypesAiobotocorePackage "wisdom" "3.7.0"
+      "sha256-hduCFQqtkNnX710yTisFUF3rvTMad1T0QvNC2ONyQVw=";
 
   types-aiobotocore-workdocs =
-    buildTypesAiobotocorePackage "workdocs" "3.2.1"
-      "sha256-xbbFP7d++UbGEbJpivQBOccaWRemzRu4L2Au0zcxCcE=";
+    buildTypesAiobotocorePackage "workdocs" "3.7.0"
+      "sha256-0CtDTCrr5s18TeSeRHgXXEHmrQ0xHxrbl3zZjljaiTA=";
 
   types-aiobotocore-worklink =
     buildTypesAiobotocorePackage "worklink" "2.15.1"
       "sha256-VvuxiybvGaehPqyVUYGO1bbVSQ0OYgk6LbzgoKLHF2c=";
 
   types-aiobotocore-workmail =
-    buildTypesAiobotocorePackage "workmail" "3.2.1"
-      "sha256-Gsi/k1j7I7s351pvvzXMQZdmO039cFjKrjNnuANXJuU=";
+    buildTypesAiobotocorePackage "workmail" "3.7.0"
+      "sha256-r7P4xmMZLSU6Hf51gC5qbRl2i+bLBj0sfZwRAD4XHWY=";
 
   types-aiobotocore-workmailmessageflow =
-    buildTypesAiobotocorePackage "workmailmessageflow" "3.2.1"
-      "sha256-2Y9pIBJYrtq3dX/gyqKV9ZpQfnfXZMgdEBmcm0Cyfr8=";
+    buildTypesAiobotocorePackage "workmailmessageflow" "3.7.0"
+      "sha256-H3qDKntXafHonJnYsKyNsmtG8IX5kqGmLV+Xj8fsb3I=";
 
   types-aiobotocore-workspaces =
-    buildTypesAiobotocorePackage "workspaces" "3.2.1"
-      "sha256-E54aTArfzYJkHxAbBQs0MMJrYZY6s/CBhKO+KSz8w80=";
+    buildTypesAiobotocorePackage "workspaces" "3.7.0"
+      "sha256-ys91rbOAHnqGxZw37I8AjKfPsQ3+ld6egecdiae8urY=";
 
   types-aiobotocore-workspaces-web =
-    buildTypesAiobotocorePackage "workspaces-web" "3.2.1"
-      "sha256-TvTQN7opcfy7pWZYpC+GGh+d++312ZxteeZkcK98exQ=";
+    buildTypesAiobotocorePackage "workspaces-web" "3.7.0"
+      "sha256-qE8L6qG/Gf7394nLwtI4x8jHsPq1wxoqmHvxkQsV0ps=";
 
   types-aiobotocore-xray =
-    buildTypesAiobotocorePackage "xray" "3.2.1"
-      "sha256-GjjQBqxChznqb07JY2Fy1Dmmh8zAL2FDPB6mYTbj0Rc=";
+    buildTypesAiobotocorePackage "xray" "3.7.0"
+      "sha256-/2d9Jhs2R2RragN21pN1y9kV6HQ85R6RseKXyntBW0k=";
 }

From 669a64507ac3ef55f1283d984711d239febea277 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 09:15:22 +0000
Subject: [PATCH 73/85] python3Packages.sigstore: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index bf3422f6cdb7..2447cc0450f5 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage (finalAttrs: {
   pname = "sigstore";
   version = "4.1.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "sigstore";

From c56ce7aba5b9ccf9513c4f858e7f0b89762e8a2e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 09:15:37 +0000
Subject: [PATCH 74/85] python3Packages.sigstore: relax cryptography

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

diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 2447cc0450f5..06eca68ae060 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -51,6 +51,7 @@ buildPythonPackage (finalAttrs: {
   build-system = [ flit-core ];
 
   pythonRelaxDeps = [
+    "cryptography"
     "sigstore-models"
   ];
 
@@ -83,6 +84,15 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "sigstore" ];
 
+  disabledTestPaths = [
+    # AttributeError: module 'cryptography.hazmat.primitives.asymmetric.ec' has no attribute 'SECT163K1'
+    #
+    # Uses ec.SECT163K1 which cryptography 48 removed entirely.
+    # Upstream considers this over-testing (sigstore itself never uses this curve at runtime):
+    # https://github.com/sigstore/sigstore-python/issues/1603
+    "test/unit/internal/test_key_details.py"
+  ];
+
   disabledTests = [
     # Tests require network access
     "test_fail_init_url"

From a0742edc801a3391ef80d450b94729eca78b8a42 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 09:13:42 +0000
Subject: [PATCH 75/85] python3Packages.sigstore: 4.1.0 -> 4.2.0

Diff: https://github.com/sigstore/sigstore-python/compare/v4.1.0...v4.2.0

Changelog: https://github.com/sigstore/sigstore-python/blob/v4.2.0/CHANGELOG.md
---
 pkgs/development/python-modules/sigstore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 06eca68ae060..6cc24de623ba 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -37,7 +37,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sigstore";
-  version = "4.1.0";
+  version = "4.2.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -45,7 +45,7 @@ buildPythonPackage (finalAttrs: {
     owner = "sigstore";
     repo = "sigstore-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wt9ZoMHTiMlbAab9p8/WF38/OiyCaqHPS5R7/fTAfxw=";
+    hash = "sha256-33JjQdYH/FptFUo0CecWItm9qH1wGQPHdk/JSdX8QfQ=";
   };
 
   build-system = [ flit-core ];

From c96850e668613bdc18b54ded0854ce05b8aac717 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 10:02:23 +0000
Subject: [PATCH 76/85] python3Packages.mlflow: relax cryptography

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

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 2664291d6798..f1eaff4f42b7 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -47,6 +47,9 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "cryptography"
+  ];
   dependencies = [
     aiohttp
     alembic

From 49fa88dced570e17226376e8c11b1d56b4db8346 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 10:02:42 +0000
Subject: [PATCH 77/85] python3Packages.mlflow: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index f1eaff4f42b7..8f3d77ca8b50 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -32,6 +32,7 @@ buildPythonPackage (finalAttrs: {
   pname = "mlflow";
   version = "3.12.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mlflow";

From 1735a1b3bc6b56175eb0a3ada6c6fd894d2d95af Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 10:13:35 +0000
Subject: [PATCH 78/85] python3Packages.executorch: relax mpmath

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

diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index 02604cfe8f10..adc2c81908f8 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -152,6 +152,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
     "pytest-xdist"
   ];
   pythonRelaxDeps = [
+    "mpmath"
     "scikit-learn"
     "torchao"
   ];

From 2e469c0eff1f7d5da59dcf879d6e3c9be63fae07 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 May 2026 10:13:51 +0000
Subject: [PATCH 79/85] python3Packages.executorch: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index adc2c81908f8..16c5f2255d10 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -56,6 +56,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "executorch";
   version = "1.2.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";

From e466ba3a582883573c281b1b37920fdcadb648e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 10:19:11 +0000
Subject: [PATCH 80/85] phpdocumentor: 3.9.1 -> 3.10.0

---
 pkgs/by-name/ph/phpdocumentor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix
index 54bf824719df..b9098238fbed 100644
--- a/pkgs/by-name/ph/phpdocumentor/package.nix
+++ b/pkgs/by-name/ph/phpdocumentor/package.nix
@@ -8,16 +8,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpdocumentor";
-  version = "3.9.1";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "phpDocumentor";
     repo = "phpDocumentor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T1aN/I06OdQnMxjutSsk3nNyXQ0Z+GWY6fADvJc7Iks=";
+    hash = "sha256-sieLh5CG0ev4wMco+VG9A+2GxxalN7/FLGz+IDEgH4g=";
   };
 
-  vendorHash = "sha256-IPKwEESlcwGotRAM1ZnTB+wbFF6tkMZTnpQ1aYDakSQ=";
+  vendorHash = "sha256-hz0Fw1gR2mPGdmVi4i7yjmAJiQTfkxDUC3D2ylNpdbU=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From 24208fbf36e081d9923756493ff58271566db223 Mon Sep 17 00:00:00 2001
From: Hongbo <hehongbo@mail.com>
Date: Sun, 17 May 2026 18:15:32 +0800
Subject: [PATCH 81/85] OVMF-xen: init

Signed-off-by: Hongbo <hehongbo@mail.com>
---
 pkgs/by-name/ov/OVMF-xen/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 pkgs/by-name/ov/OVMF-xen/package.nix

diff --git a/pkgs/by-name/ov/OVMF-xen/package.nix b/pkgs/by-name/ov/OVMF-xen/package.nix
new file mode 100644
index 000000000000..2b985e22c141
--- /dev/null
+++ b/pkgs/by-name/ov/OVMF-xen/package.nix
@@ -0,0 +1,17 @@
+{ lib, OVMF }:
+
+(OVMF.override {
+  projectDscPath = "OvmfPkg/OvmfXen.dsc";
+  fwPrefix = "OVMF";
+  metaPlatforms = builtins.filter (lib.hasPrefix "x86_64-") OVMF.meta.platforms;
+}).overrideAttrs
+  (oldAttrs: {
+    __structuredAttrs = true;
+
+    pname = "OVMF-xen";
+
+    meta = oldAttrs.meta // {
+      description = "Sample UEFI firmware for Xen guests";
+      teams = [ lib.teams.xen ];
+    };
+  })

From 50f8e73559165e50f185b1a5451612cc392272dd Mon Sep 17 00:00:00 2001
From: Hongbo <hehongbo@mail.com>
Date: Sun, 17 May 2026 18:19:00 +0800
Subject: [PATCH 82/85] xen: Use OVMF-xen (`OvmfXen`) instead of generic OVMF
 `OvmfPkgX64`

Signed-off-by: Hongbo <hehongbo@mail.com>
---
 pkgs/by-name/xe/xen/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index e763b223f603..97fcdac5c16d 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -36,7 +36,7 @@
   withIPXE ? true,
   ipxe,
   withOVMF ? true,
-  OVMF,
+  OVMF-xen,
   withSeaBIOS ? true,
   seabios-qemu,
 
@@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-qemu-traditional"
     "--with-system-qemu"
     (if withSeaBIOS then "--with-system-seabios=${seabios-qemu.firmware}" else "--disable-seabios")
-    (if withOVMF then "--with-system-ovmf=${OVMF.mergedFirmware}" else "--disable-ovmf")
+    (if withOVMF then "--with-system-ovmf=${OVMF-xen.mergedFirmware}" else "--disable-ovmf")
     (if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe")
     (enableFeature withFlask "xsmpolicy")
   ];

From d8535d75af54945b59a55cc9929a701e3955f2ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 12:13:42 +0000
Subject: [PATCH 83/85] terraform-providers.datadog_datadog: 4.8.0 -> 4.10.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 470391ea66bf..93c079ce6187 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -283,13 +283,13 @@
     "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
   },
   "datadog_datadog": {
-    "hash": "sha256-acDEAqygINpmFb45Ah5yiiD/kRhGhI6jVRlSN+/1s1Y=",
+    "hash": "sha256-yyUlJshH6leJbxDcm5lNGhR9pxbBEaEEDXasWeFI6Uw=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v4.8.0",
+    "rev": "v4.10.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-1e5Jdn6fSSdoAef4EobC41MhyBtdkYq50F8dbvtx+hk="
+    "vendorHash": "sha256-tgo9FxqMZOZw4ZKULOz6CbZ8oJfEFfjdFffiWjjkc0Y="
   },
   "datadrivers_nexus": {
     "hash": "sha256-yfxlDln4brI8QTFnhVsNOO3vRiqft3YWytvy2GMNBdY=",

From 26e70ba0151ff35119122f05c26da4a315f2dcc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 12:15:55 +0000
Subject: [PATCH 84/85] terraform-providers.hashicorp_aws: 6.44.0 -> 6.46.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 470391ea66bf..b715ebccb3eb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -508,13 +508,13 @@
     "vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc="
   },
   "hashicorp_aws": {
-    "hash": "sha256-+MvxcQn0pnsNDR6ERXFW85fLwQ+AG+UcBo5F25WN4mQ=",
+    "hash": "sha256-dC3oeVzd8H7Ni9NvApkjmDpVWdx/XgirhI7Rf5ECGBE=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
     "owner": "hashicorp",
     "repo": "terraform-provider-aws",
-    "rev": "v6.44.0",
+    "rev": "v6.46.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-fsGCKGgH2XM3Eq3rluKs3bODhmXUYEHLWskn+P58emA="
+    "vendorHash": "sha256-ieYDog2HS8OwfKvzPIsXZcSAsT7D9qzXPXuHhtfthV0="
   },
   "hashicorp_awscc": {
     "hash": "sha256-OC57nzpz8l+26/oBXVCFUMNK+gMlgpEK35uIyG1sFOo=",

From 74c17aeac8b1d3563968c237bfefd9e2b38fe315 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 20 May 2026 16:14:55 +0200
Subject: [PATCH 85/85] treewide: move to by-name part 4

---
 .../an/antimicrox/package.nix}                |   7 +-
 .../aw/awesomebump/package.nix}               |  26 ++-
 .../qtnproperty-parallel-building.patch       |   0
 .../bf/bfcal/package.nix}                     |   9 +-
 .../ca/cask-server/package.nix}               |   4 +-
 .../ce}/cemu-ti/cmake-no-deploy.patch         |   0
 .../ce/cemu-ti/package.nix}                   |   0
 .../cemu-ti/resolve-ambiguous-constexpr.patch |   0
 .../ch/chewing-editor/package.nix}            |   6 +-
 .../co/communi/package.nix}                   |  15 +-
 .../co/confclerk/package.nix}                 |  10 +-
 .../co/coreboot-configurator/package.nix}     |  10 +-
 .../cu/cura/package.nix}                      |  13 +-
 .../dd/ddcui/package.nix}                     |  10 +-
 .../de/degate/package.nix}                    |  13 +-
 .../di/dialogbox/package.nix}                 |  10 +-
 .../di}/diffpdf/fix_path_poppler_qt5.patch    |   0
 .../di/diffpdf/package.nix}                   |  18 +-
 .../ds}/dsview/cmake4.patch                   |   0
 .../ds}/dsview/install.patch                  |   0
 .../ds/dsview/package.nix}                    |  13 +-
 .../ed/edb/package.nix}                       |  13 +-
 .../ei/eiskaltdcpp/package.nix}               |  16 +-
 .../ev/evtest-qt/package.nix}                 |   7 +-
 .../g2/g2o/package.nix}                       |  12 +-
 .../g2}/g2o/remove-compiler-reference.patch   |   0
 .../ge/gecode/package.nix}                    |  11 +-
 .../3.nix => by-name/ge/gecode_3/package.nix} |   7 +-
 .../ge/gede/package.nix}                      |  13 +-
 .../gl/glogg/package.nix}                     |   7 +-
 .../go/googleearth-pro/package.nix}           |   4 +-
 .../gu/guvcview/package.nix}                  |   7 +-
 .../he/heimer/package.nix}                    |  10 +-
 .../he/herqq/package.nix}                     |  13 +-
 .../ho/hopper/package.nix}                    |   4 +-
 .../hu/hue-plus/package.nix}                  |   7 +-
 .../hy/hyperion-ng/package.nix}               |  19 +--
 .../i7/i7z/package.nix}                       |   4 +-
 .../linux => by-name/i7}/i7z/qt5.patch        |   0
 .../kr/kristall/package.nix}                  |  12 +-
 .../kv/kvirc/package.nix}                     |  16 +-
 .../li}/linssid/0001-unbundled-qwt.patch      |   0
 .../li/linssid/package.nix}                   |  18 +-
 .../lo/loganalyzer/package.nix}               |  10 +-
 .../ly/lyx/package.nix}                       |  12 +-
 .../ma/makehuman/package.nix}                 |   9 +-
 .../ma/maliit-framework/package.nix}          |   8 +-
 .../ma/maliit-keyboard/package.nix}           |  16 +-
 .../mi/michabo/package.nix}                   |  14 +-
 .../my}/mythtv/dont-source-os-release.patch   |   0
 .../my/mythtv/package.nix}                    |  10 +-
 .../na/nano-wallet/package.nix}               |  15 +-
 .../na/nanovna-saver/package.nix}             |   0
 .../na/natron/package.nix}                    |   4 +-
 .../ni}/nifskope/external-lib-paths.patch     |   0
 .../ni}/nifskope/no-sse-on-arm.patch          |   0
 .../ni/nifskope/package.nix}                  |  15 +-
 .../ni}/nifskope/qttools-bins.patch           |   0
 .../ni}/nifskope/zlib.patch                   |   0
 .../ni/nitrokey-app/package.nix}              |   7 +-
 .../nv/nvidia-system-monitor-qt/package.nix}  |   7 +-
 .../op/openambit/package.nix}                 |  10 +-
 .../op/openbrf/package.nix}                   |  12 +-
 .../fix-cmake-qt-linking-and-location.patch   |   0
 .../op/opentx/package.nix}                    |  13 +-
 .../pr/projecteur/package.nix}                |  10 +-
 .../pu/pulseview/package.nix}                 |  10 +-
 .../pu/pure-maps/package.nix}                 |  22 +--
 .../qa/qarte/package.nix}                     |   4 +-
 .../qb/qbs/package.nix}                       |  10 +-
 .../qc/qctools/package.nix}                   |  13 +-
 .../qf/qFlipper/package.nix}                  |  37 ++--
 .../qj/qjoypad/package.nix}                   |  13 +-
 .../qp/qpdfview/package.nix}                  |  19 +--
 .../qs/qsudo/package.nix}                     |  10 +-
 .../qt/qt-box-editor/package.nix}             |  13 +-
 .../qt/qtbitcointrader/package.nix}           |   0
 .../qt/qtemu/package.nix}                     |  10 +-
 .../qt/qtspim/package.nix}                    |  17 +-
 .../qu/quassel/package.nix}                   |  17 +-
 .../qx/qxmledit/package.nix}                  |  16 +-
 .../r3/r3ctl/package.nix}                     |  12 +-
 .../recoll/0001-no-qtgui-darwin-bundle.patch  |   0
 .../re/recoll/package.nix}                    |  12 +-
 .../re/rescuetime/package.nix}                |   3 +-
 .../re}/retroshare/no-submodules.patch        |   0
 .../re/retroshare/package.nix}                |  16 +-
 .../rg/rgp/package.nix}                       |   0
 .../ro/rocket/package.nix}                    |  10 +-
 .../se/seer/package.nix}                      |   1 -
 .../si/simplescreenrecorder/package.nix}      |  13 +-
 .../tw/twinkle/package.nix}                   |  13 +-
 .../tw/twmn/package.nix}                      |  10 +-
 .../un/unigine-superposition/package.nix}     |   6 +-
 .../va/valentina/package.nix}                 |  18 +-
 .../xf/xflr5/package.nix}                     |   7 +-
 .../xx/xxdiff/package.nix}                    |   0
 ...egfault-optimized-pointer-assignment.patch |   0
 .../zb/zbar/package.nix}                      |  15 +-
 .../gecode/fix-const-weights-clang-patch.nix  |   7 -
 pkgs/top-level/all-packages.nix               | 161 ------------------
 pkgs/top-level/qt5-packages.nix               |   2 +-
 102 files changed, 358 insertions(+), 695 deletions(-)
 rename pkgs/{tools/misc/antimicrox/default.nix => by-name/an/antimicrox/package.nix} (93%)
 rename pkgs/{applications/graphics/awesomebump/default.nix => by-name/aw/awesomebump/package.nix} (86%)
 rename pkgs/{applications/graphics => by-name/aw}/awesomebump/qtnproperty-parallel-building.patch (100%)
 rename pkgs/{applications/misc/bfcal/default.nix => by-name/bf/bfcal/package.nix} (85%)
 rename pkgs/{applications/misc/cask-server/default.nix => by-name/ca/cask-server/package.nix} (94%)
 rename pkgs/{applications/science/math => by-name/ce}/cemu-ti/cmake-no-deploy.patch (100%)
 rename pkgs/{applications/science/math/cemu-ti/default.nix => by-name/ce/cemu-ti/package.nix} (100%)
 rename pkgs/{applications/science/math => by-name/ce}/cemu-ti/resolve-ambiguous-constexpr.patch (100%)
 rename pkgs/{applications/misc/chewing-editor/default.nix => by-name/ch/chewing-editor/package.nix} (96%)
 rename pkgs/{applications/networking/irc/communi/default.nix => by-name/co/communi/package.nix} (92%)
 rename pkgs/{applications/misc/confclerk/default.nix => by-name/co/confclerk/package.nix} (86%)
 rename pkgs/{tools/misc/coreboot-configurator/default.nix => by-name/co/coreboot-configurator/package.nix} (95%)
 rename pkgs/{applications/misc/cura/default.nix => by-name/cu/cura/package.nix} (93%)
 rename pkgs/{applications/misc/ddcui/default.nix => by-name/dd/ddcui/package.nix} (90%)
 rename pkgs/{applications/science/electronics/degate/default.nix => by-name/de/degate/package.nix} (90%)
 rename pkgs/{tools/misc/dialogbox/default.nix => by-name/di/dialogbox/package.nix} (91%)
 rename pkgs/{applications/misc => by-name/di}/diffpdf/fix_path_poppler_qt5.patch (100%)
 rename pkgs/{applications/misc/diffpdf/default.nix => by-name/di/diffpdf/package.nix} (92%)
 rename pkgs/{applications/science/electronics => by-name/ds}/dsview/cmake4.patch (100%)
 rename pkgs/{applications/science/electronics => by-name/ds}/dsview/install.patch (100%)
 rename pkgs/{applications/science/electronics/dsview/default.nix => by-name/ds/dsview/package.nix} (89%)
 rename pkgs/{development/tools/misc/edb/default.nix => by-name/ed/edb/package.nix} (95%)
 rename pkgs/{applications/networking/p2p/eiskaltdcpp/default.nix => by-name/ei/eiskaltdcpp/package.nix} (94%)
 rename pkgs/{applications/misc/evtest-qt/default.nix => by-name/ev/evtest-qt/package.nix} (93%)
 rename pkgs/{development/libraries/g2o/default.nix => by-name/g2/g2o/package.nix} (90%)
 rename pkgs/{development/libraries => by-name/g2}/g2o/remove-compiler-reference.patch (100%)
 rename pkgs/{development/libraries/gecode/default.nix => by-name/ge/gecode/package.nix} (68%)
 rename pkgs/{development/libraries/gecode/3.nix => by-name/ge/gecode_3/package.nix} (72%)
 rename pkgs/{development/tools/misc/gede/default.nix => by-name/ge/gede/package.nix} (83%)
 rename pkgs/{tools/text/glogg/default.nix => by-name/gl/glogg/package.nix} (95%)
 rename pkgs/{applications/misc/googleearth-pro/default.nix => by-name/go/googleearth-pro/package.nix} (98%)
 rename pkgs/{os-specific/linux/guvcview/default.nix => by-name/gu/guvcview/package.nix} (93%)
 rename pkgs/{applications/misc/heimer/default.nix => by-name/he/heimer/package.nix} (93%)
 rename pkgs/{development/libraries/herqq/default.nix => by-name/he/herqq/package.nix} (84%)
 rename pkgs/{development/tools/analysis/hopper/default.nix => by-name/ho/hopper/package.nix} (97%)
 rename pkgs/{applications/misc/hue-plus/default.nix => by-name/hu/hue-plus/package.nix} (90%)
 rename pkgs/{applications/video/hyperion-ng/default.nix => by-name/hy/hyperion-ng/package.nix} (92%)
 rename pkgs/{os-specific/linux/i7z/default.nix => by-name/i7/i7z/package.nix} (94%)
 rename pkgs/{os-specific/linux => by-name/i7}/i7z/qt5.patch (100%)
 rename pkgs/{applications/networking/browsers/kristall/default.nix => by-name/kr/kristall/package.nix} (89%)
 rename pkgs/{applications/networking/irc/kvirc/default.nix => by-name/kv/kvirc/package.nix} (81%)
 rename pkgs/{applications/networking => by-name/li}/linssid/0001-unbundled-qwt.patch (100%)
 rename pkgs/{applications/networking/linssid/default.nix => by-name/li/linssid/package.nix} (84%)
 rename pkgs/{development/tools/loganalyzer/default.nix => by-name/lo/loganalyzer/package.nix} (93%)
 rename pkgs/{applications/misc/lyx/default.nix => by-name/ly/lyx/package.nix} (92%)
 rename pkgs/{applications/misc/makehuman/default.nix => by-name/ma/makehuman/package.nix} (96%)
 rename pkgs/{applications/misc/maliit-framework/default.nix => by-name/ma/maliit-framework/package.nix} (89%)
 rename pkgs/{applications/misc/maliit-keyboard/default.nix => by-name/ma/maliit-keyboard/package.nix} (86%)
 rename pkgs/{applications/misc/michabo/default.nix => by-name/mi/michabo/package.nix} (89%)
 rename pkgs/{applications/video => by-name/my}/mythtv/dont-source-os-release.patch (100%)
 rename pkgs/{applications/video/mythtv/default.nix => by-name/my/mythtv/package.nix} (94%)
 rename pkgs/{applications/blockchains/nano-wallet/default.nix => by-name/na/nano-wallet/package.nix} (82%)
 rename pkgs/{applications/science/electronics/nanovna-saver/default.nix => by-name/na/nanovna-saver/package.nix} (100%)
 rename pkgs/{applications/video/natron/default.nix => by-name/na/natron/package.nix} (98%)
 rename pkgs/{tools/graphics => by-name/ni}/nifskope/external-lib-paths.patch (100%)
 rename pkgs/{tools/graphics => by-name/ni}/nifskope/no-sse-on-arm.patch (100%)
 rename pkgs/{tools/graphics/nifskope/default.nix => by-name/ni/nifskope/package.nix} (93%)
 rename pkgs/{tools/graphics => by-name/ni}/nifskope/qttools-bins.patch (100%)
 rename pkgs/{tools/graphics => by-name/ni}/nifskope/zlib.patch (100%)
 rename pkgs/{tools/security/nitrokey-app/default.nix => by-name/ni/nitrokey-app/package.nix} (96%)
 rename pkgs/{tools/system/nvidia-system-monitor-qt/default.nix => by-name/nv/nvidia-system-monitor-qt/package.nix} (94%)
 rename pkgs/{applications/misc/openambit/default.nix => by-name/op/openambit/package.nix} (96%)
 rename pkgs/{applications/misc/openbrf/default.nix => by-name/op/openbrf/package.nix} (93%)
 rename pkgs/{applications/misc => by-name/op}/opentx/fix-cmake-qt-linking-and-location.patch (100%)
 rename pkgs/{applications/misc/opentx/default.nix => by-name/op/opentx/package.nix} (95%)
 rename pkgs/{os-specific/linux/projecteur/default.nix => by-name/pr/projecteur/package.nix} (91%)
 rename pkgs/{applications/science/electronics/pulseview/default.nix => by-name/pu/pulseview/package.nix} (93%)
 rename pkgs/{applications/misc/pure-maps/default.nix => by-name/pu/pure-maps/package.nix} (84%)
 rename pkgs/{applications/video/qarte/default.nix => by-name/qa/qarte/package.nix} (94%)
 rename pkgs/{development/tools/build-managers/qbs/default.nix => by-name/qb/qbs/package.nix} (86%)
 rename pkgs/{applications/video/qctools/default.nix => by-name/qc/qctools/package.nix} (91%)
 rename pkgs/{tools/misc/qflipper/default.nix => by-name/qf/qFlipper/package.nix} (84%)
 rename pkgs/{tools/misc/qjoypad/default.nix => by-name/qj/qjoypad/package.nix} (93%)
 rename pkgs/{applications/office/qpdfview/default.nix => by-name/qp/qpdfview/package.nix} (90%)
 rename pkgs/{applications/misc/qsudo/default.nix => by-name/qs/qsudo/package.nix} (89%)
 rename pkgs/{applications/misc/qt-box-editor/default.nix => by-name/qt/qt-box-editor/package.nix} (89%)
 rename pkgs/{applications/misc/qtbitcointrader/default.nix => by-name/qt/qtbitcointrader/package.nix} (100%)
 rename pkgs/{applications/virtualization/qtemu/default.nix => by-name/qt/qtemu/package.nix} (92%)
 rename pkgs/{development/tools/misc/qtspim/default.nix => by-name/qt/qtspim/package.nix} (84%)
 rename pkgs/{applications/networking/irc/quassel/default.nix => by-name/qu/quassel/package.nix} (89%)
 rename pkgs/{applications/editors/qxmledit/default.nix => by-name/qx/qxmledit/package.nix} (88%)
 rename pkgs/{tools/misc/r3ctl/default.nix => by-name/r3/r3ctl/package.nix} (88%)
 rename pkgs/{applications/search => by-name/re}/recoll/0001-no-qtgui-darwin-bundle.patch (100%)
 rename pkgs/{applications/search/recoll/default.nix => by-name/re/recoll/package.nix} (97%)
 rename pkgs/{applications/misc/rescuetime/default.nix => by-name/re/rescuetime/package.nix} (98%)
 rename pkgs/{applications/networking/p2p => by-name/re}/retroshare/no-submodules.patch (100%)
 rename pkgs/{applications/networking/p2p/retroshare/default.nix => by-name/re/retroshare/package.nix} (95%)
 rename pkgs/{development/tools/rgp/default.nix => by-name/rg/rgp/package.nix} (100%)
 rename pkgs/{tools/graphics/rocket/default.nix => by-name/ro/rocket/package.nix} (87%)
 rename pkgs/{development/tools/misc/seer/default.nix => by-name/se/seer/package.nix} (98%)
 rename pkgs/{applications/video/simplescreenrecorder/default.nix => by-name/si/simplescreenrecorder/package.nix} (92%)
 rename pkgs/{applications/networking/instant-messengers/twinkle/default.nix => by-name/tw/twinkle/package.nix} (90%)
 rename pkgs/{applications/misc/twmn/default.nix => by-name/tw/twmn/package.nix} (90%)
 rename pkgs/{applications/graphics/unigine-superposition/default.nix => by-name/un/unigine-superposition/package.nix} (97%)
 rename pkgs/{applications/misc/valentina/default.nix => by-name/va/valentina/package.nix} (82%)
 rename pkgs/{applications/science/physics/xflr5/default.nix => by-name/xf/xflr5/package.nix} (90%)
 rename pkgs/{development/tools/misc/xxdiff/default.nix => by-name/xx/xxdiff/package.nix} (100%)
 rename pkgs/{tools/graphics => by-name/zb}/zbar/darwin-segfault-optimized-pointer-assignment.patch (100%)
 rename pkgs/{tools/graphics/zbar/default.nix => by-name/zb/zbar/package.nix} (96%)
 delete mode 100644 pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix

diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/by-name/an/antimicrox/package.nix
similarity index 93%
rename from pkgs/tools/misc/antimicrox/default.nix
rename to pkgs/by-name/an/antimicrox/package.nix
index aa5fc1597bb4..207eb187851b 100644
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/by-name/an/antimicrox/package.nix
@@ -6,9 +6,8 @@
   pkg-config,
   itstool,
   udevCheckHook,
-  wrapQtAppsHook,
   SDL2,
-  qttools,
+  libsForQt5,
   libxtst,
   fetchFromGitHub,
 }:
@@ -30,11 +29,11 @@ stdenv.mkDerivation rec {
     pkg-config
     itstool
     udevCheckHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     SDL2
-    qttools
+    libsForQt5.qttools
     libxtst
   ];
 
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/by-name/aw/awesomebump/package.nix
similarity index 86%
rename from pkgs/applications/graphics/awesomebump/default.nix
rename to pkgs/by-name/aw/awesomebump/package.nix
index c789ef1ddeee..697437f29adc 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/by-name/aw/awesomebump/package.nix
@@ -2,13 +2,9 @@
   lib,
   stdenv,
   fetchgit,
-  qtbase,
-  qmake,
-  qtscript,
   flex,
   bison,
-  qtdeclarative,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 let
@@ -27,15 +23,15 @@ let
     sourceRoot = "${src.name}/Sources/utils/QtnProperty";
     patches = [ ./qtnproperty-parallel-building.patch ];
     buildInputs = [
-      qtscript
-      qtbase
-      qtdeclarative
+      libsForQt5.qtscript
+      libsForQt5.qtbase
+      libsForQt5.qtdeclarative
     ];
     nativeBuildInputs = [
-      qmake
+      libsForQt5.qmake
       flex
       bison
-      wrapQtAppsHook
+      libsForQt5.wrapQtAppsHook
     ];
     postInstall = ''
       install -D bin-linux/QtnPEG $out/bin/QtnPEG
@@ -49,14 +45,14 @@ stdenv.mkDerivation {
   inherit src;
 
   buildInputs = [
-    qtbase
-    qtscript
-    qtdeclarative
+    libsForQt5.qtbase
+    libsForQt5.qtscript
+    libsForQt5.qtdeclarative
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   preBuild = ''
diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/pkgs/by-name/aw/awesomebump/qtnproperty-parallel-building.patch
similarity index 100%
rename from pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch
rename to pkgs/by-name/aw/awesomebump/qtnproperty-parallel-building.patch
diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/by-name/bf/bfcal/package.nix
similarity index 85%
rename from pkgs/applications/misc/bfcal/default.nix
rename to pkgs/by-name/bf/bfcal/package.nix
index ba4fd793fb08..bf76c67e0f7f 100644
--- a/pkgs/applications/misc/bfcal/default.nix
+++ b/pkgs/by-name/bf/bfcal/package.nix
@@ -5,8 +5,7 @@
   meson,
   ninja,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   meta = {
@@ -36,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "bfcal";
     homepage = "https://git.sr.ht/~bitfehler/bfcal";
     license = lib.licenses.gpl3Plus;
-    platforms = qtbase.meta.platforms;
+    platforms = libsForQt5.qtbase.meta.platforms;
     maintainers = with lib.maintainers; [ laalsaas ];
   };
 })
diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/by-name/ca/cask-server/package.nix
similarity index 94%
rename from pkgs/applications/misc/cask-server/default.nix
rename to pkgs/by-name/ca/cask-server/package.nix
index d2563a0313e4..29b6e8e96b10 100644
--- a/pkgs/applications/misc/cask-server/default.nix
+++ b/pkgs/by-name/ca/cask-server/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   kdePackages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     kdePackages.extra-cmake-modules
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = {
diff --git a/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch b/pkgs/by-name/ce/cemu-ti/cmake-no-deploy.patch
similarity index 100%
rename from pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch
rename to pkgs/by-name/ce/cemu-ti/cmake-no-deploy.patch
diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/by-name/ce/cemu-ti/package.nix
similarity index 100%
rename from pkgs/applications/science/math/cemu-ti/default.nix
rename to pkgs/by-name/ce/cemu-ti/package.nix
diff --git a/pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch b/pkgs/by-name/ce/cemu-ti/resolve-ambiguous-constexpr.patch
similarity index 100%
rename from pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch
rename to pkgs/by-name/ce/cemu-ti/resolve-ambiguous-constexpr.patch
diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/by-name/ch/chewing-editor/package.nix
similarity index 96%
rename from pkgs/applications/misc/chewing-editor/default.nix
rename to pkgs/by-name/ch/chewing-editor/package.nix
index a63497a6e6e7..f2eb5ec92780 100644
--- a/pkgs/applications/misc/chewing-editor/default.nix
+++ b/pkgs/by-name/ch/chewing-editor/package.nix
@@ -7,8 +7,6 @@
   pkg-config,
   libchewing,
   qt5,
-  qtbase,
-  qttools,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtest
     libchewing
-    qtbase
-    qttools
+    qt5.qtbase
+    qt5.qttools
   ];
 
   meta = {
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/by-name/co/communi/package.nix
similarity index 92%
rename from pkgs/applications/networking/irc/communi/default.nix
rename to pkgs/by-name/co/communi/package.nix
index 809a4b04cf3d..72c7c3f6f93e 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/by-name/co/communi/package.nix
@@ -2,10 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libcommuni,
-  qmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -24,13 +21,13 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libcommuni
-    qtbase
+    libsForQt5.libcommuni
+    libsForQt5.qtbase
   ];
 
   # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin
@@ -39,7 +36,7 @@ stdenv.mkDerivation {
   dontWrapQtApps = stdenv.hostPlatform.isDarwin;
 
   preConfigure = ''
-    export QMAKEFEATURES=${libcommuni}/features
+    export QMAKEFEATURES=${libsForQt5.libcommuni}/features
   '';
 
   qmakeFlags = [
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/by-name/co/confclerk/package.nix
similarity index 86%
rename from pkgs/applications/misc/confclerk/default.nix
rename to pkgs/by-name/co/confclerk/package.nix
index 7c7750203830..12b675d08bc4 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/by-name/co/confclerk/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  qtbase,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,11 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-GgWvPHcQnQrK9SOC8U9F2P8kuPCn8I2EhoWEEMtKBww=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   postInstall = ''
diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/by-name/co/coreboot-configurator/package.nix
similarity index 95%
rename from pkgs/tools/misc/coreboot-configurator/default.nix
rename to pkgs/by-name/co/coreboot-configurator/package.nix
index 631e18581624..9b21e86c9c34 100644
--- a/pkgs/tools/misc/coreboot-configurator/default.nix
+++ b/pkgs/by-name/co/coreboot-configurator/package.nix
@@ -14,9 +14,7 @@
   yaml-cpp,
   nvramtool,
   systemd,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -35,12 +33,12 @@ stdenv.mkDerivation {
     meson
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     yaml-cpp
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/by-name/cu/cura/package.nix
similarity index 93%
rename from pkgs/applications/misc/cura/default.nix
rename to pkgs/by-name/cu/cura/package.nix
index 9e04fe277cda..bce9ab2fb375 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/by-name/cu/cura/package.nix
@@ -4,10 +4,7 @@
   fetchFromGitHub,
   cmake,
   python3,
-  wrapQtAppsHook,
-  qtbase,
-  qtquickcontrols2,
-  qtgraphicaleffects,
+  libsForQt5,
   curaengine,
   plugins ? [ ],
 }:
@@ -31,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtbase
-    qtquickcontrols2
-    qtgraphicaleffects
+    libsForQt5.qtbase
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
   ];
   propagatedBuildInputs =
     with python3.pkgs;
@@ -53,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     python3.pkgs.wrapPython
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/by-name/dd/ddcui/package.nix
similarity index 90%
rename from pkgs/applications/misc/ddcui/default.nix
rename to pkgs/by-name/dd/ddcui/package.nix
index 4b247360196e..acec39e67c1c 100644
--- a/pkgs/applications/misc/ddcui/default.nix
+++ b/pkgs/by-name/dd/ddcui/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
+  libsForQt5,
   ddcutil,
 }:
 
@@ -26,12 +24,12 @@ stdenv.mkDerivation rec {
     # file is not currently written to support PREFIX installations.
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     ddcutil
   ];
 
diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/by-name/de/degate/package.nix
similarity index 90%
rename from pkgs/applications/science/electronics/degate/default.nix
rename to pkgs/by-name/de/degate/package.nix
index 7f9e56ee9f68..6f12df416f3a 100644
--- a/pkgs/applications/science/electronics/degate/default.nix
+++ b/pkgs/by-name/de/degate/package.nix
@@ -5,10 +5,7 @@
   fetchpatch,
   cmake,
   boost183,
-  qtbase,
-  qtimageformats,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 let
@@ -49,13 +46,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     boost_static
-    qtbase
+    libsForQt5.qtbase
   ];
 
   doCheck = true;
@@ -66,7 +63,7 @@ stdenv.mkDerivation rec {
       cd tests/out/bin
 
       # provide qtimageformats plugin to allow tests to read tiff files
-      export QT_PLUGIN_PATH="${qtimageformats}/${qtbase.qtPluginPrefix}"
+      export QT_PLUGIN_PATH="${libsForQt5.qtimageformats}/${libsForQt5.qtbase.qtPluginPrefix}"
 
       ./DegateTests
     )
diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/by-name/di/dialogbox/package.nix
similarity index 91%
rename from pkgs/tools/misc/dialogbox/default.nix
rename to pkgs/by-name/di/dialogbox/package.nix
index b4d932c7f2d9..da09653201f1 100644
--- a/pkgs/tools/misc/dialogbox/default.nix
+++ b/pkgs/by-name/di/dialogbox/package.nix
@@ -2,9 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -19,12 +17,12 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   installPhase = ''
diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch b/pkgs/by-name/di/diffpdf/fix_path_poppler_qt5.patch
similarity index 100%
rename from pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
rename to pkgs/by-name/di/diffpdf/fix_path_poppler_qt5.patch
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/by-name/di/diffpdf/package.nix
similarity index 92%
rename from pkgs/applications/misc/diffpdf/default.nix
rename to pkgs/by-name/di/diffpdf/package.nix
index 75cf07bf2e07..cb38b488aed9 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/by-name/di/diffpdf/package.nix
@@ -3,11 +3,7 @@
   stdenv,
   fetchurl,
   fetchpatch,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  poppler,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,17 +24,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    poppler
+    libsForQt5.qtbase
+    libsForQt5.poppler
   ];
 
   preConfigure = ''
-    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev}
+    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${libsForQt5.poppler.dev}
     lrelease diffpdf.pro
   '';
 
diff --git a/pkgs/applications/science/electronics/dsview/cmake4.patch b/pkgs/by-name/ds/dsview/cmake4.patch
similarity index 100%
rename from pkgs/applications/science/electronics/dsview/cmake4.patch
rename to pkgs/by-name/ds/dsview/cmake4.patch
diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/by-name/ds/dsview/install.patch
similarity index 100%
rename from pkgs/applications/science/electronics/dsview/install.patch
rename to pkgs/by-name/ds/dsview/install.patch
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/by-name/ds/dsview/package.nix
similarity index 89%
rename from pkgs/applications/science/electronics/dsview/default.nix
rename to pkgs/by-name/ds/dsview/package.nix
index 17b1a69380ae..20f0fc1ae928 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/by-name/ds/dsview/package.nix
@@ -4,14 +4,11 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  wrapQtAppsHook,
   libzip,
   boost,
   fftw,
   libusb1,
-  qtbase,
-  qtsvg,
-  qtwayland,
+  libsForQt5,
   python3,
   desktopToDarwinBundle,
 }:
@@ -40,20 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     boost
     fftw
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     libusb1
     libzip
     python3
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  ++ lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland;
 
   doInstallCheck = true;
 
diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/by-name/ed/edb/package.nix
similarity index 95%
rename from pkgs/development/tools/misc/edb/default.nix
rename to pkgs/by-name/ed/edb/package.nix
index f41b4324d6e9..866bb4e905d3 100644
--- a/pkgs/development/tools/misc/edb/default.nix
+++ b/pkgs/by-name/ed/edb/package.nix
@@ -8,10 +8,7 @@
   capstone_4,
   double-conversion,
   graphviz,
-  qtxmlpatterns,
-  qttools,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
   testers,
   nix-update-script,
 }:
@@ -31,17 +28,17 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     boost.dev
     capstone_4
     double-conversion
     graphviz
-    qtxmlpatterns
+    libsForQt5.qtxmlpatterns
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/by-name/ei/eiskaltdcpp/package.nix
similarity index 94%
rename from pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
rename to pkgs/by-name/ei/eiskaltdcpp/package.nix
index 600575d672ea..66e7768485df 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/by-name/ei/eiskaltdcpp/package.nix
@@ -5,13 +5,9 @@
   fetchpatch2,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   bzip2,
   libx11,
-  qtbase,
-  qttools,
-  qtmultimedia,
-  qtscript,
+  libsForQt5,
   libiconv,
   pcre-cpp,
   libidn,
@@ -43,13 +39,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qttools
-    qtmultimedia
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtmultimedia
+    libsForQt5.qtscript
     bzip2
     libx11
     pcre-cpp
diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/by-name/ev/evtest-qt/package.nix
similarity index 93%
rename from pkgs/applications/misc/evtest-qt/default.nix
rename to pkgs/by-name/ev/evtest-qt/package.nix
index 4067d0d5d311..dbf98a59b5ae 100644
--- a/pkgs/applications/misc/evtest-qt/default.nix
+++ b/pkgs/by-name/ev/evtest-qt/package.nix
@@ -1,9 +1,8 @@
 {
   lib,
   stdenv,
-  qtbase,
   cmake,
-  wrapQtAppsHook,
+  libsForQt5,
   fetchFromGitHub,
   fetchpatch,
   unstableGitUpdater,
@@ -33,10 +32,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   passthru.updateScript = unstableGitUpdater { };
 
diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/by-name/g2/g2o/package.nix
similarity index 90%
rename from pkgs/development/libraries/g2o/default.nix
rename to pkgs/by-name/g2/g2o/package.nix
index c37e20027906..96a67570f191 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/pkgs/by-name/g2/g2o/package.nix
@@ -3,14 +3,12 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
   eigen,
   suitesparse,
   blas,
   lapack,
   libGLU,
-  qtbase,
-  libqglviewer,
+  libsForQt5,
   spdlog,
 }:
 
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     eigen
@@ -44,8 +42,8 @@ stdenv.mkDerivation rec {
     blas
     lapack
     libGLU
-    qtbase
-    libqglviewer
+    libsForQt5.qtbase
+    libsForQt5.libqglviewer
   ];
   propagatedBuildInputs = [ spdlog ];
 
@@ -53,7 +51,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     # Detection script is broken
-    "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
+    "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
     "-DG2O_BUILD_EXAMPLES=OFF"
   ]
   ++ lib.optionals stdenv.hostPlatform.isx86_64 [
diff --git a/pkgs/development/libraries/g2o/remove-compiler-reference.patch b/pkgs/by-name/g2/g2o/remove-compiler-reference.patch
similarity index 100%
rename from pkgs/development/libraries/g2o/remove-compiler-reference.patch
rename to pkgs/by-name/g2/g2o/remove-compiler-reference.patch
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/by-name/ge/gecode/package.nix
similarity index 68%
rename from pkgs/development/libraries/gecode/default.nix
rename to pkgs/by-name/ge/gecode/package.nix
index 5f7cfb52fe63..d07198f78125 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/by-name/ge/gecode/package.nix
@@ -8,7 +8,7 @@
   perl,
   gmp,
   mpfr,
-  qtbase,
+  libsForQt5,
   enableGist ? true,
 }:
 
@@ -24,7 +24,12 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (import ./fix-const-weights-clang-patch.nix fetchpatch)
+    # https://github.com/Gecode/gecode/pull/74
+    (fetchpatch {
+      name = "fix-const-weights-clang.patch";
+      url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
+      sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
+    })
   ];
 
   enableParallelBuilding = true;
@@ -38,7 +43,7 @@ stdenv.mkDerivation rec {
     gmp
     mpfr
   ]
-  ++ lib.optional enableGist qtbase;
+  ++ lib.optional enableGist libsForQt5.qtbase;
 
   meta = {
     license = lib.licenses.mit;
diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/by-name/ge/gecode_3/package.nix
similarity index 72%
rename from pkgs/development/libraries/gecode/3.nix
rename to pkgs/by-name/ge/gecode_3/package.nix
index 134c17fa37c0..7db4192b6bfb 100644
--- a/pkgs/development/libraries/gecode/3.nix
+++ b/pkgs/by-name/ge/gecode_3/package.nix
@@ -16,7 +16,12 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (import ./fix-const-weights-clang-patch.nix fetchpatch)
+    # https://github.com/Gecode/gecode/pull/74
+    (fetchpatch {
+      name = "fix-const-weights-clang.patch";
+      url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
+      sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/by-name/ge/gede/package.nix
similarity index 83%
rename from pkgs/development/tools/misc/gede/default.nix
rename to pkgs/by-name/ge/gede/package.nix
index 857c8a6fb84f..b03119072f3a 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/by-name/ge/gede/package.nix
@@ -4,10 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   python3,
-  qtbase,
-  qmake,
-  qtserialport,
-  wrapQtAppsHook,
+  libsForQt5,
   ctags,
   gdb,
 }:
@@ -27,9 +24,9 @@ stdenv.mkDerivation rec {
     ctags
     makeWrapper
     python3
-    qmake
-    qtserialport
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qtserialport
+    libsForQt5.wrapQtAppsHook
   ];
 
   strictDeps = true;
@@ -41,7 +38,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     python build.py install --verbose --prefix="$out"
     wrapProgram $out/bin/gede \
-      --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \
+      --prefix QT_PLUGIN_PATH : ${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix} \
       --prefix PATH : ${
         lib.makeBinPath [
           ctags
diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/by-name/gl/glogg/package.nix
similarity index 95%
rename from pkgs/tools/text/glogg/default.nix
rename to pkgs/by-name/gl/glogg/package.nix
index 23e84e7dc90a..840142175fe4 100644
--- a/pkgs/tools/text/glogg/default.nix
+++ b/pkgs/by-name/gl/glogg/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
   boost,
 }:
 
@@ -24,8 +23,8 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [ boost ];
 
diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/by-name/go/googleearth-pro/package.nix
similarity index 98%
rename from pkgs/applications/misc/googleearth-pro/default.nix
rename to pkgs/by-name/go/googleearth-pro/package.nix
index 76722bdeb2e8..d5907528d408 100644
--- a/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/pkgs/by-name/go/googleearth-pro/package.nix
@@ -29,7 +29,7 @@
 
   xkeyboard-config,
   autoPatchelfHook,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 let
   arch =
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     dpkg
     makeWrapper
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   propagatedBuildInputs = [ xkeyboard-config ];
   buildInputs = [
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/by-name/gu/guvcview/package.nix
similarity index 93%
rename from pkgs/os-specific/linux/guvcview/default.nix
rename to pkgs/by-name/gu/guvcview/package.nix
index 772b53f12436..af683e34bc54 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/by-name/gu/guvcview/package.nix
@@ -19,8 +19,7 @@
   pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
   libpulseaudio,
   useQt ? false,
-  qtbase ? null,
-  wrapQtAppsHook ? null,
+  libsForQt5,
   # can be turned off if used as a library
   useGtk ? true,
   gtk3,
@@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ]
   ++ lib.optionals useGtk [ wrapGAppsHook3 ]
-  ++ lib.optionals useQt [ wrapQtAppsHook ];
+  ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ];
 
   buildInputs = [
     SDL2
@@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
   ++ lib.optionals useGtk [ gtk3 ]
   ++ lib.optionals useQt [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   configureFlags = [
diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/by-name/he/heimer/package.nix
similarity index 93%
rename from pkgs/applications/misc/heimer/default.nix
rename to pkgs/by-name/he/heimer/package.nix
index d6545bd6c645..93c1718fbe49 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/by-name/he/heimer/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  wrapQtAppsHook,
-  qttools,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,12 +34,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qttools
-    qtbase
+    libsForQt5.qttools
+    libsForQt5.qtbase
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/by-name/he/herqq/package.nix
similarity index 84%
rename from pkgs/development/libraries/herqq/default.nix
rename to pkgs/by-name/he/herqq/package.nix
index 939b4086ee03..53a832f9fcf0 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/by-name/he/herqq/package.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtmultimedia,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,13 +10,13 @@ stdenv.mkDerivation rec {
   pname = "herqq";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 
   outputs = [
diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/by-name/ho/hopper/package.nix
similarity index 97%
rename from pkgs/development/tools/analysis/hopper/default.nix
rename to pkgs/by-name/ho/hopper/package.nix
index 93b29865173d..b6d876217d6a 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/by-name/ho/hopper/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-  wrapQtAppsHook,
+  libsForQt5,
   gnustep-libobjc,
   libbsd,
   libffi_3_3,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/misc/hue-plus/default.nix b/pkgs/by-name/hu/hue-plus/package.nix
similarity index 90%
rename from pkgs/applications/misc/hue-plus/default.nix
rename to pkgs/by-name/hu/hue-plus/package.nix
index 0c73820b3cda..c229d5df7038 100644
--- a/pkgs/applications/misc/hue-plus/default.nix
+++ b/pkgs/by-name/hu/hue-plus/package.nix
@@ -2,8 +2,7 @@
   python3Packages,
   fetchFromGitHub,
   lib,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonApplication {
@@ -18,9 +17,9 @@ python3Packages.buildPythonApplication {
     sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
 
   propagatedBuildInputs = with python3Packages; [
     pyserial
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/by-name/hy/hyperion-ng/package.nix
similarity index 92%
rename from pkgs/applications/video/hyperion-ng/default.nix
rename to pkgs/by-name/hy/hyperion-ng/package.nix
index 618d690d7609..a0940a96497a 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/by-name/hy/hyperion-ng/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   gitMinimal,
-  wrapQtAppsHook,
+  libsForQt5,
   perl,
   flatbuffers,
   protobuf,
@@ -18,11 +18,6 @@
   libxcb,
   libxrandr,
   python3,
-  qtbase,
-  qtserialport,
-  qtsvg,
-  qtx11extras,
-  qtwebsockets,
   withRPiDispmanx ? false,
   libraspberrypi,
 }:
@@ -54,11 +49,11 @@ stdenv.mkDerivation rec {
     protobuf
     mbedtls
     python3
-    qtbase
-    qtserialport
-    qtsvg
-    qtwebsockets
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtserialport
+    libsForQt5.qtsvg
+    libsForQt5.qtwebsockets
+    libsForQt5.qtx11extras
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libcec
   ++ lib.optional withRPiDispmanx libraspberrypi;
@@ -66,7 +61,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     gitMinimal
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle
 
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/by-name/i7/i7z/package.nix
similarity index 94%
rename from pkgs/os-specific/linux/i7z/default.nix
rename to pkgs/by-name/i7/i7z/package.nix
index c7f26a82386b..305fd0c689b7 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/by-name/i7/i7z/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   ncurses,
   withGui ? false,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy";
   };
 
-  buildInputs = [ ncurses ] ++ lib.optional withGui qtbase;
+  buildInputs = [ ncurses ] ++ lib.optional withGui libsForQt5.qtbase;
 
   patches = [
     (fetchpatch {
diff --git a/pkgs/os-specific/linux/i7z/qt5.patch b/pkgs/by-name/i7/i7z/qt5.patch
similarity index 100%
rename from pkgs/os-specific/linux/i7z/qt5.patch
rename to pkgs/by-name/i7/i7z/qt5.patch
diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/by-name/kr/kristall/package.nix
similarity index 89%
rename from pkgs/applications/networking/browsers/kristall/default.nix
rename to pkgs/by-name/kr/kristall/package.nix
index 8cd69c42d670..273b7b088f27 100644
--- a/pkgs/applications/networking/browsers/kristall/default.nix
+++ b/pkgs/by-name/kr/kristall/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  wrapQtAppsHook,
-  qmake,
-  qtmultimedia,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,11 +21,11 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qmake
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
   ];
 
-  buildInputs = [ qtmultimedia ];
+  buildInputs = [ libsForQt5.qtmultimedia ];
 
   qmakeFlags = [ "src/kristall.pro" ];
 
@@ -52,6 +50,6 @@ stdenv.mkDerivation rec {
     mainProgram = "kristall";
     homepage = "https://random-projects.net/projects/kristall.gemini";
     license = lib.licenses.gpl3Only;
-    inherit (qtmultimedia.meta) platforms;
+    inherit (libsForQt5.qtmultimedia.meta) platforms;
   };
 }
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/by-name/kv/kvirc/package.nix
similarity index 81%
rename from pkgs/applications/networking/irc/kvirc/default.nix
rename to pkgs/by-name/kv/kvirc/package.nix
index 84174949a0f5..131423c5fb59 100644
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ b/pkgs/by-name/kv/kvirc/package.nix
@@ -2,14 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qtx11extras,
   pkg-config,
   cmake,
   gettext,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -24,17 +20,17 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtsvg
+    libsForQt5.qtx11extras
   ];
 
   nativeBuildInputs = [
     pkg-config
     cmake
     gettext
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = {
diff --git a/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch b/pkgs/by-name/li/linssid/0001-unbundled-qwt.patch
similarity index 100%
rename from pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
rename to pkgs/by-name/li/linssid/0001-unbundled-qwt.patch
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/by-name/li/linssid/package.nix
similarity index 84%
rename from pkgs/applications/networking/linssid/default.nix
rename to pkgs/by-name/li/linssid/package.nix
index ef9c30c5a770..d0974b9161c1 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/by-name/li/linssid/package.nix
@@ -2,15 +2,11 @@
   lib,
   stdenv,
   fetchurl,
-  qtbase,
-  qtsvg,
-  qmake,
   pkg-config,
   boost,
   wirelesstools,
   iw,
-  qwt6_1,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,20 +20,20 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     boost
-    qwt6_1
+    libsForQt5.qwt6_1
   ];
 
   patches = [ ./0001-unbundled-qwt.patch ];
 
   postPatch = ''
-    sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro
+    sed -e "s|/usr/include/qt5.*$|& ${libsForQt5.qwt6_1}/include|" -i linssid-app/linssid-app.pro
     sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
     sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \
         -e "s|/usr|$out|g" \
diff --git a/pkgs/development/tools/loganalyzer/default.nix b/pkgs/by-name/lo/loganalyzer/package.nix
similarity index 93%
rename from pkgs/development/tools/loganalyzer/default.nix
rename to pkgs/by-name/lo/loganalyzer/package.nix
index 34c6021f02fd..b869f579f386 100644
--- a/pkgs/development/tools/loganalyzer/default.nix
+++ b/pkgs/by-name/lo/loganalyzer/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
   ];
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/by-name/ly/lyx/package.nix
similarity index 92%
rename from pkgs/applications/misc/lyx/default.nix
rename to pkgs/by-name/ly/lyx/package.nix
index 76f3e6059e40..a766d92207a1 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/by-name/ly/lyx/package.nix
@@ -6,9 +6,7 @@
   python3,
   file,
   bc,
-  qtbase,
-  wrapQtAppsHook,
-  qtsvg,
+  libsForQt5,
   hunspell,
   makeWrapper, # , mythes, boost
 }:
@@ -27,12 +25,12 @@ stdenv.mkDerivation rec {
     pkg-config
     makeWrapper
     python3
-    qtbase
-    wrapQtAppsHook
+    libsForQt5.qtbase
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     file # for libmagic
     bc
     hunspell # enchant
diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/by-name/ma/makehuman/package.nix
similarity index 96%
rename from pkgs/applications/misc/makehuman/default.nix
rename to pkgs/by-name/ma/makehuman/package.nix
index 309d0a84771a..e5a56d273542 100644
--- a/pkgs/applications/misc/makehuman/default.nix
+++ b/pkgs/by-name/ma/makehuman/package.nix
@@ -3,9 +3,8 @@
   lib,
   fetchFromGitHub,
   python3,
-  qtbase,
   git-lfs,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 let
@@ -45,14 +44,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     python
-    qtbase
+    libsForQt5.qtbase
     git-lfs
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     python
-    qtbase
+    libsForQt5.qtbase
   ];
 
   propagatedBuildInputs = pydeps;
diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/by-name/ma/maliit-framework/package.nix
similarity index 89%
rename from pkgs/applications/misc/maliit-framework/default.nix
rename to pkgs/by-name/ma/maliit-framework/package.nix
index f6432ac2d66d..54e06bafac77 100644
--- a/pkgs/applications/misc/maliit-framework/default.nix
+++ b/pkgs/by-name/ma/maliit-framework/package.nix
@@ -4,8 +4,6 @@
   fetchFromGitHub,
   fetchpatch,
 
-  qtbase,
-
   at-spi2-atk,
   at-spi2-core,
   libepoxy,
@@ -25,7 +23,7 @@
   pkg-config,
   wayland-protocols,
   wayland-scanner,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -61,11 +59,11 @@ stdenv.mkDerivation {
     pkg-config
     wayland-protocols
     wayland-scanner
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
-    "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
+    "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}"
   ];
 
   meta = {
diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/by-name/ma/maliit-keyboard/package.nix
similarity index 86%
rename from pkgs/applications/misc/maliit-keyboard/default.nix
rename to pkgs/by-name/ma/maliit-keyboard/package.nix
index 822aa5c2e773..9b8e637cc77d 100644
--- a/pkgs/applications/misc/maliit-keyboard/default.nix
+++ b/pkgs/by-name/ma/maliit-keyboard/package.nix
@@ -8,15 +8,11 @@
   libchewing,
   libpinyin,
   maliit-framework,
-  qtfeedback,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtgraphicaleffects,
 
   cmake,
   pkg-config,
   wrapGAppsHook3,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -41,10 +37,10 @@ stdenv.mkDerivation {
     libchewing
     libpinyin
     maliit-framework
-    qtfeedback
-    qtmultimedia
-    qtquickcontrols2
-    qtgraphicaleffects
+    libsForQt5.qtfeedback
+    libsForQt5.qtmultimedia
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
   ];
 
   cmakeFlags = [
@@ -56,7 +52,7 @@ stdenv.mkDerivation {
     cmake
     pkg-config
     wrapGAppsHook3
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/by-name/mi/michabo/package.nix
similarity index 89%
rename from pkgs/applications/misc/michabo/default.nix
rename to pkgs/by-name/mi/michabo/package.nix
index 482cace47eb3..4e9875d1d78f 100644
--- a/pkgs/applications/misc/michabo/default.nix
+++ b/pkgs/by-name/mi/michabo/package.nix
@@ -3,11 +3,7 @@
   stdenv,
   makeDesktopItem,
   fetchFromGitLab,
-  qmake,
-  wrapQtAppsHook,
-  # qt
-  qtbase,
-  qtwebsockets,
+  libsForQt5,
 }:
 
 let
@@ -31,12 +27,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtwebsockets
+    libsForQt5.qtbase
+    libsForQt5.qtwebsockets
   ];
 
   qmakeFlags = [
diff --git a/pkgs/applications/video/mythtv/dont-source-os-release.patch b/pkgs/by-name/my/mythtv/dont-source-os-release.patch
similarity index 100%
rename from pkgs/applications/video/mythtv/dont-source-os-release.patch
rename to pkgs/by-name/my/mythtv/dont-source-os-release.patch
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/by-name/my/mythtv/package.nix
similarity index 94%
rename from pkgs/applications/video/mythtv/default.nix
rename to pkgs/by-name/my/mythtv/package.nix
index b22bfb64ba47..012a2ba1dbeb 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/by-name/my/mythtv/package.nix
@@ -3,8 +3,6 @@
   stdenv,
   fetchFromGitHub,
   which,
-  qtbase,
-  qtscript,
   libpulseaudio,
   fftwSinglePrec,
   lame,
@@ -32,7 +30,7 @@
   autoconf,
   automake,
   file,
-  wrapQtAppsHook,
+  libsForQt5,
   exiv2,
   linuxHeaders,
   soundtouch,
@@ -60,8 +58,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     freetype
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
     lame
     zlib
     libGLU
@@ -96,7 +94,7 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     file
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];
diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/by-name/na/nano-wallet/package.nix
similarity index 82%
rename from pkgs/applications/blockchains/nano-wallet/default.nix
rename to pkgs/by-name/na/nano-wallet/package.nix
index 821e8b1880bb..1e06141692a0 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/by-name/na/nano-wallet/package.nix
@@ -5,10 +5,9 @@
   fetchpatch,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   boost,
   libGL,
-  qtbase,
+  libsForQt5,
   python3,
 }:
 
@@ -43,10 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
         BOOST_ROOT = boost;
         RAIBLOCKS_GUI = "ON";
         RAIBLOCKS_TEST = "ON";
-        Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
-        Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core";
-        Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui";
-        Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets";
+        Qt5_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5";
+        Qt5Core_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core";
+        Qt5Gui_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtGui";
+        Qt5Widgets_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtWidgets";
       };
       optionToFlag = name: value: "-D${name}=${value}";
     in
@@ -55,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     boost
     libGL
-    qtbase
+    libsForQt5.qtbase
   ];
 
   strictDeps = true;
diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/by-name/na/nanovna-saver/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/nanovna-saver/default.nix
rename to pkgs/by-name/na/nanovna-saver/package.nix
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/by-name/na/natron/package.nix
similarity index 98%
rename from pkgs/applications/video/natron/default.nix
rename to pkgs/by-name/na/natron/package.nix
index a47c815aef41..3b646a73bf27 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/by-name/na/natron/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   boost,
   cairo,
   ceres-solver,
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     cmake
     kdePackages.extra-cmake-modules
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/tools/graphics/nifskope/external-lib-paths.patch b/pkgs/by-name/ni/nifskope/external-lib-paths.patch
similarity index 100%
rename from pkgs/tools/graphics/nifskope/external-lib-paths.patch
rename to pkgs/by-name/ni/nifskope/external-lib-paths.patch
diff --git a/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch b/pkgs/by-name/ni/nifskope/no-sse-on-arm.patch
similarity index 100%
rename from pkgs/tools/graphics/nifskope/no-sse-on-arm.patch
rename to pkgs/by-name/ni/nifskope/no-sse-on-arm.patch
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/by-name/ni/nifskope/package.nix
similarity index 93%
rename from pkgs/tools/graphics/nifskope/default.nix
rename to pkgs/by-name/ni/nifskope/package.nix
index db59bb81613c..0c19da4fe22d 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/pkgs/by-name/ni/nifskope/package.nix
@@ -2,13 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qttools,
   replaceVars,
   libGLU,
   zlib,
-  wrapQtAppsHook,
+  libsForQt5,
   fetchpatch,
 }:
 
@@ -28,7 +25,7 @@ stdenv.mkDerivation {
     ./external-lib-paths.patch
     ./zlib.patch
     (replaceVars ./qttools-bins.patch {
-      qttools = "${qttools.dev}/bin";
+      qttools = "${libsForQt5.qttools.dev}/bin";
     })
     (fetchpatch {
       name = "qt512-build-fix.patch";
@@ -39,14 +36,14 @@ stdenv.mkDerivation {
   ++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch);
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     libGLU
     zlib
   ];
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   preConfigure = ''
diff --git a/pkgs/tools/graphics/nifskope/qttools-bins.patch b/pkgs/by-name/ni/nifskope/qttools-bins.patch
similarity index 100%
rename from pkgs/tools/graphics/nifskope/qttools-bins.patch
rename to pkgs/by-name/ni/nifskope/qttools-bins.patch
diff --git a/pkgs/tools/graphics/nifskope/zlib.patch b/pkgs/by-name/ni/nifskope/zlib.patch
similarity index 100%
rename from pkgs/tools/graphics/nifskope/zlib.patch
rename to pkgs/by-name/ni/nifskope/zlib.patch
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/by-name/ni/nitrokey-app/package.nix
similarity index 96%
rename from pkgs/tools/security/nitrokey-app/default.nix
rename to pkgs/by-name/ni/nitrokey-app/package.nix
index b5521973ead4..b81271ebba75 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/by-name/ni/nitrokey-app/package.nix
@@ -4,10 +4,9 @@
   cmake,
   fetchFromGitHub,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   libnitrokey,
   cppcodec,
-  qttools,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,8 +23,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   cmakeFlags = [
diff --git a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix b/pkgs/by-name/nv/nvidia-system-monitor-qt/package.nix
similarity index 94%
rename from pkgs/tools/system/nvidia-system-monitor-qt/default.nix
rename to pkgs/by-name/nv/nvidia-system-monitor-qt/package.nix
index d7ef01f0c9cc..76c9403b1721 100644
--- a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix
+++ b/pkgs/by-name/nv/nvidia-system-monitor-qt/package.nix
@@ -3,8 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
   makeDesktopItem,
   copyDesktopItems,
 }:
@@ -35,10 +34,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     copyDesktopItems
   ];
 
diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/by-name/op/openambit/package.nix
similarity index 96%
rename from pkgs/applications/misc/openambit/default.nix
rename to pkgs/by-name/op/openambit/package.nix
index 0c8f6c9cfcde..4607c3b3d79f 100644
--- a/pkgs/applications/misc/openambit/default.nix
+++ b/pkgs/by-name/op/openambit/package.nix
@@ -6,9 +6,7 @@
   lib,
   libusb1,
   python3,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   udev,
   zlib,
 }:
@@ -49,13 +47,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     libusb1
     python3
-    qtbase
+    libsForQt5.qtbase
     udev
     zlib
   ];
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/by-name/op/openbrf/package.nix
similarity index 93%
rename from pkgs/applications/misc/openbrf/default.nix
rename to pkgs/by-name/op/openbrf/package.nix
index e131ff45ce97..cd881f745853 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/by-name/op/openbrf/package.nix
@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   vcg,
   glew,
   libGLU,
@@ -34,12 +32,12 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     vcg
     glew
     eigen
@@ -61,7 +59,7 @@ stdenv.mkDerivation {
     patchelf  \
       --set-rpath "${
         lib.makeLibraryPath [
-          qtbase
+          libsForQt5.qtbase
           glew
           stdenv.cc.cc
           libGLU
diff --git a/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch b/pkgs/by-name/op/opentx/fix-cmake-qt-linking-and-location.patch
similarity index 100%
rename from pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch
rename to pkgs/by-name/op/opentx/fix-cmake-qt-linking-and-location.patch
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/by-name/op/opentx/package.nix
similarity index 95%
rename from pkgs/applications/misc/opentx/default.nix
rename to pkgs/by-name/op/opentx/package.nix
index 147a72df6c71..43ef23356568 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/by-name/op/opentx/package.nix
@@ -5,11 +5,8 @@
   cmake,
   gcc-arm-embedded,
   python3Packages,
-  qttools,
   udevCheckHook,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
+  libsForQt5,
   SDL,
   gtest,
   dfu-util,
@@ -35,14 +32,14 @@ stdenv.mkDerivation rec {
     cmake
     gcc-arm-embedded
     python3Packages.pillow
-    qttools
+    libsForQt5.qttools
     udevCheckHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
     SDL
   ];
 
diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/by-name/pr/projecteur/package.nix
similarity index 91%
rename from pkgs/os-specific/linux/projecteur/default.nix
rename to pkgs/by-name/pr/projecteur/package.nix
index b6823f0dc433..5139d991049e 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/by-name/pr/projecteur/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qtbase,
-  qtgraphicaleffects,
-  wrapQtAppsHook,
+  libsForQt5,
   udevCheckHook,
   versionCheckHook,
 }:
@@ -24,14 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtbase
-    qtgraphicaleffects
+    libsForQt5.qtbase
+    libsForQt5.qtgraphicaleffects
   ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     udevCheckHook
   ];
 
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/by-name/pu/pulseview/package.nix
similarity index 93%
rename from pkgs/applications/science/electronics/pulseview/default.nix
rename to pkgs/by-name/pu/pulseview/package.nix
index 2582f03ccd92..eae130b779ee 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/by-name/pu/pulseview/package.nix
@@ -15,10 +15,8 @@
   glibmm,
   pcre,
   python3,
-  qtsvg,
-  qttools,
   bluez,
-  wrapQtAppsHook,
+  libsForQt5,
   desktopToDarwinBundle,
 }:
 
@@ -36,8 +34,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
@@ -53,7 +51,7 @@ stdenv.mkDerivation {
     glibmm
     pcre
     python3
-    qtsvg
+    libsForQt5.qtsvg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
 
diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/by-name/pu/pure-maps/package.nix
similarity index 84%
rename from pkgs/applications/misc/pure-maps/default.nix
rename to pkgs/by-name/pu/pure-maps/package.nix
index 9903c2433c47..a9730664d973 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/by-name/pu/pure-maps/package.nix
@@ -3,16 +3,10 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qttools,
-  wrapQtAppsHook,
-  qtquickcontrols2,
-  qtlocation,
-  qtsensors,
+  libsForQt5,
   nemo-qml-plugin-dbus,
-  mapbox-gl-qml,
   s2geometry,
   python3,
-  pyotherside,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,18 +24,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     python3
-    qttools
+    libsForQt5.qttools
     python3.pkgs.wrapPython
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtquickcontrols2
-    qtlocation
-    qtsensors
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtlocation
+    libsForQt5.qtsensors
     nemo-qml-plugin-dbus
-    pyotherside
-    mapbox-gl-qml
+    libsForQt5.pyotherside
+    libsForQt5.mapbox-gl-qml
     s2geometry
   ];
 
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/by-name/qa/qarte/package.nix
similarity index 94%
rename from pkgs/applications/video/qarte/default.nix
rename to pkgs/by-name/qa/qarte/package.nix
index 297493de9da8..e8abc59501c7 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/by-name/qa/qarte/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchbzr,
-  wrapQtAppsHook,
+  libsForQt5,
   python3,
   rtmpdump,
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-+Ixe4bWKubH/XBESwmP2NWS8bH0jq611c3MZn7W87Jw=";
   };
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
 
   buildInputs = [ pythonEnv ];
 
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/by-name/qb/qbs/package.nix
similarity index 86%
rename from pkgs/development/tools/build-managers/qbs/default.nix
rename to pkgs/by-name/qb/qbs/package.nix
index 9bac8e827fc0..761cdb8a2162 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/by-name/qb/qbs/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtscript,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-nL7UZh29Oecu3RvXYg5xsin2IvPWpApleLH37sEdSAI=";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ libsForQt5.qmake ];
 
   dontWrapQtApps = true;
 
@@ -29,8 +27,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
   ];
 
   meta = {
diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/by-name/qc/qctools/package.nix
similarity index 91%
rename from pkgs/applications/video/qctools/default.nix
rename to pkgs/by-name/qc/qctools/package.nix
index b42469008eb6..1f31afa22a60 100644
--- a/pkgs/applications/video/qctools/default.nix
+++ b/pkgs/by-name/qc/qctools/package.nix
@@ -2,11 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  qmake,
-  wrapQtAppsHook,
   ffmpeg_6,
-  qtmultimedia,
-  qwt,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,14 +18,14 @@ stdenv.mkDerivation rec {
   sourceRoot = "${pname}/Project/QtCreator";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     ffmpeg_6
-    qtmultimedia
-    qwt
+    libsForQt5.qtmultimedia
+    libsForQt5.qwt
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/by-name/qf/qFlipper/package.nix
similarity index 84%
rename from pkgs/tools/misc/qflipper/default.nix
rename to pkgs/by-name/qf/qFlipper/package.nix
index d1ea8a0da1fa..a9d2156d07f9 100644
--- a/pkgs/tools/misc/qflipper/default.nix
+++ b/pkgs/by-name/qf/qFlipper/package.nix
@@ -6,20 +6,9 @@
   zlib,
   libusb1,
   libGL,
-  qmake,
   wrapGAppsHook3,
-  wrapQtAppsHook,
 
-  qttools,
-  qtbase,
-  qt3d,
-  qtsvg,
-  qtserialport,
-  qtdeclarative,
-  qtquickcontrols,
-  qtquickcontrols2,
-  qtgraphicaleffects,
-  qtwayland,
+  libsForQt5,
   nix-update-script,
 }:
 let
@@ -43,10 +32,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     wrapGAppsHook3
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -54,17 +43,17 @@ stdenv.mkDerivation {
     libusb1
     libGL
 
-    qtbase
-    qt3d
-    qtsvg
-    qtserialport
-    qtdeclarative
-    qtquickcontrols
-    qtquickcontrols2
-    qtgraphicaleffects
+    libsForQt5.qtbase
+    libsForQt5.qt3d
+    libsForQt5.qtsvg
+    libsForQt5.qtserialport
+    libsForQt5.qtdeclarative
+    libsForQt5.qtquickcontrols
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-    qtwayland
+    libsForQt5.qtwayland
   ];
 
   qmakeFlags = [
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/by-name/qj/qjoypad/package.nix
similarity index 93%
rename from pkgs/tools/misc/qjoypad/default.nix
rename to pkgs/by-name/qj/qjoypad/package.nix
index 917aef1ce2bb..a1b4e185371a 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/by-name/qj/qjoypad/package.nix
@@ -4,12 +4,9 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  qttools,
-  wrapQtAppsHook,
   libx11,
   libxtst,
-  qtbase,
-  qtx11extras,
+  libsForQt5,
 }:
 stdenv.mkDerivation rec {
   pname = "qjoypad";
@@ -30,14 +27,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     libx11
     libxtst
-    qtbase
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
   ];
 
   meta = {
diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/by-name/qp/qpdfview/package.nix
similarity index 90%
rename from pkgs/applications/office/qpdfview/default.nix
rename to pkgs/by-name/qp/qpdfview/package.nix
index 1eae8b47442e..226ae659f0b7 100644
--- a/pkgs/applications/office/qpdfview/default.nix
+++ b/pkgs/by-name/qp/qpdfview/package.nix
@@ -2,13 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  qmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
-  poppler,
+  libsForQt5,
   djvulibre,
   libspectre,
   cups,
@@ -26,16 +21,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    poppler
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.poppler
     djvulibre
     libspectre
     cups
diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/by-name/qs/qsudo/package.nix
similarity index 89%
rename from pkgs/applications/misc/qsudo/default.nix
rename to pkgs/by-name/qs/qsudo/package.nix
index 460007221caf..4fd3e778845b 100644
--- a/pkgs/applications/misc/qsudo/default.nix
+++ b/pkgs/by-name/qs/qsudo/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   sudo,
 }:
 
@@ -22,12 +20,12 @@ stdenv.mkDerivation rec {
   sourceRoot = "${src.name}/src-qt5";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     sudo
   ];
 
diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/by-name/qt/qt-box-editor/package.nix
similarity index 89%
rename from pkgs/applications/misc/qt-box-editor/default.nix
rename to pkgs/by-name/qt/qt-box-editor/package.nix
index 77192ff48c7e..47084069bb2f 100644
--- a/pkgs/applications/misc/qt-box-editor/default.nix
+++ b/pkgs/by-name/qt/qt-box-editor/package.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
+  libsForQt5,
   leptonica,
   tesseract4,
 }:
@@ -22,13 +19,13 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     leptonica
     tesseract4
   ];
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/by-name/qt/qtbitcointrader/package.nix
similarity index 100%
rename from pkgs/applications/misc/qtbitcointrader/default.nix
rename to pkgs/by-name/qt/qtbitcointrader/package.nix
diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/by-name/qt/qtemu/package.nix
similarity index 92%
rename from pkgs/applications/virtualization/qtemu/default.nix
rename to pkgs/by-name/qt/qtemu/package.nix
index 354bcbfcd72c..183144ae0bd4 100644
--- a/pkgs/applications/virtualization/qtemu/default.nix
+++ b/pkgs/by-name/qt/qtemu/package.nix
@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitLab,
   pkg-config,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   qemu,
 }:
 
@@ -21,13 +19,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     qemu
   ];
 
diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/by-name/qt/qtspim/package.nix
similarity index 84%
rename from pkgs/development/tools/misc/qtspim/default.nix
rename to pkgs/by-name/qt/qtspim/package.nix
index deb4cbae41f0..ae9e9ef23614 100644
--- a/pkgs/development/tools/misc/qtspim/default.nix
+++ b/pkgs/by-name/qt/qtspim/package.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchsvn,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  qmake,
+  libsForQt5,
   bison,
   flex,
 }:
@@ -24,7 +21,7 @@ stdenv.mkDerivation {
 
     substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib
     substituteInPlace menu.cpp \
-      --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \
+      --replace /usr/lib/qtspim/bin/assistant ${libsForQt5.qttools.dev}/bin/assistant \
       --replace /usr/lib/qtspim/help/qtspim.qhc $out/share/help/qtspim.qhc
     substituteInPlace ../Setup/qtspim_debian_deployment/qtspim.desktop \
       --replace /usr/bin/qtspim qtspim \
@@ -32,14 +29,14 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qttools
-    qmake
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.qmake
     bison
     flex
   ];
-  buildInputs = [ qtbase ];
-  env.QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
+  buildInputs = [ libsForQt5.qtbase ];
+  env.QT_PLUGIN_PATH = "${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}";
 
   qmakeFlags = [
     "QtSpim.pro"
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/by-name/qu/quassel/package.nix
similarity index 89%
rename from pkgs/applications/networking/irc/quassel/default.nix
rename to pkgs/by-name/qu/quassel/package.nix
index a716025225ad..27ce28dbf961 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/by-name/qu/quassel/package.nix
@@ -10,14 +10,11 @@
   fetchFromGitHub,
   cmake,
   makeWrapper,
-  wrapQtAppsHook,
   dconf,
-  qtbase,
   boost,
   zlib,
-  qtscript,
   libdbusmenu,
-  qca-qt5,
+  libsForQt5,
   openldap,
 }:
 
@@ -51,15 +48,15 @@ stdenv.mkDerivation rec {
     cmake
     makeWrapper
   ]
-  ++ lib.optional buildClient wrapQtAppsHook;
+  ++ lib.optional buildClient libsForQt5.wrapQtAppsHook;
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     boost
     zlib
   ]
   ++ lib.optionals buildCore [
-    qtscript
-    qca-qt5
+    libsForQt5.qtscript
+    libsForQt5.qca-qt5
     openldap
   ]
   ++ lib.optionals buildClient [
@@ -80,7 +77,7 @@ stdenv.mkDerivation rec {
 
   postFixup =
     lib.optionalString enableDaemon ''
-      wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
+      wrapProgram "$out/bin/quasselcore" --suffix PATH : "${libsForQt5.qtbase.bin}/bin"
     ''
     + lib.optionalString buildClient ''
       wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \
@@ -106,6 +103,6 @@ stdenv.mkDerivation rec {
         "quasselclient"
       else
         "quasselcore";
-    inherit (qtbase.meta) platforms;
+    inherit (libsForQt5.qtbase.meta) platforms;
   };
 }
diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/by-name/qx/qxmledit/package.nix
similarity index 88%
rename from pkgs/applications/editors/qxmledit/default.nix
rename to pkgs/by-name/qx/qxmledit/package.nix
index 2064586e5eeb..e6a0a6ae9e31 100644
--- a/pkgs/applications/editors/qxmledit/default.nix
+++ b/pkgs/by-name/qx/qxmledit/package.nix
@@ -2,11 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtxmlpatterns,
-  qtsvg,
-  qtscxml,
+  libsForQt5,
   libGLU,
 }:
 
@@ -26,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M=";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ libsForQt5.qmake ];
 
   buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qtsvg
-    qtscxml
+    libsForQt5.qtbase
+    libsForQt5.qtxmlpatterns
+    libsForQt5.qtsvg
+    libsForQt5.qtscxml
     libGLU
   ];
 
diff --git a/pkgs/tools/misc/r3ctl/default.nix b/pkgs/by-name/r3/r3ctl/package.nix
similarity index 88%
rename from pkgs/tools/misc/r3ctl/default.nix
rename to pkgs/by-name/r3/r3ctl/package.nix
index 892b618e44f9..79580d929c88 100644
--- a/pkgs/tools/misc/r3ctl/default.nix
+++ b/pkgs/by-name/r3/r3ctl/package.nix
@@ -2,10 +2,6 @@
   stdenv,
   lib,
   qt5,
-  qtbase,
-  qttools,
-  qtwebsockets,
-  qtmultimedia,
   fetchFromGitHub,
 }:
 
@@ -34,10 +30,10 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    qtbase
-    qttools
-    qtmultimedia
-    qtwebsockets
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtmultimedia
+    qt5.qtwebsockets
   ];
 
   meta = {
diff --git a/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch b/pkgs/by-name/re/recoll/0001-no-qtgui-darwin-bundle.patch
similarity index 100%
rename from pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch
rename to pkgs/by-name/re/recoll/0001-no-qtgui-darwin-bundle.patch
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/by-name/re/recoll/package.nix
similarity index 97%
rename from pkgs/applications/search/recoll/default.nix
rename to pkgs/by-name/re/recoll/package.nix
index 382c681634c0..f90707fa4b4d 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/by-name/re/recoll/package.nix
@@ -29,9 +29,7 @@
   pkg-config,
   poppler-utils,
   python3Packages,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   unrtf,
   untex,
   unzip,
@@ -120,11 +118,11 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optionals withGui [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
   ]
   ++ lib.optionals withPython [
     python3Packages.setuptools
@@ -145,7 +143,7 @@ stdenv.mkDerivation rec {
     file
   ]
   ++ lib.optionals withGui [
-    qtbase
+    libsForQt5.qtbase
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/by-name/re/rescuetime/package.nix
similarity index 98%
rename from pkgs/applications/misc/rescuetime/default.nix
rename to pkgs/by-name/re/rescuetime/package.nix
index 5dcec2b91675..da2588ca7d5d 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/by-name/re/rescuetime/package.nix
@@ -3,7 +3,6 @@
   lib,
   fetchurl,
   dpkg,
-  wrapQtAppsHook,
   patchelf,
   qt5,
   libxtst,
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
   inherit src;
   nativeBuildInputs = [
     dpkg
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   # avoid https://github.com/NixOS/patchelf/issues/99
   dontStrip = true;
diff --git a/pkgs/applications/networking/p2p/retroshare/no-submodules.patch b/pkgs/by-name/re/retroshare/no-submodules.patch
similarity index 100%
rename from pkgs/applications/networking/p2p/retroshare/no-submodules.patch
rename to pkgs/by-name/re/retroshare/no-submodules.patch
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/by-name/re/retroshare/package.nix
similarity index 95%
rename from pkgs/applications/networking/p2p/retroshare/default.nix
rename to pkgs/by-name/re/retroshare/package.nix
index 4deaf0eca7c8..dc164b52c6f0 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/by-name/re/retroshare/package.nix
@@ -3,10 +3,8 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch2,
-  qmake,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   miniupnpc,
   bzip2,
   speex,
@@ -16,9 +14,7 @@
   sqlcipher,
   rapidjson,
   libxscrnsaver,
-  qtbase,
-  qtx11extras,
-  qtmultimedia,
+  libsForQt5,
   libgnome-keyring,
 }:
 
@@ -50,16 +46,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     speex
     miniupnpc
-    qtmultimedia
-    qtx11extras
-    qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtx11extras
+    libsForQt5.qtbase
     libgnome-keyring
     bzip2
     libxscrnsaver
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/by-name/rg/rgp/package.nix
similarity index 100%
rename from pkgs/development/tools/rgp/default.nix
rename to pkgs/by-name/rg/rgp/package.nix
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/by-name/ro/rocket/package.nix
similarity index 87%
rename from pkgs/tools/graphics/rocket/default.nix
rename to pkgs/by-name/ro/rocket/package.nix
index d3db5906f9b4..4580cad9a4f0 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/by-name/ro/rocket/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -19,10 +17,10 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   dontConfigure = true;
 
diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/by-name/se/seer/package.nix
similarity index 98%
rename from pkgs/development/tools/misc/seer/default.nix
rename to pkgs/by-name/se/seer/package.nix
index 263b67ec465c..991d70136bbb 100644
--- a/pkgs/development/tools/misc/seer/default.nix
+++ b/pkgs/by-name/se/seer/package.nix
@@ -5,7 +5,6 @@
   cmake,
   gdb,
   kdePackages,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/by-name/si/simplescreenrecorder/package.nix
similarity index 92%
rename from pkgs/applications/video/simplescreenrecorder/default.nix
rename to pkgs/by-name/si/simplescreenrecorder/package.nix
index e58e8475fe22..e04c684a35b2 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/by-name/si/simplescreenrecorder/package.nix
@@ -8,7 +8,6 @@
   libx11,
   libxext,
   libxinerama,
-  qtx11extras,
   libxfixes,
   libGLU,
   libGL,
@@ -16,9 +15,7 @@
   libpulseaudio,
   libv4l,
   pipewire,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   cmake,
   ninja,
   unstableGitUpdater,
@@ -53,7 +50,7 @@ stdenv.mkDerivation {
     pkg-config
     cmake
     ninja
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -69,9 +66,9 @@ stdenv.mkDerivation {
     libpulseaudio
     libv4l
     pipewire
-    qtbase
-    qttools
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtx11extras
   ];
 
   passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/by-name/tw/twinkle/package.nix
similarity index 90%
rename from pkgs/applications/networking/instant-messengers/twinkle/default.nix
rename to pkgs/by-name/tw/twinkle/package.nix
index 67e00c5c379a..742b5078d77d 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/by-name/tw/twinkle/package.nix
@@ -11,14 +11,11 @@
   flex,
   ucommon,
   ccrtp,
-  qtbase,
-  qttools,
-  qtquickcontrols2,
   alsa-lib,
   speex,
   ilbc,
   bcg729,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,9 +36,9 @@ stdenv.mkDerivation rec {
     readline
     ucommon
     ccrtp
-    qtbase
-    qttools
-    qtquickcontrols2
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtquickcontrols2
     alsa-lib
     speex
     ilbc
@@ -52,7 +49,7 @@ stdenv.mkDerivation rec {
     bison
     flex
     bcg729
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/by-name/tw/twmn/package.nix
similarity index 90%
rename from pkgs/applications/misc/twmn/default.nix
rename to pkgs/by-name/tw/twmn/package.nix
index e3eb09fce7d7..fca23736c6ed 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/by-name/tw/twmn/package.nix
@@ -2,10 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   boost,
 }:
 
@@ -22,11 +20,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     boost
   ];
 
diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/by-name/un/unigine-superposition/package.nix
similarity index 97%
rename from pkgs/applications/graphics/unigine-superposition/default.nix
rename to pkgs/by-name/un/unigine-superposition/package.nix
index caf2ac5bfa62..1d07d10fbd26 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/by-name/un/unigine-superposition/package.nix
@@ -6,7 +6,7 @@
   freetype,
   fontconfig,
   zlib,
-  qtquickcontrols2,
+  libsForQt5,
   libxinerama,
   libxcb,
   libsm,
@@ -51,7 +51,7 @@ let
       freetype
       fontconfig
       zlib
-      qtquickcontrols2
+      libsForQt5.qtquickcontrols2
       libxinerama
       libxcb
       libsm
@@ -108,7 +108,7 @@ buildFHSEnv {
     freetype
     fontconfig
     zlib
-    qtquickcontrols2
+    libsForQt5.qtquickcontrols2
     libxinerama
     libxcb
     libsm
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/by-name/va/valentina/package.nix
similarity index 82%
rename from pkgs/applications/misc/valentina/default.nix
rename to pkgs/by-name/va/valentina/package.nix
index e66cef47eaa4..ffb78b73ea28 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/by-name/va/valentina/package.nix
@@ -3,11 +3,7 @@
   stdenv,
   fetchFromGitLab,
   installShellFiles,
-  qmake,
-  qttools,
-  qtsvg,
-  qtxmlpatterns,
-  wrapQtAppsHook,
+  libsForQt5,
   autoPatchelfHook,
 }:
 
@@ -24,20 +20,20 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/app/translations.pri \
-      --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease'
+      --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev libsForQt5.qttools}/bin/lrelease'
   '';
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
     installShellFiles
     autoPatchelfHook
   ];
 
   buildInputs = [
-    qtsvg
-    qtxmlpatterns
+    libsForQt5.qtsvg
+    libsForQt5.qtxmlpatterns
   ];
 
   qmakeFlags = [
diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/by-name/xf/xflr5/package.nix
similarity index 90%
rename from pkgs/applications/science/physics/xflr5/default.nix
rename to pkgs/by-name/xf/xflr5/package.nix
index 2ec048864429..6b17cbbe22a6 100644
--- a/pkgs/applications/science/physics/xflr5/default.nix
+++ b/pkgs/by-name/xf/xflr5/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchsvn,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,8 +17,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = {
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/by-name/xx/xxdiff/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/xxdiff/default.nix
rename to pkgs/by-name/xx/xxdiff/package.nix
diff --git a/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch b/pkgs/by-name/zb/zbar/darwin-segfault-optimized-pointer-assignment.patch
similarity index 100%
rename from pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch
rename to pkgs/by-name/zb/zbar/darwin-segfault-optimized-pointer-assignment.patch
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/by-name/zb/zbar/package.nix
similarity index 96%
rename from pkgs/tools/graphics/zbar/default.nix
rename to pkgs/by-name/zb/zbar/package.nix
index 88f7d8193c78..cd879801723c 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/by-name/zb/zbar/package.nix
@@ -8,10 +8,7 @@
   withXorg ? true,
   libx11,
   libv4l,
-  qtbase,
-  qtwayland,
-  qtx11extras,
-  wrapQtAppsHook,
+  libsForQt5,
   wrapGAppsHook3,
   gtk3,
   xmlto,
@@ -77,8 +74,8 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals enableVideo [
     wrapGAppsHook3
-    wrapQtAppsHook
-    qtbase
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qtbase
   ];
 
   buildInputs = [
@@ -97,9 +94,9 @@ stdenv.mkDerivation rec {
   ++ lib.optionals enableVideo [
     libv4l
     gtk3
-    qtbase
-    qtwayland
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtwayland
+    libsForQt5.qtx11extras
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix b/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix
deleted file mode 100644
index 77160283afee..000000000000
--- a/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-fetchpatch:
-# https://github.com/Gecode/gecode/pull/74
-(fetchpatch {
-  name = "fix-const-weights-clang.patch";
-  url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
-  sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad12b336ec31..52783db9eb3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -417,8 +417,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  r3ctl = qt5.callPackage ../tools/misc/r3ctl { };
-
   deviceTree = callPackage ../os-specific/linux/device-tree { };
 
   octodns-providers = octodns.providers;
@@ -1069,8 +1067,6 @@ with pkgs;
 
   linux-router-without-wifi = linux-router.override { useWifiDependencies = false; };
 
-  makehuman = libsForQt5.callPackage ../applications/misc/makehuman { };
-
   mkosi-full = mkosi.override { withQemu = true; };
 
   openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };
@@ -1082,8 +1078,6 @@ with pkgs;
 
   py7zr = with python3Packages; toPythonApplication py7zr;
 
-  qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };
-
   inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
 
   sdkmanager = with python3Packages; toPythonApplication sdkmanager;
@@ -1640,8 +1634,6 @@ with pkgs;
     coreboot-utils
     ;
 
-  coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
-
   intelLlvmStdenv = intel-llvm.stdenv;
 
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
@@ -1662,8 +1654,6 @@ with pkgs;
     inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };
 
-  dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { };
-
   ding = callPackage ../applications/misc/ding {
     aspellDicts_de = aspellDicts.de;
     aspellDicts_en = aspellDicts.en;
@@ -1755,8 +1745,6 @@ with pkgs;
 
   futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark;
 
-  g2o = libsForQt5.callPackage ../development/libraries/g2o { };
-
   inherit (go-containerregistry) crane gcrane;
 
   geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { };
@@ -1774,8 +1762,6 @@ with pkgs;
 
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
-  hopper = qt5.callPackage ../development/tools/analysis/hopper { };
-
   hypr = callPackage ../applications/window-managers/hyprwm/hypr {
     cairo = cairo.override { xcbSupport = true; };
   };
@@ -1811,10 +1797,6 @@ with pkgs;
 
   kaggle = with python3Packages; toPythonApplication kaggle;
 
-  maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { };
-
-  maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { };
-
   materialx = with python3Packages; toPythonApplication materialx;
 
   # while building documentation meson may want to run binaries for host
@@ -1930,8 +1912,6 @@ with pkgs;
 
   davix-copy = davix.override { enableThirdPartyCopy = true; };
 
-  cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
-
   libceph = ceph.lib;
   ceph-client = ceph.client;
   ceph-dev = ceph;
@@ -2068,8 +2048,6 @@ with pkgs;
     provider = "calyx";
   };
 
-  cask-server = libsForQt5.callPackage ../applications/misc/cask-server { };
-
   cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
 
   clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { };
@@ -2148,8 +2126,6 @@ with pkgs;
 
   dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };
 
-  ddcui = libsForQt5.callPackage ../applications/misc/ddcui { };
-
   inherit (callPackages ../applications/networking/p2p/deluge { })
     deluge-gtk
     deluged
@@ -2164,8 +2140,6 @@ with pkgs;
 
   diffutils = callPackage ../tools/text/diffutils { };
 
-  dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
-
   inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; })
     dub-to-nix
     importDubLock
@@ -2231,8 +2205,6 @@ with pkgs;
 
   emborg = python3Packages.callPackage ../development/python-modules/emborg { };
 
-  evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { };
-
   executor = with python3Packages; toPythonApplication executor;
 
   exiftool = perlPackages.ImageExifTool;
@@ -2241,8 +2213,6 @@ with pkgs;
 
   Fabric = with python3Packages; toPythonApplication fabric;
 
-  chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { };
-
   fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { };
 
   fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; };
@@ -2317,8 +2287,6 @@ with pkgs;
 
   gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { };
 
-  glogg = libsForQt5.callPackage ../tools/text/glogg { };
-
   gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
     inherit (gst_all_1)
       gstreamer
@@ -2495,8 +2463,6 @@ with pkgs;
 
   httpie = with python3Packages; toPythonApplication httpie;
 
-  hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { };
-
   humanfriendly = with python3Packages; toPythonApplication humanfriendly;
 
   hw-probe = perlPackages.callPackage ../tools/system/hw-probe { };
@@ -2614,8 +2580,6 @@ with pkgs;
 
   limine-full = limine.override { enableAll = true; };
 
-  loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { };
-
   logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
     # https://www.elastic.co/support/matrix#logstash-and-jvm
     jre = jdk11_headless;
@@ -2633,8 +2597,6 @@ with pkgs;
     lua = lua5_2_compat;
   };
 
-  kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
-
   lagrange-tui = lagrange.override { enableTUI = true; };
 
   kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };
@@ -2931,8 +2893,6 @@ with pkgs;
 
   pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
 
-  nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
-
   nsjail = callPackage ../tools/security/nsjail {
     protobuf = protobuf_21;
   };
@@ -3148,22 +3108,14 @@ with pkgs;
     provider = "riseup";
   };
 
-  rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
-
   rtaudio = rtaudio_5;
 
   mpi = openmpi; # this attribute should used to build MPI applications
 
-  qarte = libsForQt5.callPackage ../applications/video/qarte { };
-
   qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
-  qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { };
-
   qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
 
-  qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };
-
   quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
 
   radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
@@ -3192,18 +3144,12 @@ with pkgs;
     opensslSupport = false;
   };
 
-  qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { };
-
-  recoll = libsForQt5.callPackage ../applications/search/recoll { };
-
   recoll-nox = recoll.override { withGui = false; };
 
   remote-exec = python3Packages.callPackage ../tools/misc/remote-exec { };
 
   reptor = with python3.pkgs; toPythonApplication reptor;
 
-  rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { };
-
   inherit (callPackage ../development/misc/resholve { })
     resholve
     ;
@@ -3248,7 +3194,6 @@ with pkgs;
   slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
 
   # aka., pgp-tools
-  simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
 
   snapcast = callPackage ../applications/audio/snapcast {
     pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
@@ -3499,8 +3444,6 @@ with pkgs;
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
-  zbar = libsForQt5.callPackage ../tools/graphics/zbar { };
-
   # Nvidia support does not require any proprietary libraries, so CI can build it.
   # Note that when enabling this unconditionally, non-nvidia users will always have an empty "GPU" section.
   zenith-nvidia = zenith.override {
@@ -5631,15 +5574,11 @@ with pkgs;
 
   drake = callPackage ../development/tools/build-managers/drake { };
 
-  edb = libsForQt5.callPackage ../development/tools/misc/edb { };
-
   # NOTE: Override and set useIcon = false to use Awk instead of Icon.
   fffuu = haskell.lib.compose.justStaticExecutables (
     haskellPackages.callPackage ../tools/misc/fffuu { }
   );
 
-  gede = libsForQt5.callPackage ../development/tools/misc/gede { };
-
   gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
 
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
@@ -5823,8 +5762,6 @@ with pkgs;
 
   pycritty = with python3Packages; toPythonApplication pycritty;
 
-  qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit { };
-
   radare2 = callPackage ../development/tools/analysis/radare2 (
     {
       lua = lua5;
@@ -5862,8 +5799,6 @@ with pkgs;
     buildDocs = false;
   };
 
-  seer = libsForQt5.callPackage ../development/tools/misc/seer { };
-
   sbt = callPackage ../development/tools/build-managers/sbt { };
   sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
   simpleBuildTool = sbt;
@@ -5968,8 +5903,6 @@ with pkgs;
 
   xcodebuild = xcbuild;
 
-  xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { };
-
   xxdiff-tip = xxdiff;
 
   yq = python3.pkgs.toPythonApplication python3.pkgs.yq;
@@ -6189,10 +6122,6 @@ with pkgs;
 
   gamt = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; };
 
-  gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
-  gecode_6 = qt5.callPackage ../development/libraries/gecode { };
-  gecode = gecode_6;
-
   geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
 
   geoipWithDatabase = makeOverridable (callPackage ../by-name/ge/geoip/package.nix) {
@@ -6422,8 +6351,6 @@ with pkgs;
     withIcu = true;
   };
 
-  herqq = libsForQt5.callPackage ../development/libraries/herqq { };
-
   highfive-mpi = highfive.override { hdf5 = hdf5-mpi; };
 
   hunspellDicts = recurseIntoAttrs (callPackages ../by-name/hu/hunspell/dictionaries.nix { });
@@ -6882,8 +6809,6 @@ with pkgs;
 
   mygpoclient = with python3.pkgs; toPythonApplication mygpoclient;
 
-  nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { };
-
   nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { };
 
   ncurses5 = ncurses.override {
@@ -6937,8 +6862,6 @@ with pkgs;
 
   nvidia-vaapi-driver = hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
 
-  nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { };
-
   nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage stdenv; });
 
   inherit (callPackages ../development/libraries/ogre { })
@@ -7118,8 +7041,6 @@ with pkgs;
 
   pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
 
-  qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };
-
   qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
 
   quartoMinimal = quarto.override {
@@ -8387,8 +8308,6 @@ with pkgs;
   btop-cuda = btop.override { cudaSupport = true; };
   btop-rocm = btop.override { rocmSupport = true; };
 
-  i7z = qt5.callPackage ../os-specific/linux/i7z { };
-
   ipu6ep-camera-hal = ipu6-camera-hal.override {
     ipuVersion = "ipu6ep";
   };
@@ -8407,8 +8326,6 @@ with pkgs;
   libkrun-sev = libkrun.override { variant = "sev"; };
   libkrun-tdx = libkrun.override { variant = "tdx"; };
 
-  projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { };
-
   lklWithFirewall = lkl.override { firewallSupport = true; };
 
   inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; })
@@ -9036,16 +8953,12 @@ with pkgs;
     inherit (texFunctions) fontsConf;
   };
 
-  awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };
-
   backintime = backintime-qt;
 
   bespokesynth-with-vst2 = bespokesynth.override {
     enableVST2 = true;
   };
 
-  bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
-
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
   bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };
 
@@ -9095,10 +9008,6 @@ with pkgs;
   cni = callPackage ../applications/networking/cluster/cni { };
   cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { };
 
-  communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
-
-  confclerk = libsForQt5.callPackage ../applications/misc/confclerk { };
-
   codeblocksFull = codeblocks.override { contribPlugins = true; };
 
   cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };
@@ -9430,8 +9339,6 @@ with pkgs;
     }
   );
 
-  linssid = libsForQt5.callPackage ../applications/networking/linssid { };
-
   deadd-notification-center = haskell.lib.compose.justStaticExecutables (
     haskellPackages.callPackage ../applications/misc/deadd-notification-center { }
   );
@@ -9447,19 +9354,13 @@ with pkgs;
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 
-  googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
-
   gpsbabel-gui = gpsbabel.override {
     withGUI = true;
     withDoc = true;
   };
 
-  guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
-
   hachoir = with python3Packages; toPythonApplication hachoir;
 
-  heimer = libsForQt5.callPackage ../applications/misc/heimer { };
-
   hydrogen-web-unwrapped =
     callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
       { };
@@ -9485,8 +9386,6 @@ with pkgs;
 
   hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack;
 
-  hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
-
   hyperglot = with python3Packages; toPythonApplication hyperglot;
 
   jackline = callPackage ../applications/networking/instant-messengers/jackline {
@@ -9650,8 +9549,6 @@ with pkgs;
     callPackage ../applications/networking/cluster/helm/plugins { }
   );
 
-  kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { };
-
   ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
     fftw = fftwSinglePrec;
   };
@@ -9713,8 +9610,6 @@ with pkgs;
 
   luddite = with python3Packages; toPythonApplication luddite;
 
-  lyx = libsForQt5.callPackage ../applications/misc/lyx { };
-
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
 
   magnetophonDSP = recurseIntoAttrs {
@@ -9743,8 +9638,6 @@ with pkgs;
 
   mercurialFull = mercurial.override { fullBuild = true; };
 
-  michabo = libsForQt5.callPackage ../applications/misc/michabo { };
-
   minitube = kdePackages.callPackage ../applications/video/minitube { };
 
   mldonkey = callPackage ../applications/networking/p2p/mldonkey {
@@ -9829,8 +9722,6 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  natron = libsForQt5.callPackage ../applications/video/natron { };
-
   netmaker = callPackage ../applications/networking/netmaker { subPackages = [ "." ]; };
   netmaker-full = callPackage ../applications/networking/netmaker { };
 
@@ -9886,14 +9777,10 @@ with pkgs;
     enableGL = false;
   };
 
-  diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
-
   mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };
 
   mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
 
-  mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
-
   ncdu_1 = callPackage ../by-name/nc/ncdu/1.nix { };
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
@@ -9913,10 +9800,6 @@ with pkgs;
   obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins { });
   wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
 
-  openambit = qt5.callPackage ../applications/misc/openambit { };
-
-  openbrf = libsForQt5.callPackage ../applications/misc/openbrf { };
-
   opencpn = callPackage ../applications/misc/opencpn {
     inherit (darwin) DarwinTools;
   };
@@ -9942,8 +9825,6 @@ with pkgs;
     kreative-square
     ;
 
-  opentx = libsForQt5.callPackage ../applications/misc/opentx { };
-
   openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon;
 
   orpie = callPackage ../applications/misc/orpie {
@@ -9987,23 +9868,15 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
-
   puredata-with-plugins =
     plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };
 
-  pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { };
-
   qbittorrent-nox = qbittorrent.override { guiSupport = false; };
 
   qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; };
 
-  qctools = libsForQt5.callPackage ../applications/video/qctools { };
-
   qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };
 
-  eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
-
   qemu-python-utils = python3Packages.toPythonApplication (
     python3Packages.qemu.override {
       fuseSupport = true;
@@ -10027,14 +9900,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
-
-  qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
-
-  qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
-
-  quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
-
   quasselClient = quassel.override {
     monolithic = false;
     client = true;
@@ -10087,10 +9952,6 @@ with pkgs;
 
   rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { };
 
-  retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
-
-  rgp = libsForQt5.callPackage ../development/tools/rgp { };
-
   ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; };
 
   ripcord =
@@ -10160,8 +10021,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  cura = libsForQt5.callPackage ../applications/misc/cura { };
-
   curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { });
 
   super-slicer-beta = super-slicer.beta;
@@ -10344,10 +10203,6 @@ with pkgs;
 
   tuxclocker-without-unfree = libsForQt5.callPackage ../applications/misc/tuxclocker { };
 
-  twmn = libsForQt5.callPackage ../applications/misc/twmn { };
-
-  twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
-
   linphonePackages = recurseIntoAttrs (
     callPackage ../applications/networking/instant-messengers/linphone { }
   );
@@ -10372,12 +10227,8 @@ with pkgs;
 
   unigine-sanctuary = pkgsi686Linux.callPackage ../applications/graphics/unigine-sanctuary { };
 
-  unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { };
-
   uuagc = haskell.lib.compose.justStaticExecutables haskellPackages.uuagc;
 
-  valentina = libsForQt5.callPackage ../applications/misc/valentina { };
-
   vdirsyncer = with python3Packages; toPythonApplication vdirsyncer;
 
   vim = vimUtils.makeCustomizable (
@@ -10422,8 +10273,6 @@ with pkgs;
 
   vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
 
-  qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { };
-
   # this is a lower-level alternative to wrapNeovim conceived to handle
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative
@@ -10745,8 +10594,6 @@ with pkgs;
 
   napari = with python312Packages; toPythonApplication napari;
 
-  nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
-
   pycoin = with python3Packages; toPythonApplication pycoin;
 
   inherit (callPackages ../applications/blockchains/teos { })
@@ -11321,8 +11168,6 @@ with pkgs;
 
   ### SCIENCE/PHYSICS
 
-  xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
-
   ### SCIENCE/LOGIC
 
   abella = callPackage ../applications/science/logic/abella {
@@ -11453,8 +11298,6 @@ with pkgs;
   simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; };
   simulide_1_2_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.2.0"; };
 
-  degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
-
   geda = callPackage ../applications/science/electronics/geda {
     guile = guile_2_2;
   };
@@ -11558,8 +11401,6 @@ with pkgs;
 
   ### MISC
 
-  antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
-
   brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { };
 
   foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix {
@@ -11986,8 +11827,6 @@ with pkgs;
 
   torcs-without-data = callPackage ../../pkgs/by-name/to/torcs/without-data.nix { };
 
-  nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };
-
   nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { };
 
   hy = with python3Packages; toPythonApplication hy;
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 6e753238312f..351bae3541fa 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -76,7 +76,7 @@ makeScopeWithSplicing' {
 
         grantlee = callPackage ../development/libraries/grantlee/5 { };
 
-        herqq = callPackage ../development/libraries/herqq { };
+        herqq = callPackage ../by-name/he/herqq/package.nix { };
 
         kcolorpicker = callPackage ../development/libraries/kcolorpicker { };