diff --git a/ci/OWNERS b/ci/OWNERS
index 43ef6f666651..463c546e695b 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -39,6 +39,7 @@
 /lib/derivations.nix        @NixOS/stdenv
 /lib/fetchers.nix           @alyssais @NixOS/stdenv
 /lib/meta.nix               @alyssais @NixOS/stdenv
+/lib/meta-types.nix         @infinisil @adisbladis @NixOS/stdenv
 /lib/source-types.nix       @alyssais @NixOS/stdenv
 /lib/systems                @alyssais @NixOS/stdenv
 ## Libraries / Module system
@@ -67,7 +68,6 @@
 /pkgs/stdenv/generic/problems.nix                @infinisil
 /pkgs/test/problems                              @infinisil
 /pkgs/stdenv/generic/check-meta.nix              @infinisil @Ericson2314 @adisbladis @NixOS/stdenv
-/pkgs/stdenv/generic/meta-types.nix              @infinisil @adisbladis @NixOS/stdenv
 /pkgs/stdenv/cross                               @Ericson2314 @NixOS/stdenv
 /pkgs/build-support                              @philiptaron
 /pkgs/build-support/cc-wrapper                   @Ericson2314
diff --git a/ci/default.nix b/ci/default.nix
index c91c82867e8e..6ade8164d503 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -26,11 +26,7 @@ let
 
   fmt =
     let
-      treefmtNixSrc = fetchTarball {
-        inherit (pinned.treefmt-nix) url;
-        sha256 = pinned.treefmt-nix.hash;
-      };
-      treefmtEval = (import treefmtNixSrc).evalModule pkgs ./treefmt.nix;
+      treefmt = pkgs.treefmt.withConfig ./treefmt.nix;
       fs = pkgs.lib.fileset;
       nixFilesSrc = fs.toSource {
         root = ../.;
@@ -38,9 +34,8 @@ let
       };
     in
     {
-      shell = treefmtEval.config.build.devShell;
-      pkg = treefmtEval.config.build.wrapper;
-      check = treefmtEval.config.build.check nixFilesSrc;
+      pkg = treefmt;
+      check = treefmt.check nixFilesSrc;
     };
 
 in
diff --git a/ci/pinned.json b/ci/pinned.json
index 0e8f2b8ff61c..fc034a85bccf 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -12,19 +12,6 @@
       "revision": "8c91a71d13451abc40eb9dae8910f972f979852f",
       "url": "https://github.com/NixOS/nixpkgs/archive/8c91a71d13451abc40eb9dae8910f972f979852f.tar.gz",
       "hash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE="
-    },
-    "treefmt-nix": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "numtide",
-        "repo": "treefmt-nix"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "db947814a175b7ca6ded66e21383d938df01c227",
-      "url": "https://github.com/numtide/treefmt-nix/archive/db947814a175b7ca6ded66e21383d938df01c227.tar.gz",
-      "hash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM="
     }
   },
   "version": 8
diff --git a/ci/treefmt.nix b/ci/treefmt.nix
index 9575e99d8680..2d0a782c7ace 100644
--- a/ci/treefmt.nix
+++ b/ci/treefmt.nix
@@ -1,122 +1,172 @@
-{ pkgs, ... }: {
-  # Important: The auto-rebase script uses `git filter-branch --tree-filter`,
-  # which creates trees within the Git repository under `.git-rewrite/t`,
-  # notably without having a `.git` themselves.
-  # So if this projectRootFile were the default `.git/config`,
-  # having the auto-rebase script use treefmt on such a tree would make it
-  # format all files in the _parent_ Git tree as well.
-  projectRootFile = ".git-blame-ignore-revs";
-
-  # Be a bit more verbose by default, so we can see progress happening
-  settings.verbose = 1;
-
-  # By default it's info, which is too noisy since we have many unmatched files
-  settings.on-unmatched = "debug";
-
-  programs.actionlint.enable = true;
-
-  programs.biome = {
-    enable = true;
-    # Disable settings validation because its inputs are liable to hash mismatch
-    validate.enable = false;
-    settings.formatter = {
-      useEditorconfig = true;
-    };
-    settings.javascript.formatter = {
-      quoteStyle = "single";
-      semicolons = "asNeeded";
-    };
-    settings.json.formatter.enabled = false;
-  };
-  settings.formatter.biome.excludes = [
-    "*.min.js"
-    "pkgs/*"
-  ];
-
-  programs.keep-sorted.enable = true;
-
-  # This uses nixfmt underneath, the default formatter for Nix code.
-  # See https://github.com/NixOS/nixfmt
-  programs.nixfmt = {
-    enable = true;
-    package = pkgs.nixfmt;
-  };
-
-  programs.yamlfmt = {
-    enable = true;
-    settings.formatter = {
-      retain_line_breaks = true;
-    };
-  };
-  settings.formatter.yamlfmt.excludes = [
-    # Aligns comments with whitespace
-    "pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml"
-    # TODO: Fix formatting for auto-generated file
-    "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml"
-  ];
-
-  programs.nixf-diagnose = {
-    enable = true;
-    ignore = [
-      # Rule names can currently be looked up here:
-      # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py
-      # TODO: Remove the following and fix things.
-      "sema-unused-def-lambda-noarg-formal"
-      "sema-unused-def-lambda-witharg-arg"
-      "sema-unused-def-lambda-witharg-formal"
-      "sema-unused-def-let"
-      # Keep this rule, because we have `lib.or`.
-      "or-identifier"
-      # TODO: remove after outstanding prelude diagnostics issues are fixed:
-      # https://github.com/nix-community/nixd/issues/761
-      # https://github.com/nix-community/nixd/issues/762
-      "sema-primop-removed-prefix"
-      "sema-primop-overridden"
-      "sema-constant-overridden"
-      "sema-primop-unknown"
-    ];
-  };
-  settings.formatter.nixf-diagnose = {
-    # Ensure nixfmt cleans up after nixf-diagnose.
-    priority = -1;
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  settings = {
+    # numtide/treefmt-nix defaults
     excludes = [
-      # Auto-generated; violates sema-extra-with
-      # Can only sensibly be removed when --auto-fix supports multiple fixes at once:
-      # https://github.com/inclyc/nixf-diagnose/issues/13
-      "pkgs/servers/home-assistant/component-packages.nix"
-      # https://github.com/nix-community/nixd/issues/708
-      "nixos/maintainers/scripts/azure-new/examples/basic/system.nix"
+      "*.lock"
+      "*.patch"
+      "*.diff"
+      "package-lock.json"
+      "go.mod"
+      "go.sum"
+      ".gitattributes"
+      ".gitignore"
+      ".gitmodules"
+      "COPYING"
+      "LICENSE"
     ];
-  };
 
-  settings.formatter.editorconfig-checker = {
-    command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";
-    options = [
-      "-disable-indent-size"
-      # TODO: Remove this once this upstream issue is fixed:
-      #   https://github.com/editorconfig-checker/editorconfig-checker/issues/505
-      "-disable-charset"
-    ];
-    includes = [ "*" ];
-    priority = 1;
-  };
+    # Be a bit more verbose by default, so we can see progress happening
+    verbose = 1;
 
-  # TODO: Upstream this into treefmt-nix eventually:
-  #   https://github.com/numtide/treefmt-nix/issues/387
-  settings.formatter.markdown-code-runner = {
-    command = pkgs.lib.getExe pkgs.markdown-code-runner;
-    options =
-      let
-        config = pkgs.writers.writeTOML "markdown-code-runner-config" {
-          presets.nixfmt = {
-            language = "nix";
-            command = [ (pkgs.lib.getExe pkgs.nixfmt) ];
-          };
-        };
-      in
-      [ "--config=${config}" ];
-    includes = [ "*.md" ];
-  };
+    # By default it's info, which is too noisy since we have many unmatched files
+    on-unmatched = "debug";
 
-  programs.zizmor.enable = true;
+    formatter = {
+      # keep-sorted start block=yes newline_separated=yes
+      actionlint = {
+        command = lib.getExe pkgs.actionlint;
+        includes = [
+          ".github/workflows/*.yml"
+          ".github/workflows/*.yaml"
+        ];
+      };
+
+      biome = {
+        command = lib.getExe pkgs.biome;
+        excludes = [
+          "*.min.js"
+          "pkgs/*"
+        ];
+        includes = [
+          "*.js"
+          "*.ts"
+          "*.mjs"
+          "*.mts"
+          "*.cjs"
+          "*.cts"
+          "*.jsx"
+          "*.tsx"
+          "*.d.ts"
+          "*.d.cts"
+          "*.d.mts"
+          "*.css"
+        ];
+        options = [
+          "check"
+          "--write"
+          "--no-errors-on-unmatched"
+          "--use-editorconfig=true"
+          "--javascript-formatter-quote-style=single"
+          "--semicolons=as-needed"
+        ];
+      };
+
+      editorconfig-checker = {
+        command = lib.getExe pkgs.editorconfig-checker;
+        options = [
+          "-disable-indent-size"
+          # TODO: Remove this once this upstream issue is fixed:
+          #   https://github.com/editorconfig-checker/editorconfig-checker/issues/505
+          "-disable-charset"
+        ];
+        includes = [ "*" ];
+        priority = 1;
+      };
+
+      keep-sorted = {
+        command = lib.getExe pkgs.keep-sorted;
+        includes = [ "*" ];
+      };
+
+      markdown-code-runner = {
+        command = lib.getExe pkgs.markdown-code-runner;
+        options =
+          let
+            config = pkgs.writers.writeTOML "markdown-code-runner-config" {
+              presets.nixfmt = {
+                language = "nix";
+                command = [ (lib.getExe pkgs.nixfmt) ];
+              };
+            };
+          in
+          [ "--config=${config}" ];
+        includes = [ "*.md" ];
+      };
+
+      nixf-diagnose = {
+        command = lib.getExe pkgs.nixf-diagnose;
+        excludes = [
+          # Auto-generated; violates sema-extra-with
+          # Can only sensibly be removed when --auto-fix supports multiple fixes at once:
+          # https://github.com/inclyc/nixf-diagnose/issues/13
+          "pkgs/servers/home-assistant/component-packages.nix"
+          # https://github.com/nix-community/nixd/issues/708
+          "nixos/maintainers/scripts/azure-new/examples/basic/system.nix"
+        ];
+        includes = [ "*.nix" ];
+        options = [
+          "--auto-fix"
+          # Rule names can currently be looked up here:
+          # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py
+          # TODO: Remove the following and fix things.
+          "--ignore=sema-unused-def-lambda-noarg-formal"
+          "--ignore=sema-unused-def-lambda-witharg-arg"
+          "--ignore=sema-unused-def-lambda-witharg-formal"
+          "--ignore=sema-unused-def-let"
+          # Keep this rule, because we have `lib.or`.
+          "--ignore=or-identifier"
+          # TODO: remove after outstanding prelude diagnostics issues are fixed:
+          # https://github.com/nix-community/nixd/issues/761
+          # https://github.com/nix-community/nixd/issues/762
+          "--ignore=sema-primop-removed-prefix"
+          "--ignore=sema-primop-overridden"
+          "--ignore=sema-constant-overridden"
+          "--ignore=sema-primop-unknown"
+        ];
+        # Ensure nixfmt cleans up after nixf-diagnose.
+        priority = -1;
+      };
+
+      # This uses nixfmt underneath, the default formatter for Nix code.
+      # See https://github.com/NixOS/nixfmt
+      nixfmt = {
+        command = lib.getExe pkgs.nixfmt;
+        includes = [ "*.nix" ];
+      };
+
+      yamlfmt = {
+        command = lib.getExe pkgs.yamlfmt;
+        excludes = [
+          # Aligns comments with whitespace
+          "pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml"
+          # TODO: Fix formatting for auto-generated file
+          "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml"
+        ];
+        includes = [
+          "*.yaml"
+          "*.yml"
+        ];
+        options = [
+          "-formatter"
+          "retain_line_breaks=true"
+        ];
+      };
+
+      zizmor = {
+        command = lib.getExe pkgs.zizmor;
+        includes = [
+          ".github/workflows/*.yml"
+          ".github/workflows/*.yaml"
+          ".github/actions/**/*.yml"
+          ".github/actions/**/*.yaml"
+        ];
+      };
+      # keep-sorted end
+    };
+  };
 }
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 7dae595c9e39..811225c542f1 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1800,22 +1800,28 @@ rec {
     :::
   */
   matchAttrs =
-    pattern: attrs:
+    let
+      recurse =
+        pattern: attrs:
+        all (
+          # Compare equality between `pattern` & `attrs`.
+          attr:
+          # Missing attr, not equal.
+          attrs ? ${attr}
+          && (
+            let
+              lhs = pattern.${attr};
+              rhs = attrs.${attr};
+            in
+            # Simple equality check is primarily for non-attrsets, but we run it
+            # on attrsets too, since it may let us avoid recursing
+            lhs == rhs || isAttrs lhs && isAttrs rhs && recurse lhs rhs
+          )
+        ) (attrNames pattern);
+    in
+    pattern:
     assert isAttrs pattern;
-    all (
-      # Compare equality between `pattern` & `attrs`.
-      attr:
-      # Missing attr, not equal.
-      attrs ? ${attr}
-      && (
-        let
-          lhs = pattern.${attr};
-          rhs = attrs.${attr};
-        in
-        # If attrset check recursively
-        if isAttrs lhs then isAttrs rhs && matchAttrs lhs rhs else lhs == rhs
-      )
-    ) (attrNames pattern);
+    recurse pattern;
 
   /**
     Override only the attributes that are already present in the old set
diff --git a/pkgs/stdenv/generic/meta-types.nix b/lib/meta-types.nix
similarity index 94%
rename from pkgs/stdenv/generic/meta-types.nix
rename to lib/meta-types.nix
index 1396243e3002..1d67f5f063e8 100644
--- a/pkgs/stdenv/generic/meta-types.nix
+++ b/lib/meta-types.nix
@@ -1,6 +1,7 @@
 { lib }:
 # Simple internal type checks for meta.
-# This file is not a stable interface and may be changed arbitrarily.
+# This file is only intended for internal nixpkgs use.
+# It is not a stable interface and may be changed arbitrarily.
 #
 # TODO: add a method to the module system types
 #       see https://github.com/NixOS/nixpkgs/pull/273935#issuecomment-1854173100
@@ -172,10 +173,10 @@ lib.fix (self: {
 
   enum =
     values:
-    assert isList values && all isString values;
+    assert isList values;
     {
-      name = "enum<${concatStringsSep "," values}>";
-      verify = v: isString v && elem v values;
+      name = if all isString values then "enum<${concatStringsSep "," values}>" else "enum";
+      verify = v: elem v values;
     };
 
   record =
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index e9fa908dfc88..d3e184320fbd 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -1,7 +1,15 @@
 { lib }:
 let
-  inherit (lib) lists;
+  inherit (lib)
+    lists
+    splitString
+    ;
   inherit (lib.systems) parse;
+  inherit (parse)
+    mkSystemFromSkeleton
+    mkSkeletonFromList
+    doubleFromSystem
+    ;
   inherit (lib.systems.inspect) predicates;
   inherit (lib.attrsets) matchAttrs;
 
@@ -117,9 +125,17 @@ let
     "x86_64-uefi"
   ];
 
-  allParsed = map parse.mkSystemFromString all;
+  uncheckedSystemFromString =
+    let
+      systemType = {
+        _type = "system";
+      };
+    in
+    s: mkSystemFromSkeleton (mkSkeletonFromList (splitString "-" s)) // systemType;
 
-  filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed);
+  allParsed = map uncheckedSystemFromString all;
+
+  filterDoubles = f: map doubleFromSystem (lists.filter f allParsed);
 
 in
 {
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 36a4036f210a..98b3fc050bc1 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -2,14 +2,17 @@
 
 let
   inherit (lib)
+    all
     any
+    attrNames
     attrValues
     concatMap
     filter
+    flip
     hasPrefix
+    isAttrs
     isList
     mapAttrs
-    matchAttrs
     recursiveUpdateUntil
     toList
     ;
@@ -24,19 +27,49 @@ let
     execFormats
     ;
 
-  abis = mapAttrs (_: abi: removeAttrs abi [ "assertions" ]) lib.systems.parse.abis;
+  # Based on lib.attrsets.matchAttrs, but with:
+  # - the initial isAttrs assertion removed, since this function is only ever
+  # called with attrsets
+  # - isAttrs only performed on one side when recursing, since our input data
+  # will always share a structure
+  matchAttrsUnchecked =
+    pattern: attrs:
+    all (
+      # Compare equality between `pattern` & `attrs`.
+      attr:
+      # Missing attr, not equal.
+      attrs ? ${attr}
+      && (
+        let
+          lhs = pattern.${attr};
+          rhs = attrs.${attr};
+        in
+        # Simple equality check is primarily for non-attrsets, but we run it
+        # on attrsets too, since it may let us avoid recursing
+        lhs == rhs || isAttrs lhs && matchAttrsUnchecked lhs rhs
+      )
+    ) (attrNames pattern);
+
+  removeAssertions = flip removeAttrs [ "assertions" ];
+  abis = mapAttrs (
+    _: abi: if abi ? assertions then removeAssertions abi else abi
+  ) lib.systems.parse.abis;
 in
 
 rec {
   # these patterns are to be matched against {host,build,target}Platform.parsed
+  #
+  # Note: All toplevel attributes within a pattern are expected to be attrsets.
+  # matchAttrsUnchecked should be changed if a pattern is ever added that
+  # doesn't follow this axiom
   patterns = rec {
     # The patterns below are lists in sum-of-products form.
     #
     # Each attribute is list of product conditions; non-list values are treated
     # as a singleton list.  If *any* product condition in the list matches then
     # the predicate matches.  Each product condition is tested by
-    # `lib.attrsets.matchAttrs`, which requires a match on *all* attributes of
-    # the product.
+    # `matchAttrsUnchecked`, which requires a match on *all* attributes of the
+    # product.
 
     isi686 = {
       cpu = cpuTypes.i686;
@@ -489,14 +522,40 @@ rec {
       ) pat2
     ) pat1;
 
-  matchAnyAttrs =
-    patterns:
-    if isList patterns then
-      attrs: any (pattern: matchAttrs pattern attrs) patterns
-    else
-      matchAttrs patterns;
+  matchAnyPattern =
+    let
+      # same as matchAttrsUnchecked definition at the top of the file, but:
+      # - pattern names are cached and reused for multiple attrset calls
+      # - avoid running isAttrs since all patterns are nested attrsets
+      matchPattern =
+        pattern:
+        let
+          names = attrNames pattern;
+        in
+        attrs:
+        all (
+          attr:
+          attrs ? ${attr}
+          && (
+            let
+              lhs = pattern.${attr};
+              rhs = attrs.${attr};
+            in
+            lhs == rhs || matchAttrsUnchecked lhs rhs
+          )
+        ) names;
 
-  predicates = mapAttrs (_: matchAnyAttrs) patterns;
+    in
+    pattern:
+    if isList pattern then
+      let
+        cachedPatterns = map matchPattern pattern;
+      in
+      attrs: any (pattern: pattern attrs) cachedPatterns
+    else
+      matchPattern pattern;
+
+  predicates = mapAttrs (_: matchAnyPattern) patterns;
 
   # these patterns are to be matched against the entire
   # {host,build,target}Platform structure; they include a `parsed={}` marker so
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 98db2595235f..cdfeafe7c18d 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -17,6 +17,9 @@
 { lib }:
 
 let
+  inherit (import ../meta-types.nix { inherit lib; })
+    enum
+    ;
   inherit (lib)
     all
     any
@@ -28,7 +31,6 @@ let
     id
     length
     mapAttrs
-    mergeOneOption
     optionalString
     splitString
     versionAtLeast
@@ -46,20 +48,19 @@ let
     isCygwin
     ;
 
-  inherit (lib.types)
-    enum
-    isType
-    mkOptionType
-    setType
-    ;
-
   setTypes =
     type:
-    mapAttrs (
-      name: value:
-      assert type.check value;
-      setType type.name ({ inherit name; } // value)
-    );
+    if type ? verify then
+      let
+        inherit (type) verify;
+      in
+      mapAttrs (
+        name: value:
+        assert verify value;
+        { inherit name; } // value
+      )
+    else
+      mapAttrs (name: value: { inherit name; } // value);
 
   # gnu-config will ignore the portion of a triple matching the
   # regex `e?abi.*$` when determining the validity of a triple.  In
@@ -76,11 +77,9 @@ in
 rec {
 
   ################################################################################
-
-  types.openSignificantByte = mkOptionType {
+  types.openSignificantByte = {
     name = "significant-byte";
     description = "Endianness";
-    merge = mergeOneOption;
   };
 
   types.significantByte = enum (attrValues significantBytes);
@@ -103,21 +102,24 @@ rec {
 
   ################################################################################
 
-  types.openCpuType = mkOptionType {
+  types.openCpuType = {
     name = "cpu-type";
     description = "instruction set architecture name and information";
-    merge = mergeOneOption;
-    check =
-      x:
-      types.bitWidth.check x.bits
-      && (if 8 < x.bits then types.significantByte.check x.significantByte else !(x ? significantByte));
+    verify =
+      let
+        verifyBitWidth = types.bitWidth.verify;
+        verifySignificantByte = types.significantByte.verify;
+      in
+      v:
+      verifyBitWidth v.bits
+      && (if 8 < v.bits then verifySignificantByte v.significantByte else !(v ? significantByte));
   };
 
   types.cpuType = enum (attrValues cpuTypes);
 
   cpuTypes =
     let
-      inherit (significantBytes) bigEndian littleEndian;
+      inherit (significantBytes) littleEndian bigEndian;
     in
     setTypes types.openCpuType {
       arm = {
@@ -487,10 +489,9 @@ rec {
 
   ################################################################################
 
-  types.openVendor = mkOptionType {
+  types.openVendor = {
     name = "vendor";
     description = "vendor for the platform";
-    merge = mergeOneOption;
   };
 
   types.vendor = enum (attrValues vendors);
@@ -499,23 +500,19 @@ rec {
     apple = { };
     pc = { };
     knuth = { };
-
     # Actually matters, unlocking some MinGW-w64-specific options in GCC. See
     # bottom of https://sourceforge.net/p/mingw-w64/wiki2/Unicode%20apps/
     w64 = { };
-
     none = { };
     unknown = { };
   };
 
   ################################################################################
 
-  types.openExecFormat = mkOptionType {
+  types.openExecFormat = {
     name = "exec-format";
     description = "executable container used by the kernel";
-    merge = mergeOneOption;
   };
-
   types.execFormat = enum (attrValues execFormats);
 
   execFormats = setTypes types.openExecFormat {
@@ -524,16 +521,14 @@ rec {
     macho = { };
     pe = { };
     wasm = { };
-
     unknown = { };
   };
 
   ################################################################################
 
-  types.openKernelFamily = mkOptionType {
+  types.openKernelFamily = {
     name = "exec-format";
     description = "executable container used by the kernel";
-    merge = mergeOneOption;
   };
 
   types.kernelFamily = enum (attrValues kernelFamilies);
@@ -545,12 +540,15 @@ rec {
 
   ################################################################################
 
-  types.openKernel = mkOptionType {
-    name = "kernel";
+  types.openKernel = {
+    name = "open-kernel";
     description = "kernel name and information";
-    merge = mergeOneOption;
-    check =
-      x: types.execFormat.check x.execFormat && all types.kernelFamily.check (attrValues x.families);
+    verify =
+      let
+        verifyExecFormat = types.execFormat.verify;
+        verifyKernelFamily = types.kernelFamily.verify;
+      in
+      v: verifyExecFormat v.execFormat && all verifyKernelFamily (attrValues v.families);
   };
 
   types.kernel = enum (attrValues kernels);
@@ -647,10 +645,9 @@ rec {
 
   ################################################################################
 
-  types.openAbi = mkOptionType {
+  types.openAbi = {
     name = "abi";
     description = "binary interface for compiled code and syscalls";
-    merge = mergeOneOption;
   };
 
   types.abi = enum (attrValues abis);
@@ -760,119 +757,138 @@ rec {
 
   ################################################################################
 
-  types.parsedPlatform = mkOptionType {
+  types.parsedPlatform = {
     name = "system";
     description = "fully parsed representation of llvm- or nix-style platform tuple";
-    merge = mergeOneOption;
-    check =
+    verify =
+      let
+        verifyCpu = types.cpuType.verify;
+        verifyVendor = types.vendor.verify;
+        verifyKernel = types.kernel.verify;
+        verifyAbi = types.abi.verify;
+      in
       {
         cpu,
         vendor,
         kernel,
         abi,
       }:
-      types.cpuType.check cpu
-      && types.vendor.check vendor
-      && types.kernel.check kernel
-      && types.abi.check abi;
+      verifyCpu cpu && verifyVendor vendor && verifyKernel kernel && verifyAbi abi;
   };
 
-  isSystem = isType "system";
+  isSystem = v: v._type or null == "system";
 
   mkSystem =
+    let
+      inherit (types.parsedPlatform) verify;
+    in
     components:
-    assert types.parsedPlatform.check components;
-    setType "system" components;
+    assert verify components;
+    components
+    // {
+      _type = "system";
+    };
 
   mkSkeletonFromList =
+    let
+      linuxComponents = [
+        "eabi"
+        "eabihf"
+        "elf"
+        "gnu"
+      ];
+      appleComponents = [
+        "redox"
+        "mmixware"
+        "ghcjs"
+        "mingw32"
+        "uefi"
+      ];
+    in
     l:
     {
       "1" =
-        if head l == "avr" then
+        let
+          firstComponent = head l;
+        in
+        if firstComponent == "avr" then
           {
-            cpu = head l;
+            cpu = firstComponent;
             kernel = "none";
             abi = "unknown";
           }
         else
           throw "system string '${lib.concatStringsSep "-" l}' with 1 component is ambiguous";
       "2" = # We only do 2-part hacks for things Nix already supports
-        if elemAt l 1 == "cygwin" then
+        let
+          secondComponent = elemAt l 1;
+        in
+        if secondComponent == "cygwin" then
           mkSkeletonFromList [
             (head l)
             "pc"
-            "cygwin"
+            secondComponent
           ]
         # MSVC ought to be the default ABI so this case isn't needed. But then it
         # becomes difficult to handle the gnu* variants for Aarch32 correctly for
         # minGW. So it's easier to make gnu* the default for the MinGW, but
         # hack-in MSVC for the non-MinGW case right here.
-        else if elemAt l 1 == "windows" then
+        else if secondComponent == "windows" then
           {
             cpu = head l;
-            kernel = "windows";
+            kernel = secondComponent;
             abi = "msvc";
           }
-        else if (elemAt l 1) == "elf" then
+        else if secondComponent == "elf" then
           {
             cpu = head l;
             vendor = "unknown";
             kernel = "none";
-            abi = elemAt l 1;
+            abi = secondComponent;
           }
         else
           {
             cpu = head l;
-            kernel = elemAt l 1;
+            kernel = secondComponent;
           };
       "3" =
+        let
+          secondComponent = elemAt l 1;
+          thirdComponent = elemAt l 2;
+        in
         # cpu-kernel-environment
-        if
-          elemAt l 1 == "linux"
-          || elem (elemAt l 2) [
-            "eabi"
-            "eabihf"
-            "elf"
-            "gnu"
-          ]
-        then
+        if secondComponent == "linux" || elem thirdComponent linuxComponents then
           {
             cpu = head l;
-            kernel = elemAt l 1;
-            abi = elemAt l 2;
+            kernel = secondComponent;
+            abi = thirdComponent;
             vendor = "unknown";
           }
         # cpu-vendor-os
         else if
-          elemAt l 1 == "apple"
-          || elem (elemAt l 2) [
-            "redox"
-            "mmixware"
-            "ghcjs"
-            "mingw32"
-            "uefi"
-          ]
-          || hasPrefix "freebsd" (elemAt l 2)
-          || hasPrefix "netbsd" (elemAt l 2)
-          || hasPrefix "openbsd" (elemAt l 2)
-          || hasPrefix "genode" (elemAt l 2)
-          || hasPrefix "wasm32" (elemAt l 0)
+          secondComponent == "apple"
+          || elem thirdComponent appleComponents
+          || hasPrefix "freebsd" thirdComponent
+          || hasPrefix "netbsd" thirdComponent
+          || hasPrefix "openbsd" thirdComponent
+          || hasPrefix "genode" thirdComponent
+          || hasPrefix "wasm32" (head l)
         then
           {
             cpu = head l;
-            vendor = elemAt l 1;
+            vendor = secondComponent;
             kernel =
-              if elemAt l 2 == "mingw32" then
+              if thirdComponent == "mingw32" then
                 "windows" # autotools breaks on -gnu for window
               else
-                elemAt l 2;
+                thirdComponent;
           }
         # lots of tools expect a triplet for Cygwin, even though the vendor is just "pc"
-        else if elemAt l 2 == "cygwin" then
+        else if thirdComponent == "cygwin" then
           {
             cpu = head l;
-            vendor = elemAt l 1;
-            kernel = "cygwin";
+            vendor = secondComponent;
+            kernel = thirdComponent;
           }
         else
           throw "system string '${lib.concatStringsSep "-" l}' with 3 components is ambiguous";
@@ -887,7 +903,17 @@ rec {
     or (throw "system string '${lib.concatStringsSep "-" l}' has invalid number of hyphen-separated components");
 
   # This should revert the job done by config.guess from the gcc compiler.
+  # Note: this does _not_ verify that the system is valid
+  # `mkSystemFromString` is recommended for external use
   mkSystemFromSkeleton =
+    let
+      getCpu = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}");
+      getVendor = name: vendors.${name} or (throw "Unknown vendor: ${name}");
+      getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
+      getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
+      hasDarwinPrefix = hasPrefix "darwin";
+      hasBsdPrefix = hasPrefix "netbsd";
+    in
     {
       cpu,
       # Optional, but fallback too complex for here.
@@ -902,11 +928,6 @@ rec {
         null,
     }@args:
     let
-      getCpu = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}");
-      getVendor = name: vendors.${name} or (throw "Unknown vendor: ${name}");
-      getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
-      getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
-
       parsed = {
         cpu = getCpu args.cpu;
         vendor =
@@ -919,10 +940,10 @@ rec {
           else
             vendors.unknown;
         kernel =
-          if hasPrefix "darwin" args.kernel then
-            getKernel "darwin"
-          else if hasPrefix "netbsd" args.kernel then
-            getKernel "netbsd"
+          if hasDarwinPrefix args.kernel then
+            kernels.darwin
+          else if hasBsdPrefix args.kernel then
+            kernels.netbsd
           else
             getKernel (removeAbiSuffix args.kernel);
         abi =
@@ -941,11 +962,12 @@ rec {
       };
 
     in
-    mkSystem parsed;
+    parsed;
 
-  mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (splitString "-" s));
+  mkSystemFromString = s: mkSystem (mkSystemFromSkeleton (mkSkeletonFromList (splitString "-" s)));
 
-  kernelName = kernel: kernel.name + toString (kernel.version or "");
+  kernelName =
+    kernel: if kernel ? version then kernel.name + toString kernel.version else kernel.name;
 
   darwinArch = cpu: if cpu.name == "aarch64" then "arm64" else cpu.name;
 
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 3feef87d97c0..e2b9093511c6 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -215,6 +215,22 @@ lib.runTests (
   })
 
   // {
+    test_platforms_pass_typecheck = {
+      # To improve performance, the result of parsing all 70+ systems in
+      # `lib.platforms` into their attrset representations aren't typechecked.
+      # The results are expected to be constant, and avoiding the slow
+      # validation gives a meaningful improvement to evaluation speed. We ensure
+      # that all systems pass validation here
+      expr = builtins.filter (
+        system:
+        let
+          evalResult = builtins.tryEval (lib.systems.parse.mkSystemFromString system);
+        in
+        evalResult.success == false
+      ) lib.platforms.all;
+
+      expected = [ ];
+    };
     test_equals_example_x86_64-linux = {
       expr = lib.systems.equals (lib.systems.elaborate "x86_64-linux") (
         lib.systems.elaborate "x86_64-linux"
diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index 1eaf3ca4cd13..e61912fb3a8e 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -43,12 +43,9 @@
     "id": 5468470,
     "maintainers": {},
     "members": {
-      "aherrmann": 732652,
       "avdv": 3471749,
-      "ethercrow": 222467,
       "groodt": 343415,
-      "kalbasit": 87115,
-      "mboes": 51356
+      "kalbasit": 87115
     },
     "name": "Bazel"
   },
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 64f8c9c31512..17cab5afc5c2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3101,6 +3101,12 @@
     githubId = 75235;
     name = "Michael Walker";
   };
+  barsikus007 = {
+    name = "barsikus007";
+    email = "barsikus07@gmail.com";
+    github = "barsikus007";
+    githubId = 37113583;
+  };
   bartoostveen = {
     name = "Bart Oostveen";
     github = "bartoostveen";
@@ -3135,7 +3141,10 @@
     email = "bastian@asmussen.tech";
     github = "BastianAsmussen";
     githubId = 76102128;
-    keys = [ { fingerprint = "3B11 7469 0893 85E7 16C2  7CD9 0FE5 A355 DBC9 2568"; } ];
+    keys = [
+      { fingerprint = "3B11 7469 0893 85E7 16C2  7CD9 0FE5 A355 DBC9 2568"; }
+      { fingerprint = "220D 68EC DF94 20EE 1E6C  B215 D92D 668B 77A2 9897"; }
+    ];
   };
   basvandijk = {
     email = "v.dijk.bas@gmail.com";
@@ -14591,6 +14600,12 @@
     github = "svelterust";
     githubId = 85593302;
   };
+  knightfemale = {
+    email = "2067834160@qq.com";
+    github = "knightfemale";
+    githubId = 124773040;
+    name = "骑士姬";
+  };
   knightpp = {
     email = "knightpp@proton.me";
     github = "knightpp";
@@ -15133,6 +15148,11 @@
     githubId = 27364685;
     name = "Lorenzo Pasqui";
   };
+  l1n = {
+    github = "l1n";
+    githubId = 1367322;
+    name = "Nova DasSarma";
+  };
   l1npengtul = {
     email = "l1npengtul@l1npengtul.lol";
     github = "l1npengtul";
@@ -17200,6 +17220,12 @@
     github = "matrss";
     githubId = 9308656;
   };
+  matshch = {
+    name = "Artem Leshchev";
+    github = "matshch";
+    githubId = 2412121;
+    email = "matshch@gmail.com";
+  };
   matt-snider = {
     email = "matt.snider@protonmail.com";
     github = "matt-snider";
@@ -23017,12 +23043,6 @@
     githubId = 1246959;
     name = "Raquel García";
   };
-  rardiol = {
-    email = "ricardo.ardissone@gmail.com";
-    github = "rardiol";
-    githubId = 11351304;
-    name = "Ricardo Ardissone";
-  };
   raskin = {
     email = "7c6f434c@mail.ru";
     github = "7c6f434c";
@@ -29601,6 +29621,14 @@
     github = "weitzj";
     githubId = 829277;
   };
+  Wekuz = {
+    name = "Wekuz";
+    github = "Wekuz";
+    githubId = 89638089;
+    email = "wekuz@duck.com";
+    matrix = "@wekuz:matrix.org";
+    keys = [ { fingerprint = "0CCE 1200 AB5E 7B05 9A22  B0D8 2E50 2F2A ABD3 2DF9"; } ];
+  };
   wellmannmathis = {
     email = "wellmannmathis@gmail.com";
     github = "MathisWellmann";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 0f89279d11ed..edcd5cfdb52f 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -688,6 +688,10 @@ with lib.maintainers;
     github = "radicle";
   };
 
+  redis = {
+    github = "redis";
+  };
+
   rocm = {
     github = "rocm";
   };
diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index 3d3c85b5d126..e40a6d774fb9 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -174,6 +174,8 @@
 
 - [LogiOps](https://github.com/PixlOne/logiops), an unofficial userspace driver for HID++ Logitech devices. Available as [services.logiops](#opt-services.logiops.enable).
 
+- [Unpackerr](https://unpackerr.zip), extracts downloads for Radarr, Sonarr, Lidarr, Readarr, and/or a Watch folder. Available as [services.unpackerr](#opt-services.unpackerr.enable).
+
 ## Backward Incompatibilities {#sec-release-26.05-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 16fc9633c33b..0fd01c232583 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -997,6 +997,7 @@
   ./services/misc/tuxclocker.nix
   ./services/misc/tzupdate.nix
   ./services/misc/uhub.nix
+  ./services/misc/unpackerr.nix
   ./services/misc/wastebin.nix
   ./services/misc/weechat.nix
   ./services/misc/workout-tracker.nix
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index b735ffd79e70..0eab7103edda 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -30,6 +30,8 @@ let
 
 in
 {
+  meta.teams = [ lib.teams.redis ];
+
   imports = [
     (lib.mkRemovedOptionModule [
       "services"
diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix
index 1372d2a8d097..5ec4d037073d 100644
--- a/nixos/modules/services/home-automation/zigbee2mqtt.nix
+++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix
@@ -113,6 +113,7 @@ in
           "AF_INET"
           "AF_INET6"
           "AF_NETLINK"
+          "AF_UNIX"
         ];
         RestrictNamespaces = true;
         RestrictRealtime = true;
diff --git a/nixos/modules/services/misc/unpackerr.nix b/nixos/modules/services/misc/unpackerr.nix
new file mode 100644
index 000000000000..710c44346b66
--- /dev/null
+++ b/nixos/modules/services/misc/unpackerr.nix
@@ -0,0 +1,102 @@
+{
+  config,
+  pkgs,
+  lib,
+  utils,
+  ...
+}:
+
+let
+  cfg = config.services.unpackerr;
+  configFormat = pkgs.formats.toml { };
+  configFile = configFormat.generate "unpackerr.conf" cfg.settings;
+  inherit (lib)
+    mkEnableOption
+    mkOption
+    mkPackageOption
+    mkIf
+    getExe
+    types
+    ;
+in
+{
+  options = {
+    services.unpackerr = {
+      enable = mkEnableOption "Unpackerr";
+
+      settings = mkOption {
+        type = configFormat.type;
+        default = { };
+        example = {
+          radarr = [
+            {
+              url = "http://127.0.0.1:8989";
+              api_key = "0123456789abcdef0123456789abcdef";
+            }
+          ];
+          sonarr = [
+            {
+              url = "http://127.0.0.1:7878";
+              api_key = "0123456789abcdef0123456789abcdef";
+            }
+          ];
+        };
+        description = ''
+          Unpackerr TOML configuration as a Nix attribute set.
+          Refer to [Unpackerr docs](https://unpackerr.zip/docs/install/configuration) for details.
+          For setting secrets refer to this [section](https://unpackerr.zip/docs/install/configuration/#secrets-and-passwords).
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "unpackerr";
+        description = "User account under which Unpackerr runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "unpackerr";
+        description = "Group under which Unpackerr runs.";
+      };
+
+      package = mkPackageOption pkgs "unpackerr" { };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Upstream service: https://github.com/Unpackerr/unpackerr/blob/main/init/systemd/unpackerr.service
+    systemd = {
+      services.unpackerr = {
+        description = "Unpackerr - archive extraction daemon";
+        wants = [ "network.target" ];
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          Type = "exec";
+          User = cfg.user;
+          Group = cfg.group;
+          ExecStart = utils.escapeSystemdExecArgs [
+            (getExe cfg.package)
+            "--config=${configFile}"
+          ];
+          Restart = "always";
+          RestartSec = 10;
+        };
+      };
+    };
+
+    users.users = mkIf (cfg.user == "unpackerr") {
+      unpackerr = {
+        inherit (cfg) group;
+        isSystemUser = true;
+      };
+    };
+
+    users.groups = mkIf (cfg.group == "unpackerr") {
+      unpackerr = { };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ Wekuz ];
+}
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index da48474d776c..6baf331187ec 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -5,44 +5,50 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
+  inherit (lib)
+    literalExpression
+    mkDefault
+    mkIf
+    mkOption
+    mkPackageOption
+    mkRenamedOptionModule
+    optionalAttrs
+    types
+    ;
+
   runDir = "/run/searx";
 
   cfg = config.services.searx;
+  yamlFormat = pkgs.formats.yaml { };
+  tomlFormat = pkgs.formats.toml { };
 
-  settingsFile = pkgs.writeText "settings.yml" (
-    builtins.toJSON (removeAttrs cfg.settings [ "redis" ])
-  );
+  settingsFile = yamlFormat.generate "settings.yml" (builtins.removeAttrs cfg.settings [ "redis" ]);
 
-  faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings;
-  limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings;
+  faviconsSettingsFile = tomlFormat.generate "favicons.toml" cfg.faviconsSettings;
+  limiterSettingsFile = tomlFormat.generate "limiter.toml" cfg.limiterSettings;
 
   generateConfig = ''
     cd ${runDir}
 
-    # write NixOS settings as JSON
+    # write NixOS settings
     (
       umask 077
-      ${pkgs.envsubst}/bin/envsubst < ${settingsFile} > settings.yml
+      ${lib.getExe pkgs.envsubst} < ${settingsFile} > settings.yml
+      ${
+        if (cfg.faviconsSettings != { }) then
+          "ln -sf ${faviconsSettingsFile} favicons.toml"
+        else
+          "rm -f favicons.toml"
+      }
+      ${
+        if (cfg.limiterSettings != { }) then
+          "ln -sf ${limiterSettingsFile} limiter.toml"
+        else
+          "rm -f limiter.toml"
+      }
     )
   '';
-
-  settingType =
-    with types;
-    (oneOf [
-      bool
-      int
-      float
-      str
-      (listOf settingType)
-      (attrsOf settingType)
-    ])
-    // {
-      description = "JSON value";
-    };
 in
 {
   options = {
@@ -107,7 +113,7 @@ in
               lib.warn "Obsolete option `services.searx.settings.redis' is used. It was renamed to `services.searx.settings.valkey'" config.redis
             );
 
-            freeformType = settingType;
+            freeformType = yamlFormat.type;
           }
         );
         default = { };
@@ -136,25 +142,25 @@ in
         '';
       };
 
-      settingsFile = mkOption {
+      settingsPath = mkOption {
         type = types.path;
-        default = "${runDir}/settings.yml";
+        default = runDir;
         description = ''
-          The path of the Searx server settings.yml file.
-          If no file is specified, a default file is used (default config file has debug mode enabled).
+          The path of the SearXNG settings directory or the settings.yml file.
+          If no path is specified, a default one is used (default config file has debug mode enabled).
 
           ::: {.note}
           Setting this options overrides [](#opt-services.searx.settings).
           :::
 
           ::: {.warning}
-          This file, along with any secret key it contains, will be copied into the world-readable Nix store.
+          This path, along with any secret keys it contains, will be copied into the world-readable Nix store.
           :::
         '';
       };
 
       faviconsSettings = mkOption {
-        type = types.attrsOf settingType;
+        type = types.attrsOf tomlFormat.type;
         default = { };
         example = literalExpression ''
           {
@@ -182,18 +188,23 @@ in
       };
 
       limiterSettings = mkOption {
-        type = types.attrsOf settingType;
+        type = types.attrsOf tomlFormat.type;
         default = { };
         example = literalExpression ''
           {
-            real_ip = {
-              x_for = 1;
+            botdetection = {
               ipv4_prefix = 32;
               ipv6_prefix = 56;
-            }
-            botdetection.ip_lists.block_ip = [
-              # "93.184.216.34" # example.org
-            ];
+
+              trusted_proxies = [
+                "127.0.0.0/8"
+                "::1"
+              ];
+
+              ip_lists.block_ip = [
+                # "93.184.216.34" # example.org
+              ];
+            };
           }
         '';
         description = ''
@@ -252,6 +263,7 @@ in
   };
 
   imports = [
+    (mkRenamedOptionModule [ "services" "searx" "settingsFile" ] [ "services" "searx" "settingsPath" ])
     (mkRenamedOptionModule [ "services" "searx" "configFile" ] [ "services" "searx" "settingsFile" ])
     (mkRenamedOptionModule [ "services" "searx" "runInUwsgi" ] [ "services" "searx" "configureUwsgi" ])
   ];
@@ -264,17 +276,7 @@ in
       }
     ];
 
-    environment = {
-      etc = {
-        "searxng/favicons.toml" = lib.mkIf (cfg.faviconsSettings != { }) {
-          source = faviconsSettingsFile;
-        };
-        "searxng/limiter.toml" = lib.mkIf (cfg.limiterSettings != { }) {
-          source = limiterSettingsFile;
-        };
-      };
-      systemPackages = [ cfg.package ];
-    };
+    environment.systemPackages = [ cfg.package ];
 
     services = {
       nginx = lib.mkIf cfg.configureNginx {
@@ -338,7 +340,7 @@ in
           enable-threads = true;
           module = "searx.webapp";
           env = [
-            "SEARXNG_SETTINGS_PATH=${cfg.settingsFile}"
+            "SEARXNG_SETTINGS_PATH=${cfg.settingsPath}"
           ];
           buffer-size = 32768;
           pythonPackages = _: [ cfg.package ];
@@ -379,17 +381,60 @@ in
         after = [
           "searx-init.service"
           "network.target"
-        ];
+        ]
+        ++ lib.optionals cfg.redisCreateLocally [ "redis-searx.service" ];
         serviceConfig = {
           User = "searx";
+          DynamicUser = true;
           Group = "searx";
           ExecStart = lib.getExe cfg.package;
+
+          CacheDirectory = "searx";
+          CacheDirectoryMode = "0700";
+
+          ReadOnlyPaths = [ cfg.settingsPath ];
+          ReadWritePaths = lib.optional cfg.redisCreateLocally config.services.redis.servers.searx.unixSocket;
+
+          CapabilityBoundingSet = null;
+          DevicePolicy = "closed";
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          NoNewPrivileges = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "strict";
+          PrivateDevices = true;
+          PrivateMounts = true;
+          PrivateTmp = true;
+          PrivateUsers = true;
+          PrivateIPC = true;
+          RemoveIPC = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          SystemCallArchitectures = "native";
+          SystemCallErrorNumber = "EPERM";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged @resources"
+          ];
+          UMask = "0077";
         }
         // optionalAttrs (cfg.environmentFile != null) {
           EnvironmentFile = cfg.environmentFile;
         };
         environment = {
-          SEARXNG_SETTINGS_PATH = cfg.settingsFile;
+          SEARXNG_SETTINGS_PATH = cfg.settingsPath;
         };
       };
 
@@ -398,7 +443,7 @@ in
         after = [ "searx-init.service" ];
         restartTriggers = [
           cfg.package
-          cfg.settingsFile
+          cfg.settingsPath
         ]
         ++ lib.optional (cfg.environmentFile != null) cfg.environmentFile;
       };
@@ -416,7 +461,7 @@ in
     networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; };
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     SuperSandro2000
     _999eagle
   ];
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9398eb6b7fb7..24b3d1216af7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1768,6 +1768,7 @@ in
   unifi = runTest ./unifi.nix;
   unit-perl = runTest ./web-servers/unit-perl.nix;
   unit-php = runTest ./web-servers/unit-php.nix;
+  unpackerr = runTest ./unpackerr.nix;
   upnp.iptables = handleTest ./upnp.nix { useNftables = false; };
   upnp.nftables = handleTest ./upnp.nix { useNftables = true; };
   uptermd = runTest ./uptermd.nix;
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
index f878509bce35..4ff35a509145 100644
--- a/nixos/tests/redis.nix
+++ b/nixos/tests/redis.nix
@@ -19,11 +19,7 @@ let
     }:
     makeTest {
       inherit name;
-      meta.maintainers = [
-        lib.maintainers.das_j
-        lib.maintainers.flokli
-        lib.maintainers.helsinki-Jo
-      ];
+      meta.maintainers = lib.teams.redis.members;
 
       nodes = {
         machine =
diff --git a/nixos/tests/unpackerr.nix b/nixos/tests/unpackerr.nix
new file mode 100644
index 000000000000..d0a918f772a3
--- /dev/null
+++ b/nixos/tests/unpackerr.nix
@@ -0,0 +1,39 @@
+{ lib, ... }:
+
+{
+  name = "unpackerr";
+  meta.maintainers = with lib.maintainers; [ Wekuz ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [ zip ];
+
+      systemd.tmpfiles.settings."10-unpackerr"."/srv/unpackerr".d = {
+        mode = "0775";
+        user = "unpackerr";
+        group = "users";
+      };
+
+      services.unpackerr = {
+        enable = true;
+        group = "users";
+        settings = {
+          start_delay = "15s";
+          folder = [
+            {
+              path = "/srv/unpackerr";
+            }
+          ];
+        };
+      };
+    };
+
+  testScript = ''
+    machine.wait_for_unit("unpackerr.service")
+    machine.wait_until_succeeds("journalctl -u unpackerr.service --grep '\\[Folder\\] Watching \\(fsnotify\\)'", timeout=60)
+    machine.succeed("echo unpackerr-test > /tmp/file.txt && cd /tmp && zip /srv/unpackerr/test.zip ./file.txt && rm ./file.txt")
+    machine.wait_until_succeeds("[[ -d /srv/unpackerr/test ]]", timeout=120)
+    machine.succeed("""[[ 'unpackerr-test' == "$(< /srv/unpackerr/test/file.txt)" ]]""")
+  '';
+}
diff --git a/nixos/tests/victoriatraces/otlp-ingestion.nix b/nixos/tests/victoriatraces/otlp-ingestion.nix
index d3807c6bde66..586348c58d8d 100644
--- a/nixos/tests/victoriatraces/otlp-ingestion.nix
+++ b/nixos/tests/victoriatraces/otlp-ingestion.nix
@@ -82,7 +82,7 @@ in
     machine.wait_until_succeeds("""
       curl -s 'http://localhost:10428/select/jaeger/api/services' | \
       jq -e '.data[] | select(. == "test-service")'
-    """, timeout=10)
+    """, timeout=20)
 
     # Query for traces from our test service
     machine.wait_until_succeeds("""
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
index cbb23ee3e9ff..65607c696103 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
@@ -13,13 +13,13 @@ let
 
   pname = "ghostel";
 
-  version = "0.34.0-unstable-2026-06-08";
+  version = "0.35.4-unstable-2026-06-19";
 
   src = fetchFromGitHub {
     owner = "dakra";
     repo = "ghostel";
-    rev = "f7800f6430b6ab85dbfc2db2129625e8a28ac17e";
-    hash = "sha256-o9EQFA6xunwt/chdA5z8bqadr9V3COBPjRqiAY3jkp0=";
+    rev = "adb010b7fec943405006fcd1fac280e74ffa9e30";
+    hash = "sha256-OI82g4uMTzlucH9DHNeDl7ppYzpNTjnhZ1SzlRe70Fw=";
   };
 
   module = stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 1e00137cb90c..f7cddf1c9cb2 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -146,14 +146,9 @@ in
     pname = "emacs-mac";
     version = "30.2.50";
     variant = "macport";
-    rev = "emacs-mac-30.2";
-    hash = "sha256-i/W2Xa6Vk1+T1fs6fa4wJVMLLB6BK8QAPcdmPrU8NwM=";
+    rev = "emacs-mac-30.2.1";
+    hash = "sha256-KFgQZBW0QRX0k4k8gkVuGhNTfxArOH1+rwUzsmyEuss=";
     patches = fetchpatch: [
-      (fetchpatch {
-        name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch";
-        url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562";
-        hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw=";
-      })
       (fetchpatch {
         # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856
         url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616";
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 064caf4daebc..8803e9335f17 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -82,12 +82,12 @@ final: prev: {
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "4.7.4-unstable-2026-06-02";
+    version = "4.7.4-unstable-2026-06-17";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "2025f92022bef434de0511c5157a19974a9377a4";
-      hash = "sha256-YyzJBoOVYefBlpck9O80BdPjQIlH6p5o6Ta2n9aWu4A=";
+      rev = "f0c2a23ab79dc295f5e0eef0d8b587a39020c852";
+      hash = "sha256-jBxtWF4GNSXB+/xUnUWs0RzSXAkQKa5cd3mljTHuarw=";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -446,12 +446,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-06-14";
+    version = "0-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "3dca2d2153cfbc9aab937c1be0441e371101b0b8";
-      hash = "sha256-TBm3EG55pAQIR4cPHuiu4bK5/oRblnAxxzX7u07rpBE=";
+      rev = "c73e2b170a4927d1dc1b48e878bba6cf0ed9b07c";
+      hash = "sha256-C5RIJHqT55QByx02erUkoi2rFUDh/LivP4MIFbRSArI=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -1092,12 +1092,12 @@ final: prev: {
 
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
-    version = "4.11.0";
+    version = "4.12.0";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrotheme";
-      tag = "v4.11.0";
-      hash = "sha256-h84Ay5EPft2ZPCY9iuqvyOXPFrVGZwjUi3OWyQ3x+AQ=";
+      tag = "v4.12.0";
+      hash = "sha256-jDj0rDfGifyC9aTxhN0Ps9OD/s0U2Wvkgfk7mqTFG0Q=";
     };
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -1610,12 +1610,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "0-unstable-2026-05-03";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "23e5128eb5f629c29532c24a1e733cbe019f05bb";
-      hash = "sha256-n9GrDSLW5+N0LA8QNnG/LubSkC/mLe7ut30N+SfBE7o=";
+      rev = "7d7a00013066f8ab41be28bd43136d5ca8d0fabd";
+      hash = "sha256-wwKPgnkGEP4ztW/31M6+nRnOVHkzGrmm6ElNMul0Buo=";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -1736,12 +1736,12 @@ final: prev: {
 
   bitbake = buildVimPlugin {
     pname = "bitbake";
-    version = "5.0.18";
+    version = "6.0.1";
     src = fetchFromGitHub {
       owner = "openembedded";
       repo = "bitbake";
-      tag = "yocto-5.0.18";
-      hash = "sha256-Kl+4P3C4Gn/uXUxrIAi+V9pBJqxpI7Z+6vt8gfdCBag=";
+      tag = "yocto-6.0.1";
+      hash = "sha256-ReX6cGzy6IOfMR1z90U5QWdWLkRqO524zXcp/7xBfBk=";
     };
     meta.homepage = "https://github.com/openembedded/bitbake/";
     meta.license = unfree;
@@ -2547,12 +2547,12 @@ final: prev: {
 
   claudecode-nvim = buildVimPlugin {
     pname = "claudecode.nvim";
-    version = "0.3.0-unstable-2026-06-15";
+    version = "0.3.0-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "coder";
       repo = "claudecode.nvim";
-      rev = "2ee26319eb0c101fb2a6da1c9d6650dfa39363da";
-      hash = "sha256-wf+O0PxSoslPkpn1owN2jGUiH0zN7o7hWcKAb6Pd5ns=";
+      rev = "bcb3fe205efe88771e8801d0a99b6fcb0a982bbb";
+      hash = "sha256-pJtrh/3pGvALhQheB3LMB01IahTSYvxfCUNdiMvq8L0=";
     };
     meta.homepage = "https://github.com/coder/claudecode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2631,12 +2631,12 @@ final: prev: {
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "0-unstable-2026-06-14";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "98cdc162572a7b77733030425d8d045d68f2a1fd";
-      hash = "sha256-juAaEd08WGmI3ipfKMUbeTmLDK6nCOx/omCbRopIMHE=";
+      rev = "22859d754b5de738cfe9945e0910729f63deefd0";
+      hash = "sha256-HOA8bi+qngLoeicN8DTsgY3r37FMJQ8psyuTXjVd7TY=";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -3484,12 +3484,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-06-12";
+    version = "0.0.82-unstable-2026-06-16";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "207dc0f4feb2fc5db54bf4f7b6fea9b21168c293";
-      hash = "sha256-3dGV25DHXSt40N/X2XyaCg5rzgP3cxjoGHJx/ZwRt0o=";
+      rev = "6535506db1d0f8462ba668b5ca27e15e7f406598";
+      hash = "sha256-KG9vSlp6qM3mldJb9xHXYBUrd4Sm8ihAYU2ICf3LTF4=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.license = unfree;
@@ -4171,12 +4171,12 @@ final: prev: {
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "0-unstable-2026-06-15";
+    version = "0-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "7911f272700449891cbe79e3f87690c4ac638c91";
-      hash = "sha256-kP+LrA9Rs0Kfx8eTJ0Cpt5Yg/7RDZS8Ujkm7M8D2pHM=";
+      rev = "51660094e77742fd13bf98719fa90fdb5490a599";
+      hash = "sha256-5MeBi/lBaQ1oln90hwMg9pwBQbfyt1tziaNRn6QurvU=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -4577,12 +4577,12 @@ final: prev: {
 
   ddc-source-file = buildVimPlugin {
     pname = "ddc-source-file";
-    version = "0-unstable-2026-05-24";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "LumaKernel";
       repo = "ddc-source-file";
-      rev = "b2ff132a07a881251edbc03b5c81f3655803a5b9";
-      hash = "sha256-Iw6dYzIUzx7O6+YmNl1W7kjBgjc52m1KGG0oFBySqfk=";
+      rev = "8548b553c7dbf49728788c29142108c437e0ec76";
+      hash = "sha256-96W64aTUbyKgrEDaA6iFDcsVCA6TF3ei/xYyon/N2uY=";
     };
     meta.homepage = "https://github.com/LumaKernel/ddc-source-file/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5419,12 +5419,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-06-15";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "70f29290cad01cdcbdb03941034a95e5ef9fc365";
-      hash = "sha256-4fqj9U24NizLuEWs5sL2MZXyGmznTTV0dmmZgZ0zdmA=";
+      rev = "4a4a12add28922e5e22d9cfdeda88194f487a8e2";
+      hash = "sha256-rWAxDFuqatT3UTPMxn7JhzVCflCpOoxSZagVqaSY5dg=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5995,12 +5995,12 @@ final: prev: {
 
   flatten-nvim = buildVimPlugin {
     pname = "flatten.nvim";
-    version = "0.5.1-unstable-2025-05-27";
+    version = "0.5.1-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "flatten.nvim";
-      rev = "72527798e75b5e34757491947c2cb853ce21dc0e";
-      hash = "sha256-NaOgzTVqOpQnEIOIMlHCupZUDYnLUic9zITKFxcOg3A=";
+      rev = "d92ca41e9c330f45c1b854a80c89c8488a9d730c";
+      hash = "sha256-ZixskxLpno0BbzseafBILoFzRzs14HrBeWlRQrqkAS8=";
     };
     meta.homepage = "https://github.com/willothy/flatten.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -7073,12 +7073,12 @@ final: prev: {
 
   guh-nvim = buildVimPlugin {
     pname = "guh.nvim";
-    version = "0.0.1-unstable-2026-06-14";
+    version = "0.0.1-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "guh.nvim";
-      rev = "92ffef63af03b7188b8d11e052eaa3822b59820c";
-      hash = "sha256-5vAyerfY08J0J4qQY5vPmNRRjDQGv2B+nUxIgs6I1DQ=";
+      rev = "ebe54715626173abba55e17282c60561bcfbfb6c";
+      hash = "sha256-v6N+Y86heqpt46qOJwpzXs2yGamM6sxd9DJDzo8nm4g=";
     };
     meta.homepage = "https://github.com/justinmk/guh.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8110,12 +8110,12 @@ final: prev: {
 
   jedi-vim = buildVimPlugin {
     pname = "jedi-vim";
-    version = "0.11.2-unstable-2026-05-04";
+    version = "0.11.2-unstable-2026-06-16";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "a33071af6b3cf2399bc4631e0aa265901e1cf99e";
-      hash = "sha256-Tg+JHiOneIqfVKJa8VfIbB1aNAYlJGNoiY/+7qgAYf8=";
+      rev = "a13c7bf64dbb4abcf676b4e41c5fedc2d4e7f6dd";
+      hash = "sha256-Fy0zJHambtY9T4KPWXBc7wXktXo/EIUr6t+eehFAz3M=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -8167,12 +8167,12 @@ final: prev: {
 
   jj-nvim = buildVimPlugin {
     pname = "jj.nvim";
-    version = "0.6.0";
+    version = "0.7.1";
     src = fetchFromGitHub {
       owner = "NicolasGB";
       repo = "jj.nvim";
-      tag = "v0.6.0";
-      hash = "sha256-hoU+DenrgxNwvLNmDtIsJ5yB5fhRjDRPOOL8WW9bpZM=";
+      tag = "v0.7.1";
+      hash = "sha256-AxmZTSytBEGzjqQJrFV2+oHSVaG21Vx6YRezto3MT9s=";
     };
     meta.homepage = "https://github.com/NicolasGB/jj.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9803,12 +9803,12 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "0.17.0-unstable-2026-06-05";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.ai";
-      rev = "4511b3481707c1d021485475d34f2ed2a50bf47b";
-      hash = "sha256-weROF3Xf/XzUYJyI1NGm1HRnWEWjWbiEc5th5Gv55Tk=";
+      rev = "d73c36349aa7b0bab5f77ad71701a1d42211a1df";
+      hash = "sha256-5lmxcbEwlUcV3D4Zw93dLH2onFdpGMEAhul51lbxFIg=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.ai/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9817,12 +9817,12 @@ final: prev: {
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "0.17.0-unstable-2026-06-05";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.align";
-      rev = "a7cd9465ac72c65d726f8fdc8b71ceb63ce8c0fd";
-      hash = "sha256-SBc4LHrQ2WqJINLjJC3qQfTfKVP7p6gxa7D+sz15CSc=";
+      rev = "8cebe89d82f20e6d21b27346bcde4b4b6244a9f1";
+      hash = "sha256-0YVTahHSbzhEEpw9zYfGljxx+ufsuZ0qWiu2SZzTD9U=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.align/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9831,12 +9831,12 @@ final: prev: {
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.animate";
-      rev = "a133965b027a6377fddca43f11659af357c12758";
-      hash = "sha256-mSeJEg5WUQrObE/eX7mmazBQFF9i+f/WLlxWXmLCaSI=";
+      rev = "1c243baec3a308ea3552fbbd2f5d24ed804bf17d";
+      hash = "sha256-xxEoAH267h7oEMaMtv9YRsJRL5X1pWbAeCy/U+i33gs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.animate/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9845,12 +9845,12 @@ final: prev: {
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.base16";
-      rev = "33c6fb4a088392df272a4d88f9bf07f466c5a459";
-      hash = "sha256-oVUSqKyMhnGKsrmZmtm8GM59FIGILYquoq1K6sNNF84=";
+      rev = "ecbcb4e363169a663ece476f35fd87870c6d6a8b";
+      hash = "sha256-Q038ztqiCjX9WAqlcKC4auNNeRtC+hOV6BvMml/Tdp8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.base16/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9859,12 +9859,12 @@ final: prev: {
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "0.17.0-unstable-2026-05-21";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.basics";
-      rev = "4255727accba14db930823da4168c7f1ea68ff80";
-      hash = "sha256-UVZkMfRub44plD0+wOd+//P7BejCqwf3mxCH9fMiosw=";
+      rev = "b5be271ebe862ca0570e450976799554e585d16e";
+      hash = "sha256-/H9/3JkZigApufNvWMtOFbsrHuG4cwPuY+fKmklWkU8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.basics/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9873,12 +9873,12 @@ final: prev: {
 
   mini-bracketed = buildVimPlugin {
     pname = "mini.bracketed";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bracketed";
-      rev = "d94d51dcee625723aaaf8d38174b48522eaf9131";
-      hash = "sha256-6HD3eYKkRYsS+evLvfptMOczC3ljrf5PurIwx9tZp1U=";
+      rev = "7662c280946faf573c4eabf307d78406ad0783e4";
+      hash = "sha256-vsj7cf6deB9o0UkFN/ewk/kxKooC0lB7txRpbbNnaLc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bracketed/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9901,12 +9901,12 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "0.17.0-unstable-2026-06-05";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.clue";
-      rev = "4b3db71003fa06200680afb9f1d05506b79eb953";
-      hash = "sha256-6ttyphQgT3yjWOOzmLKzSqQUtyah2FvZz3jDprqKjno=";
+      rev = "62e9e38c3dc4b7d429f1b6e28d96f96cdff71132";
+      hash = "sha256-ivDrHCyW7YaaEtUwkmqRKwT4bYnvy3Nn3fH//STYsPA=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.clue/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9915,12 +9915,12 @@ final: prev: {
 
   mini-cmdline = buildVimPlugin {
     pname = "mini.cmdline";
-    version = "0.17.0-unstable-2026-06-01";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cmdline";
-      rev = "044848fd9b69d01ba05d0a56a530969743a94eba";
-      hash = "sha256-fq10UdMxenCCdpBv/S6ZdqCbjXPAj9eWCljBGPRMWOI=";
+      rev = "8e3fe6ee41a960226bc0dc663120363a40bc18bd";
+      hash = "sha256-WCsFDbk4/Cql9kJ44m++YlanasLE7ptYaaGrLoSpxYw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cmdline/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9929,12 +9929,12 @@ final: prev: {
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.colors";
-      rev = "c40f49f3d41a3207f1b8f854919837c34acdc0c5";
-      hash = "sha256-dcsAoj9r02YuWC0gz1BtjSVguQNxyD85Q4mEp3cDsSk=";
+      rev = "3c67f88070edb27035ae10c4fd094650a7a8efc7";
+      hash = "sha256-YMBNhdIRSAKhTA3h0K1jKAW4+z/+Nj6kApMAHxkIUaE=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.colors/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9943,12 +9943,12 @@ final: prev: {
 
   mini-comment = buildVimPlugin {
     pname = "mini.comment";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.comment";
-      rev = "fc87ba6554f182161d9a4bab5017c575571f000f";
-      hash = "sha256-kNELUIgJxiEJHj+evZt0aG4+Nvzdow1NpZOI2M2xTaU=";
+      rev = "4677392f091e8b5c18d4b535130220a6d1da4aca";
+      hash = "sha256-14YdoEPMudcfYWrb62Fv2GuoWW85v2F9s3/yKxbFN88=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.comment/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9957,12 +9957,12 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "04abe6fc7860858785ba63c435d76bf5b8b64b5f";
-      hash = "sha256-DYJkOr64I1CLo5N+vgRa4xIbi3SUSZVPyy0e0Qo39C0=";
+      rev = "0aeee1231b90d70563e24facc238ab4359b8d5fc";
+      hash = "sha256-GD6s5qDvKrGk3qM+rk5L8fp7SmvhfKrZO+B6h7cwpAg=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.completion/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9971,12 +9971,12 @@ final: prev: {
 
   mini-cursorword = buildVimPlugin {
     pname = "mini.cursorword";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cursorword";
-      rev = "a01471856e462144ea53972f22a67e790be68ee6";
-      hash = "sha256-udcgvHbdBgQnxNix5cRK+FgEraZGdvma+HnVX+b7FPo=";
+      rev = "331bc17172e41343d39d91a4ab571d510766812e";
+      hash = "sha256-FHD3fBCmYpw3P/o//CocQNSBoElOr7EleIdiSKM7c8E=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cursorword/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9985,12 +9985,12 @@ final: prev: {
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.deps";
-      rev = "9da6c44316de10f4227ff366d574a2baa4004b1b";
-      hash = "sha256-QGDLIXIMynE6c5iC56z9bXB2d2iPSOYeq5IOFEIsRYA=";
+      rev = "75a5568a36dfb15cf2f459bca30120335bf91ec7";
+      hash = "sha256-nbtOiQAgUfgoLzjXVb/SKPVRBp7bdYLBvYPg4CvchsI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.deps/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9999,12 +9999,12 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "0.17.0-unstable-2026-06-15";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "05be51814a718e74244829754a2a900a430a8d8b";
-      hash = "sha256-B7Z7rYEnxWTl09oO2fXtRFKdGVYwRCY3B7hsgj5kNzE=";
+      rev = "0743d26bd858ebe32efcf5c86a91a422a000f273";
+      hash = "sha256-ZhCsTAzuVRMbVSWWepsA8qrS1GTPNokm0NxXn3hYEoM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10013,12 +10013,12 @@ final: prev: {
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.doc";
-      rev = "bc3a3ecfd38cbda6752cbe4559aca225085dd90e";
-      hash = "sha256-Qv7mbu/X6UoPG66oMR3TMcyWSAnc1AZUrhCGLd58M6w=";
+      rev = "54bb11880f2208a059a8d2564c3f4b586b78e044";
+      hash = "sha256-g1JvCOxQY5oFEr2Q5l8e31gC0O5VvIP9ZuHncK83QSE=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.doc/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10027,12 +10027,12 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "0.17.0-unstable-2026-06-07";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.extra";
-      rev = "eb21c1117207d3aa1ae532c666c692e94909087e";
-      hash = "sha256-kViQTJ5jzCXf7McuikvwaqfzB54JSheyeiBzSKoq9vY=";
+      rev = "e5ecf197f8954d002cb9e85b3715851e2c8d3cd5";
+      hash = "sha256-QjA7O9AXfRWgsq3ma2Q0eonD66WRvd4qT3Jk61PgfG0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.extra/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10041,12 +10041,12 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "0.17.0-unstable-2026-06-05";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "02874bc653fbecf2bee2c65441d0ebd09110f011";
-      hash = "sha256-IfV2W9EFVtfXofEbwiWwCK8zprJlXiAKZgvKhnsp/mc=";
+      rev = "a5689dae6b732955e33eec225b798d6815063179";
+      hash = "sha256-RhD0kEdJL47nSDjrKzuN+l5+65gJ/7w+eqtP3zLVln8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10055,12 +10055,12 @@ final: prev: {
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.fuzzy";
-      rev = "2c0e7809e0c51dccb335d01f02d4f6b2b4d6fcdc";
-      hash = "sha256-AX/Di9KfRryWthGs1kIObxlR9vG9/YAXylWyPGxe+js=";
+      rev = "016c90a5e2c7235c26684dc0e13f6f019e1dcd84";
+      hash = "sha256-xk7PqaKzvUXl7v2DSRD3xu6aV1lrHB0GtbGOaoSRyZc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10069,12 +10069,12 @@ final: prev: {
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini-git";
-      rev = "7c81d173462042cd3a3571643bce03a6c255fd41";
-      hash = "sha256-hII9oQKitOzpycdgP41c4INZUJ1kEtwUtf8SlfFDlZU=";
+      rev = "96db7676696e53add56726e9e80f92dff9f63d17";
+      hash = "sha256-Xu3yiQU1ibvq1skFiyie5IkHWGU7UQ46jChyO3hrgZw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini-git/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10083,12 +10083,12 @@ final: prev: {
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hipatterns";
-      rev = "e25cf080aae092a651a92fa5e477f64a61adbebf";
-      hash = "sha256-0oheCwV4qpU45f7S2jFkqMwpRiatjXjtDFAerNU2fLQ=";
+      rev = "607d604e650cdf21d71f863d040c496a1d0cb320";
+      hash = "sha256-7ydDX9dKXFKg4o9omp+ZZfC3DLjQoIDC6n+iAYoH2ug=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10097,12 +10097,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hues";
-      rev = "ab36ead75b445fd81e00e7c3e1cbf0bc1e8f2d14";
-      hash = "sha256-QYl68gVtqsmIrVAN1hUH3kkdmNAKAHPjMhIXTFJm3iI=";
+      rev = "38e6aec74052818aef0ed4b8a24ea7113125f9ad";
+      hash = "sha256-x//2b2QUSmHP7HgjG1Ri31vwJ0acDkI6Pr75927wNrI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hues/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10111,12 +10111,12 @@ final: prev: {
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "0.17.0-unstable-2026-06-15";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.icons";
-      rev = "d48ad47359218d2b019034f95f601b3861180885";
-      hash = "sha256-sDW/9Y5MhzvklkiW7XmrDslCCGDcYliJ5awgj1Ko558=";
+      rev = "e56797f90192d81f1fda02e662fc3e8e3d775027";
+      hash = "sha256-Lr5/aHSnwfDAidvGTIOfEvp0lNpnp5kFNnIUSssnaOw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.icons/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10125,12 +10125,12 @@ final: prev: {
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "0.17.0-unstable-2026-06-07";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.indentscope";
-      rev = "98453149c3394ca3d1bf252e838e4777573b63e2";
-      hash = "sha256-6b6rVX74wp6cnSaQyZ0hCfWOD94skyFInZgg8JHD5HY=";
+      rev = "d3f955f09b1a05d25d5a7740338fba2baaee41a3";
+      hash = "sha256-ahA7Ud+f55wpEK7Lp0Zuf1djB8NcIpqmvwFPO2r6EPs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10139,12 +10139,12 @@ final: prev: {
 
   mini-input = buildVimPlugin {
     pname = "mini.input";
-    version = "0-unstable-2026-06-15";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.input";
-      rev = "d97776877c2dadbc7b5830d47eefa99e33e48cb1";
-      hash = "sha256-fOILbrCQciZtMTKtLzXtFKghc/ocR09szG7yyPaunFs=";
+      rev = "906dfc354e8c5f9925e019612d042efe1c2c3bf3";
+      hash = "sha256-sKWRtSEWqKOaMLiemYiOyRgIWYsaLgycRmyYDKd389k=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.input/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10153,12 +10153,12 @@ final: prev: {
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "0.17.0-unstable-2026-06-07";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump";
-      rev = "741a2ac3ac4015a78ee5e7b90ba054508686457a";
-      hash = "sha256-q5e1HScZsQFNNiMBd9Kn4qjW+oV5XfZUtkBeYduZ9+o=";
+      rev = "7dc394e21a59ecfd786242314dc4a68619de216d";
+      hash = "sha256-AsrwzaOsh+c3BtN4knD6FvLvQl0JwQ8kPi6c/8KZGSw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10167,12 +10167,12 @@ final: prev: {
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "0.17.0-unstable-2026-06-05";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump2d";
-      rev = "f95769bc20586f63d16d814175f759bf4d44bfd2";
-      hash = "sha256-AvkV549zYxtRnjWtZHwGwwPHMy1D2sWNxkUSUQhMyCE=";
+      rev = "ef08ddb40e04657b9439427f276b0546a8837c04";
+      hash = "sha256-tEYxxutbVzMg2nthOVvMUQFW9MZDLlTTB9HRMS2Y62M=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10181,12 +10181,12 @@ final: prev: {
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.keymap";
-      rev = "14f4cf1058bd3458d4cccd6a4587b6ebb1d43385";
-      hash = "sha256-jDrh4BE5U4+ADmMtZpUiY4azxG/8H7ntz54VW6mLh3g=";
+      rev = "2779b4a5d21ddd738b4c4c4b2347da6c89c62713";
+      hash = "sha256-hAkaV2IXBYhoObNOZO2JOxYC+0f2dY090x+d91B0MCg=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.keymap/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10195,12 +10195,12 @@ final: prev: {
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.map";
-      rev = "b5c13c5740afdd0f5b0f0af9aa2928e4481212af";
-      hash = "sha256-WwTnkEVHubvI55ipKy1aA81H4LR7VuBi6KvIXUS0/p4=";
+      rev = "7e836e3679387012f84f2a389ace740d57a93a37";
+      hash = "sha256-c80XxN/jrC9qqCWmERaRrpNOrkDadcXuy02zr7ffvlI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.map/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10209,12 +10209,12 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "0.17.0-unstable-2026-06-11";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.misc";
-      rev = "317e20ad3bdf0f4535f9a7efdae7fbe5c4439f29";
-      hash = "sha256-arVLHeI7ON1pMTNq1D17XqQdWZHRMrNKwnYXUb1PWNM=";
+      rev = "29e2b6838b3f1399d5062f6d735ebc79eb8765f4";
+      hash = "sha256-m5jbhTNVT2A9lQhwEVGay3hJD7SkFc+az6DwfishVj0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.misc/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10223,12 +10223,12 @@ final: prev: {
 
   mini-move = buildVimPlugin {
     pname = "mini.move";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.move";
-      rev = "a776027e68fe763987a0132d59877d651a7c0130";
-      hash = "sha256-f+MHsSCR9Y2gVV7X/o+HIVzbwZZVG7eL7Q9XILbqAsc=";
+      rev = "b9e452f9c83565a1520e14f7531632160f3b0170";
+      hash = "sha256-HVTI8k5KJeULmW6AC1qgCUXF5lHDcCzzp1aaI4H1PgU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.move/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10237,12 +10237,12 @@ final: prev: {
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.notify";
-      rev = "7e75de73c60590e3f35d5cecd5677a68a437fc54";
-      hash = "sha256-VXhsQM5WQwOTpsus0WOTwmdz4TtGVyM8ZZOpXBqqqv4=";
+      rev = "7d3832e369853eaf1a2d25dede9db34ae5a809e9";
+      hash = "sha256-6oggS2HesLCUmWOybpyKYF/19b3RXChxn/dDTbo4L0g=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.notify/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10251,12 +10251,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "0.17.0-unstable-2026-06-15";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "7ed410c73ebb910754c2938a6dae50c51c3a096a";
-      hash = "sha256-yyJ0BwKMOi+c2WODEUnlRB5iz+3i4u8G7zL4mtayRMQ=";
+      rev = "ecb05c524a99490c95a8862eb5cb09b1e629ed42";
+      hash = "sha256-n5xBMzebGmiIsL26jTKy+YfccRQ1iwvvMAnqc7bxFwo=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10265,12 +10265,12 @@ final: prev: {
 
   mini-operators = buildVimPlugin {
     pname = "mini.operators";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.operators";
-      rev = "d9b2f3892ad177cc141987ccfa8944cf21474f77";
-      hash = "sha256-FrkWVfNzHaVqqvmprj8kn7MubSXjgXn/z0qRT5+hMwM=";
+      rev = "59c7f7362461a5db830a5752b22ce9f5cd25a966";
+      hash = "sha256-9RVfrlRd8THUJb8nJKqTbUPQKPwN8xyKzqZvr0oGQk0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.operators/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10279,12 +10279,12 @@ final: prev: {
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pairs";
-      rev = "30cf2f01c4aaa2033db67376b9924fa2442c05d6";
-      hash = "sha256-rLl7zM97oyi/M4jsq/Zvl9u7Z3enLvNzByyhT4xaCg8=";
+      rev = "4a014143fcb4e9df26198ccb3ecff3b9e77a048c";
+      hash = "sha256-35ewaDXW5RoQUHns0hVXMw6OTf/BTvKXLd1u/warDSE=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pairs/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10293,12 +10293,12 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "0.17.0-unstable-2026-06-15";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "f8ea97c5e89cc923f466e0706046eaa3988f246c";
-      hash = "sha256-ZQcB/4D0xVAJswotuSFOspFFHs1BtrHvCF0uDv1yhr0=";
+      rev = "8c1f75f8ddd8c9f75d07ed2ab5718d2c3cb65a66";
+      hash = "sha256-ebjHOQpHWsOdAIdJjimCJqXOmKCZnLobLOF8JroRRxk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10307,12 +10307,12 @@ final: prev: {
 
   mini-sessions = buildVimPlugin {
     pname = "mini.sessions";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.sessions";
-      rev = "e59286b20fbf61171039ddfebc736cf9562e75d5";
-      hash = "sha256-rULcDHhAcZDQzX6KJ+PoZncNqGnU1t4iSBpUiGBHZ+g=";
+      rev = "7cb2945ccc11323b7ca19796eb42618493e1dc12";
+      hash = "sha256-hXdpKozw9ZFkrIe/wGxEJR8j02EAPnB5txq+NtrjHgI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.sessions/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10321,12 +10321,12 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "0.17.0-unstable-2026-06-15";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.snippets";
-      rev = "c59e203fef0de69b8cb67edb07b4fc10d455bb44";
-      hash = "sha256-5auuFMTQGO4gSUadW4iSwAZDZYyKBHZVAJCJjXDO1yI=";
+      rev = "cf5607c66571d130663fd20761d7cbebdbbf713d";
+      hash = "sha256-AoSGqdCBdcCwZdwjhgSU3ACvE40FlrZARN/Lp1aZg54=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10335,12 +10335,12 @@ final: prev: {
 
   mini-splitjoin = buildVimPlugin {
     pname = "mini.splitjoin";
-    version = "0.17.0-unstable-2026-05-12";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.splitjoin";
-      rev = "146aef247d9bfc58bab20dd921ba6b75ac4b8cf9";
-      hash = "sha256-lW9RY8ky7WBL8H5joXiOubOhJjiMGrmRmR/4e59s2g4=";
+      rev = "4a0e6f5ea83148f6884eed03f287f94c3f22915d";
+      hash = "sha256-/3S6D+kuSXgmf3dlCRcABnFpNY6eaFUbEDxGHduh1Es=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10349,12 +10349,12 @@ final: prev: {
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.starter";
-      rev = "a7d8b353cf120fee32bb5d88e7a9de5eaec746e7";
-      hash = "sha256-fzp3maSVIQYh4Gr5FfDiAdrXdK7Z+V9hpqjgftAkG5U=";
+      rev = "0575c96206d63fd98d7f786df78dc225bf847d95";
+      hash = "sha256-4oaQrsp5f2NqxiiMEzHel0U/onctfnbCBKVTJqhQUPM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.starter/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10363,12 +10363,12 @@ final: prev: {
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.statusline";
-      rev = "7091f554d7d26b5d55f4c937634da53ba277a44a";
-      hash = "sha256-EUSzEt4JJI+bT6ll511tT+7ZTkpNqBYxQYw/e+CwHtM=";
+      rev = "b5547f44560dae3ccd81f914256fa6f705837022";
+      hash = "sha256-CVebe3F7o7o+qXiEQkngfvmgtGF7dt1u7ALh1bgedzw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.statusline/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10377,12 +10377,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "0.17.0-unstable-2026-06-05";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "9fd5ebef2b34cc4ac3c0f1811a6726ea6d92fa91";
-      hash = "sha256-5dJ8GI9NtYbiAUvYdRjtxrTIUVS41VRkWvLtrBNqbhs=";
+      rev = "580e4cb98c5900d9fe743865fb5a5b2178b4ab18";
+      hash = "sha256-ILKwZ1+Dh4HH5DNnNwqH7xnDyCIEnxPRjLDCwqWOeXY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10391,12 +10391,12 @@ final: prev: {
 
   mini-tabline = buildVimPlugin {
     pname = "mini.tabline";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.tabline";
-      rev = "7d4a8a79f37361ad287d27bda0f37fc53f924a50";
-      hash = "sha256-KlrjsgsSnuW0Fpr2Jq2YYRCiw0+KET+YHEKiOnXfYk8=";
+      rev = "7e8584a06b86902c64227e4abd0c39ae74061101";
+      hash = "sha256-6vLYDvQWbI6xILsdedJCU7G129TzcMJdwC0xB50Gw8Y=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.tabline/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10419,12 +10419,12 @@ final: prev: {
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "0.17.0-unstable-2026-06-01";
+    version = "0.17.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.visits";
-      rev = "d3cce4e1f07d59e4e2e1d31502e342fc48376c19";
-      hash = "sha256-7fHzk7DsoX2ocwYelaXsOUrxuwAtvD6giHsQC9mVz1E=";
+      rev = "848858d4141f1cc6f98de79212a63270b09191a1";
+      hash = "sha256-rDVKgX2T85i8b29QI8549RaHoEWhUQmxi++hwDR9mZk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.visits/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10669,6 +10669,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  multiple-cursors-nvim = buildVimPlugin {
+    pname = "multiple-cursors.nvim";
+    version = "0.15-unstable-2026-05-10";
+    src = fetchFromGitHub {
+      owner = "brenton-leighton";
+      repo = "multiple-cursors.nvim";
+      rev = "eae76d4c5f7ede2d45746dc2affb5e7a139e4aa8";
+      hash = "sha256-iLQT+M0wL/Bh0zzgLSozSRjsELzKochMlM6djUwg/og=";
+    };
+    meta.homepage = "https://github.com/brenton-leighton/multiple-cursors.nvim/";
+    meta.license = getLicenseFromSpdxId "Apache-2.0";
+    meta.hydraPlatforms = [ ];
+  };
+
   muren-nvim = buildVimPlugin {
     pname = "muren.nvim";
     version = "0-unstable-2025-02-09";
@@ -11007,12 +11021,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-06-12";
+    version = "1.4.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "0748437c07b5e7fd19af738ed0562479381424b1";
-      hash = "sha256-rCYdnx//W0m20ph62PEwdMcx8xd0ZIlATBxjlZARjJ4=";
+      rev = "5eeb19f80e04d86e76abefb3204bd1aab009a9b2";
+      hash = "sha256-ExcjOnKkfMIjxyeea5jnEcZEybe8uxopIgM75UXItnY=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11091,12 +11105,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-06-15";
+    version = "3.0.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "5d1b65d6215928e941e1a6a4e76e02fd45ada31f";
-      hash = "sha256-K7AtBKS2b77pjfdxb11A7U7ED+XTjn4W8ajk//8U7TA=";
+      rev = "828dd073e6ad180fdb5c1603c7ad7f68a384c40b";
+      hash = "sha256-oai8d/Zin+7jsrde4wGN2x/2vI3dH/Hs4raV/h2lrIA=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11598,12 +11612,12 @@ final: prev: {
 
   neotest-rspec = buildVimPlugin {
     pname = "neotest-rspec";
-    version = "0-unstable-2025-09-14";
+    version = "0-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "neotest-rspec";
-      rev = "e7dc67c1167a9e593c804a6be6808ba9a5920d43";
-      hash = "sha256-45DTXO0CQ/YCivDev0We7+7Ca4i0kHKZmbSc73lkPSY=";
+      rev = "7629f8c2837becb72090fbafce58506bb56a00f0";
+      hash = "sha256-6FUhSFpQ243mS2Cu7ou7gCr2NlTRtk9+n43aPDeE1U8=";
     };
     meta.homepage = "https://github.com/olimorris/neotest-rspec/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12367,12 +12381,12 @@ final: prev: {
 
   nvim-cokeline = buildVimPlugin {
     pname = "nvim-cokeline";
-    version = "0.4.0-unstable-2025-01-24";
+    version = "0.4.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "nvim-cokeline";
-      rev = "9fbed130683b7b6f73198c09e35ba4b33f547c08";
-      hash = "sha256-O0msAljyNYj4zdFBOCR43QiqHYl1e9c4MASi9MmS+R4=";
+      rev = "854849e6b853a6ee1f17d62c80ae37435cfb0a3e";
+      hash = "sha256-gSwGjKpjVQ2zvbX7jlfdqc4Z0k89uWcKhxYsQaFs24M=";
     };
     meta.homepage = "https://github.com/willothy/nvim-cokeline/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12784,12 +12798,12 @@ final: prev: {
 
   nvim-highlite = buildVimPlugin {
     pname = "nvim-highlite";
-    version = "4.22.0-unstable-2026-04-30";
+    version = "4.22.0-unstable-2026-06-17";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "4a4d614020d423015e8e08c3335d3f9704d67a6d";
-      hash = "sha256-R91WwMm0X1bEckus0YCdZ8RygYXb/W58yLTxyE+dYxc=";
+      rev = "3281bea1080d85f0a878793c0b7b962b9da1c7fd";
+      hash = "sha256-bq4tUf1SLXEgw9p3BrXryreJM89Fe+OG4TyPo9TE1oU=";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
     meta.license = unfree;
@@ -13048,11 +13062,11 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "05-unstable-2026-06-06";
+    version = "05-unstable-2026-06-17";
     src = fetchgit {
       url = "https://codeberg.org/mfussenegger/nvim-lint/";
-      rev = "99cbc3ca8a76845fca50e496be7212bebf907dd3";
-      hash = "sha256-c0LEEbbWHZAKk+dpLGOjKvS1miuYLsxUM3AUf/t9ti8=";
+      rev = "4b7957daf4b81eb578114bd6fcf20b6f5a2b59e8";
+      hash = "sha256-5df927RmgLzj2oOsQRrv7KRMOpTD59R4g22p94/6k7g=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-lint/";
     meta.license = unfree;
@@ -13285,12 +13299,12 @@ final: prev: {
 
   nvim-numbertoggle = buildVimPlugin {
     pname = "nvim-numbertoggle";
-    version = "0-unstable-2026-04-08";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "sitiom";
       repo = "nvim-numbertoggle";
-      rev = "c5c0d305aee8532b5515914a08396b9154394c55";
-      hash = "sha256-C11XegdlMo5l4NVi9txSc5uivz9qx5HCNtwQSbMm28k=";
+      rev = "704e098c7f056f0dae9407d8651edd3d183f3fff";
+      hash = "sha256-P+Rfzsc8eQiozGPWW0pyNw2mo1cAIAd6a9kEGhZvlXU=";
     };
     meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14139,12 +14153,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2026-06-05";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "7fed87415c401954f73401bbed0fd736b9611e7c";
-      hash = "sha256-9f8ZKK8OKlQSMjvFW6VY/861IZ/EugKfj5WLDkjg+ac=";
+      rev = "66b8eeca8e18213a19742f8a031e6947c738342f";
+      hash = "sha256-dZl0/0JbrxLdQEhPI7xzg0HjD173t67fI5xG9eEJZcI=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14391,12 +14405,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0.13.1";
+    version = "0.13.2";
     src = fetchFromGitHub {
       owner = "nickjvandyke";
       repo = "opencode.nvim";
-      tag = "v0.13.1";
-      hash = "sha256-RusMzeU22v4Lnx1n7q3uucLI6AFVk1AUE+IvpDlvuLw=";
+      tag = "v0.13.2";
+      hash = "sha256-2+i0pA2Xn8OalHQ4yEnwLUnklT10r8rgE5qkc8k9754=";
     };
     meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15065,12 +15079,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "5.0.0-1";
+    version = "5.0.1-1";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      tag = "v5.0.0-1";
-      hash = "sha256-zJ/UMESO69829eGgsq53a/LttRSE1bRTo2vy4HjaHY8=";
+      tag = "v5.0.1-1";
+      hash = "sha256-wTz4UcaB/qUzA8sWf0WLZhY7tTE+OonSfpiSu7/JN7I=";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -15541,12 +15555,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "8.12.0-unstable-2026-05-25";
+    version = "8.13.0";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "5adf0895310c1904e5abfaad40a2baad7fe44a07";
-      hash = "sha256-vB8rFNSUW9pcBiCjtsA+LRbuysP8HnpsCQHPEFyHTrM=";
+      tag = "v8.13.0";
+      hash = "sha256-ukJUaqEYI60o/lyLM5GaKsRdMW/24IZnzVzPB9/Q/zo=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15682,12 +15696,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "0-unstable-2026-06-07";
+    version = "0-unstable-2026-06-16";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "9c5da79216e5776e020dcc6c157983f5352f3f11";
-      hash = "sha256-EGsDK45Tl+slGT0fibcwQDdHS1obJHPWgd1+jaOw8fg=";
+      rev = "c4ef25973bcc30a2c8c8766711fbbdb3d02b70a3";
+      hash = "sha256-e0PNOBtjRcsCkbaJn2K2o7Tr1dSte0tOK1jQMWJ2XQ4=";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15863,12 +15877,12 @@ final: prev: {
 
   scnvim = buildVimPlugin {
     pname = "scnvim";
-    version = "0-unstable-2026-06-15";
+    version = "0-unstable-2026-06-16";
     src = fetchFromGitHub {
       owner = "davidgranstrom";
       repo = "scnvim";
-      rev = "b7d48851e98e6111ad62f94a3c3ddc9b037122e8";
-      hash = "sha256-k5a7d3exVXdjHuILfYIj6cinWoev8h6wYBlNXowuHsw=";
+      rev = "876732590ef3f409c9705f3659fa1061db2dc7bf";
+      hash = "sha256-qpOKAXkj6QjitypJL6YW7qTgQ0iJZpZZhA9tpr4Ya4g=";
     };
     meta.homepage = "https://github.com/davidgranstrom/scnvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -15961,12 +15975,12 @@ final: prev: {
 
   searchbox-nvim = buildVimPlugin {
     pname = "searchbox.nvim";
-    version = "0-unstable-2026-06-13";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "searchbox.nvim";
-      rev = "83a43dbc52d27755ab1a9f710a11c987f6a73813";
-      hash = "sha256-kUJZvXY1JbHvPUyq80nfP7aygi+ZtjcWGPCbsbvHLLQ=";
+      rev = "c43e52a4ba50981e77334d676173e0e52dc99b28";
+      hash = "sha256-Yygm/AsNrAlvwPb6SQKUdxVTNLVYDh7FJTitAfsYu7E=";
     };
     meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16172,12 +16186,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-06-12";
+    version = "2.1.0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "501ea73e433246cbd53f0b14bbd205fa44831e4d";
-      hash = "sha256-P7XFoM3zZmlOrhRwiY3xJdJZuiIlJAgijLWukt6OHfI=";
+      rev = "c02d70257e5d6065d4154acd596ec8054a725724";
+      hash = "sha256-Pv1pVWOk7lKX3R71qFbR6Hk44CjdMdQ1vQPrYegSo5w=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17871,12 +17885,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "1.0.0-unstable-2026-06-02";
+    version = "1.0.0-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "836f016255b886a267a04c8ee190e2f667b092c0";
-      hash = "sha256-cKVmIBPTlzOngk/jIOsYw5dJvVzg8nRxz2SfFbqwUYU=";
+      rev = "2ce11a2b73c61054ea47a9e5b8a6c537f517ab9f";
+      hash = "sha256-fLOPbvsY2yvaCIshcLlq+6qMbnd0hXtZkUnXdQcp/Lg=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17885,12 +17899,12 @@ final: prev: {
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "01-unstable-2026-05-04";
+    version = "01-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "c086276f0227f41d17b68b1fe2e378b3b113401d";
-      hash = "sha256-qfG5xFnAZd3o1kGL8xQPAkqHHvx+twJMkwCrL2Wdkrg=";
+      rev = "e89c8ca390bbbb21f875b457b1f2e6d5d1950ca2";
+      hash = "sha256-T4rXBjwhvYhoQvqdXbDQdojgf/Jf9sIo3WYP+hQtKQY=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
     meta.license = unfree;
@@ -20157,12 +20171,12 @@ final: prev: {
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "0-unstable-2026-02-11";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "07e92e22114cc5b1ba4938d99897d85b58e20475";
-      hash = "sha256-Of/9Ju2pkMEAZdSnDoRGxGSCBbR0e0oSRTts1VXVCf4=";
+      rev = "afd07819d8efcefc3317205b855ad4e3513b0011";
+      hash = "sha256-jyNaKXUM0uWsZO4G0y09hgfq5Ned9bFSjahL/T/V7Fs=";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -23952,12 +23966,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "0.5.2-unstable-2026-05-28";
+    version = "0.5.2-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "e7de5b5adbb3c59014d98cf0d1198919f9fa5e1c";
-      hash = "sha256-MoHDekfBwUBBsrR7AYkL3tT0aSIDqcFOK13+mEjdpfo=";
+      rev = "1d6c33a2879a7fdddc94659eeae09e504da13f39";
+      hash = "sha256-HDJdBW0Z7YxZtvGZAXaGcHeBsmKgyYiGARK501/WCtk=";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.license = getLicenseFromSpdxId "MIT";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 8e0ef82824a3..c06733b9ec40 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -760,6 +760,7 @@ https://github.com/leafo/moonscript-vim/,,
 https://github.com/yegappan/mru/,,
 https://github.com/jake-stewart/multicursor.nvim/,,
 https://github.com/smoka7/multicursors.nvim/,,
+https://github.com/brenton-leighton/multiple-cursors.nvim/,main,
 https://github.com/AckslD/muren.nvim/,,
 https://github.com/jbyuki/nabla.nvim/,,
 https://github.com/ncm2/ncm2/,,
diff --git a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix
index d2e8dcbddf83..9b60246c80f4 100644
--- a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "oxc";
     name = "oxc-vscode";
-    version = "1.57.0";
-    hash = "sha256-kz4YqPcDjBX7hT3O7odPQgYmGMO34VGw16d6mpzXq7c=";
+    version = "1.58.0";
+    hash = "sha256-30dFeguNbY8WM3fLym6aUMkHYH5wA5scSNn04Ukbj9U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
index 619d07ba98b3..2368ed316d72 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-vb";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-06-14";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-vb-libretro";
-    rev = "1275bd7bddf2166be5a10e45c26c5c2a61370658";
-    hash = "sha256-3JTcAITogWP9yQ4sLZl8YlUHzu9LvWor9liQRIwf2b8=";
+    rev = "38e7a0ec9ac7079ca1c1e3dd9aaf5b56f527efca";
+    hash = "sha256-+57qsfH2wygKdD66yauzKD9XDf01q4LeiWdIeYbVUmc=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/np2kai.nix b/pkgs/applications/emulators/libretro/cores/np2kai.nix
index c8ce21d781ed..b5a7edf8d4d5 100644
--- a/pkgs/applications/emulators/libretro/cores/np2kai.nix
+++ b/pkgs/applications/emulators/libretro/cores/np2kai.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
   core = "np2kai";
-  version = "0-unstable-2026-05-09";
+  version = "0-unstable-2026-06-19";
 
   src = fetchFromGitHub {
     owner = "AZO234";
     repo = "NP2kai";
-    rev = "eebb95c060f82df45a5615be676c3fa4b7bb7ae0";
-    hash = "sha256-KBvxqxCeYyIKCTHdcczwpgHBIZds6xMfHt6LblRRoFc=";
+    rev = "e2dc9046aa5c786fcfbfb87e883457e421026e31";
+    hash = "sha256-35LWLk4U1B1NjXN94QN5nsMMXCmo+VKOVWhzFdZ79oc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index b579ede72fec..1c619b065a43 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2026-05-15";
+  version = "0-unstable-2026-06-13";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "c88070df8e0e84106ecc4b6394860a413a7bc046";
-    hash = "sha256-ZngYExWmL4NlmSfaRbTpSthNY1QRwKXtSiSX8zS/teo=";
+    rev = "d26eaee5c8fb47c1832b8bf32c1358d625da8a02";
+    hash = "sha256-p8sPQDnxIBMuFD9nCtdFp1DEJwRuifgUrOFYdY1EfME=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
index 288bf5f1acdb..be3c91bfc28e 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2026-05-20";
+  version = "0-unstable-2026-06-16";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "f8aff9cbd0ab3ee92679f039298d57b55f9d790e";
-    hash = "sha256-4tOXpK2OBY6u5NnuIq5NWT3haOp2y+4BtBlHVAzEuRE=";
+    rev = "9df418161bd030d59a0ab0c7b656df68dea11007";
+    hash = "sha256-1NZ0ESAunxYOIuk/X+41HELKdxq1U6VG5EG+or+VLkk=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index a662a9176249..183bdb93d559 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-06-09";
+  version = "0-unstable-2026-06-19";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "3e3061809913e59a4378737127ce0ae95b36e889";
-    hash = "sha256-fKivb4sFR4F0ub1NLpazLg3i3M9LOely08M8kBEczmo=";
+    rev = "65fc7d66abfc8dfba5033d88523437b83664ea2b";
+    hash = "sha256-hYYZyHtWjo3BgX73Vxj8JG/2vQ7JtqT+4jPWLN+zZHw=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 8d9d1f7ccdcc..8350fe22dd90 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -128,11 +128,11 @@
     "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
   },
   "buildkite_buildkite": {
-    "hash": "sha256-MoucQgeikKMh4P8nRWIJ5SkLFGeVfDutsSBUSowz6VM=",
+    "hash": "sha256-CfipoNGW0VofHfgXlbfcjIGYpkuE0UXewDM6UCutg9g=",
     "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
     "owner": "buildkite",
     "repo": "terraform-provider-buildkite",
-    "rev": "v1.34.0",
+    "rev": "v1.34.2",
     "spdx": "MIT",
     "vendorHash": "sha256-uYyj6GSV5bWEfRTOODMuReEHe9wnF4cVoHM9rBMpgmM="
   },
@@ -409,13 +409,13 @@
     "vendorHash": null
   },
   "fastly_fastly": {
-    "hash": "sha256-S6VIwqwTPr276TTqgEFTxhE5c97lCd8/5dJnDGori4s=",
+    "hash": "sha256-I1a2wus61as24DMBZEZsl2C6YJ5B0CaIST/FM+8KMLc=",
     "homepage": "https://registry.terraform.io/providers/fastly/fastly",
     "owner": "fastly",
     "repo": "terraform-provider-fastly",
-    "rev": "v9.2.1",
+    "rev": "v9.3.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-8QF9gOuvuZwAoFWePjti4h6VzmA+TGiFaC/ShuEAZqA="
+    "vendorHash": "sha256-TDU8T91em1+Y+0LN6FQSGEKJ4T9dIUxyuOTvx6HBYjg="
   },
   "flexibleenginecloud_flexibleengine": {
     "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
@@ -724,11 +724,11 @@
     "vendorHash": "sha256-f49amYWzWSG9tzY6wvpxtTFiyJ8zC/Lc1hIQtzdgJRs="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-4KRJhLnpKZwmL5aQqva8JZGDCYBzlGepE7zP6hwP+KY=",
+    "hash": "sha256-Ao3CkaQBe172Ookcgl+ugeHH5ClbyOsSpLb4+j9DAZQ=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.92.0",
+    "rev": "v1.93.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1247,11 +1247,11 @@
     "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-bX6CtNP7uB50kk3ddu52YfKE04PsEJw6DXl6yQxOeVI=",
+    "hash": "sha256-zwq7jCST2EkNk+UlKgLY2r3rCm5D009HYMru9KSVmuc=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.30.1",
+    "rev": "v9.30.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg="
   },
diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix
index 03677355b8d6..b1294a43a0f8 100644
--- a/pkgs/build-support/make-startupitem/default.nix
+++ b/pkgs/build-support/make-startupitem/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
       target=${name}.desktop
       cp ${package}/share/applications/${srcPrefix}${name}.desktop $target
       ${lib.optionalString (prependExtraArgs != [ ] || appendExtraArgs != [ ]) ''
-        sed -i -r "s/(Exec=)([^ \n]*) *(.*)/\1\2 ${prependArgs}\3${appendArgs}/" $target
+        sed -i -r "s/^(Exec=)([^ \n]*) *(.*)/\1\2 ${prependArgs}\3${appendArgs}/" $target
       ''}
       chmod +rw $target
       echo "X-KDE-autostart-phase=${phase}" >> $target
diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index 01afb249d407..eabffa1117cb 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -6,6 +6,7 @@
   makeBinaryWrapper,
   mkNugetDeps,
   mkNugetSource,
+  nginx-config-formatter,
   pkgs,
   stdenv,
 }:
@@ -1101,11 +1102,14 @@ rec {
       {
         inherit text;
         __structuredAttrs = true;
-        nativeBuildInputs = [ gixy ];
+        nativeBuildInputs = [
+          gixy
+          nginx-config-formatter
+        ];
       } # sh
       ''
-        printf "%s" "$text" | ${lib.getExe pkgs.nginx-config-formatter} --max-empty-lines 0 - > $out
-        ${lib.getExe pkgs.gnused} -i 's/ ;/;/g' $out
+        printf "%s" "$text" | nginxfmt --max-empty-lines 0 - > $out
+        sed -i 's/ ;/;/g' $out
         gixy $out || (echo "\n\nThis can be caused by combining multiple incompatible services on the same hostname.\n\nFull merged config:\n\n"; cat $out; exit 1)
       '';
 
diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix
index 6f4760666a89..00b4aa13d4a2 100644
--- a/pkgs/by-name/ad/adminneo/package.nix
+++ b/pkgs/by-name/ad/adminneo/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adminneo";
-  version = "5.3.0";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "adminneo-org";
     repo = "adminneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hJwqI8zT2ZAapJMpUZ+izJo3DF5I5NlO5HhPyxoM9b0=";
+    hash = "sha256-vnvLRPMiVuSEAQJSPBGM63LppQ7pZv6ZaQnUTpUw9W0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/am/amule-cmd/package.nix b/pkgs/by-name/am/amule-cmd/package.nix
new file mode 100644
index 000000000000..46f02a3d16db
--- /dev/null
+++ b/pkgs/by-name/am/amule-cmd/package.nix
@@ -0,0 +1,13 @@
+{
+  amule,
+  ...
+}@args:
+
+amule.override (
+  {
+    monolithic = false;
+    textClient = true;
+    mainProgram = "amulecmd";
+  }
+  // removeAttrs args [ "amule" ]
+)
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 680b56d16165..1a50903cfa2f 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -3,94 +3,144 @@
   enableDaemon ? false, # build amule daemon
   httpServer ? false, # build web interface for the daemon
   client ? false, # build amule remote gui
+  textClient ? false, # build amule remote command line client
   mainProgram ? "amule",
   fetchFromGitHub,
-  fetchpatch,
   stdenv,
   lib,
   cmake,
   zlib,
   wxwidgets_3_2,
-  perl,
+  curl,
   cryptopp,
   libupnp,
-  boost186, # Not using boost leads to crashes with gtk3
+  boost,
   gettext,
+  glib,
+  libintl,
+  gtk3,
+  libayatana-appindicator,
+  libsysprof-capture,
   libpng,
   pkg-config,
-  makeWrapper,
+  readline,
+  nix-update-script,
+  writeShellScript,
+  xcbuild,
   libx11,
 }:
 
-# daemon and client are not build monolithic
-assert monolithic || (!monolithic && (enableDaemon || client || httpServer));
+let
+  # MacOS's plutil lives under /usr/bin, which the build sandbox blocks
+  # so we use `xcbuild`'s pure reimplementation instead.
+  # CMake generates the bundle plist read-only, so we make i
+  # writable before plutil rewrites it in place.
+  plutil = writeShellScript "amule-plutil" ''
+    for plist; do :; done
+    chmod u+w "$plist"
+    exec ${lib.getExe' xcbuild "plutil"} "$@"
+  '';
+in
+
+# daemon, clients and web interface are not built monolithic
+assert monolithic || (!monolithic && (enableDaemon || client || textClient || httpServer));
 
 stdenv.mkDerivation (finalAttrs: {
   pname =
     "amule"
     + lib.optionalString httpServer "-web"
     + lib.optionalString enableDaemon "-daemon"
-    + lib.optionalString client "-gui";
-  version = "2.3.3";
+    + lib.optionalString client "-gui"
+    + lib.optionalString textClient "-cmd";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
-    owner = "amule-project";
+    owner = "amule-org";
     repo = "amule";
     tag = finalAttrs.version;
-    sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi";
+    hash = "sha256-2qQof2/JFTfOmqd25+YVWBpZgCDCOwf3NBo1aHcMPds=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://sources.debian.org/data/main/a/amule/1%3A2.3.3-3/debian/patches/wx3.2.patch";
-      hash = "sha256-OX5Ef80bL+dQqHo2OBLZvzMUrU6aOHfsF7AtoE1r7rs=";
-    })
-  ];
+  __structuredAttrs = true;
+  strictDeps = true;
 
   nativeBuildInputs = [
     cmake
     gettext
-    makeWrapper
     pkg-config
   ];
 
+  postPatch =
+    lib.optionalString (stdenv.hostPlatform.isDarwin && (monolithic || client)) ''
+      substituteInPlace src/CMakeLists.txt \
+        --replace-fail "/usr/bin/plutil" "${plutil}"
+    ''
+    # The __WXMAC__ branch casts to the pre-libedit-3.0 `Function` typedef,
+    # which neither the modern SDK libedit headers nor GNU readline 8.3
+    # provide; both declare rl_completion_entry_function with the typedef
+    # used here.
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && (textClient || httpServer)) ''
+      substituteInPlace src/ExternalConnector.cpp \
+        --replace-fail "(Function *)&command_completion" "(rl_compentry_func_t *)&command_completion"
+    '';
+
   buildInputs = [
     zlib
     wxwidgets_3_2
-    perl
     cryptopp.dev
     libupnp
-    boost186
+    boost
+  ]
+  # the GUI and daemon bind the Wayland app_id/X11 WM_CLASS via g_set_prgname();
+  # libsysprof-capture satisfies glib-2.0.pc's Requires.private so the
+  # pkg-config checks resolve cleanly
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && (monolithic || enableDaemon || client)) [
+    glib
+    libsysprof-capture
+  ]
+  # CURLOPT tuning (NOSIGNAL/CONNECTTIMEOUT) on wxWebRequest's curl backend
+  ++ lib.optional stdenv.hostPlatform.isLinux curl
+  # StatusNotifierItem tray icon; without it aMule falls back to the legacy
+  # GtkStatusIcon, invisible on modern GNOME/wlroots. gtk3 brings the
+  # gtk+-3.0.pc that ayatana-appindicator3-0.1.pc requires
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && monolithic) [
+    gtk3
+    libayatana-appindicator
   ]
   ++ lib.optional httpServer libpng
+  # gettext runtime for NLS; on glibc libintl is part of libc
+  ++ lib.optional (!stdenv.hostPlatform.isGnu) libintl
+  # line editing in the interactive consoles of amulecmd and amuleweb
+  ++ lib.optional (textClient || httpServer) readline
   ++ lib.optional client libx11;
 
   cmakeFlags = [
-    "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}"
-    "-DBUILD_DAEMON=${if enableDaemon then "ON" else "OFF"}"
-    "-DBUILD_REMOTEGUI=${if client then "ON" else "OFF"}"
-    "-DBUILD_WEBSERVER=${if httpServer then "ON" else "OFF"}"
-    # building only the daemon fails when these are not set... this is
-    # due to mistakes in the Amule cmake code, but it does not cause
-    # extra code to be built...
-    "-Dwx_NEED_GUI=ON"
-    "-Dwx_NEED_ADV=ON"
-    "-Dwx_NEED_NET=ON"
+    (lib.cmakeBool "BUILD_MONOLITHIC" monolithic)
+    (lib.cmakeBool "BUILD_DAEMON" enableDaemon)
+    (lib.cmakeBool "BUILD_REMOTEGUI" client)
+    (lib.cmakeBool "BUILD_AMULECMD" textClient)
+    (lib.cmakeBool "BUILD_WEBSERVER" httpServer)
+    # with strictDeps FindwxWidgets cannot find wx-config in PATH
+    # the script runs on the build machine even when wxwidgets is a host dependency
+    (lib.cmakeFeature "wxWidgets_CONFIG_EXECUTABLE" (
+      lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"
+    ))
   ];
 
-  postPatch = ''
-    echo "find_package(Threads)" >> cmake/options.cmake
-
-    substituteInPlace src/libs/ec/abstracts/CMakeLists.txt \
-      --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8)" "CMAKE_MINIMUM_REQUIRED (VERSION 3.10)"
+  # On darwin the GUIs are installed as app bundles in $out
+  # move them to $out/Applications and expose the inner binaries in $out/bin
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    for app in "$out"/*.app; do
+      [ -e "$app" ] || continue
+      mkdir -p "$out/Applications" "$out/bin"
+      mv "$app" "$out/Applications/"
+      name=$(basename "$app" .app)
+      ln -s "$out/Applications/$name.app/Contents/MacOS/$name" \
+        "$out/bin/$(echo "$name" | tr '[:upper:]' '[:lower:]')"
+    done
   '';
 
-  # aMule will try to `dlopen' libupnp and libixml, so help it
-  # find them.
-  postInstall = lib.optionalString monolithic ''
-    wrapProgram $out/bin/amule \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libupnp ]}
-  '';
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Peer-to-peer client for the eD2K and Kademlia networks";
@@ -104,12 +154,11 @@ stdenv.mkDerivation (finalAttrs: {
       no adware or spyware as is often found in proprietary P2P
       applications.
     '';
-    homepage = "https://github.com/amule-project/amule";
+    homepage = "https://amule-org.github.io/";
+    changelog = "https://github.com/amule-org/amule/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ aciceri ];
     inherit mainProgram;
     platforms = lib.platforms.unix;
-    # Undefined symbols for architecture arm64: "_FSFindFolder"
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix
index 31e2af072ddc..5ff4f393d9d4 100644
--- a/pkgs/by-name/ap/apidog/package.nix
+++ b/pkgs/by-name/ap/apidog/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "apidog";
-  version = "2.8.33";
+  version = "2.8.35";
 
   src = fetchurl {
     url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
-    hash = "sha256-RimlzPkIAFmsTgtSBocZy4g2S3eCvGq/r993u0Gjj/4=";
+    hash = "sha256-g5+fMP8xveHzcbUx2eoYk3Rpd7NlQwirSgwf6n4r6Mw=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix
index 9208ca0f7e1f..97fea036f6a9 100644
--- a/pkgs/by-name/ap/app2unit/package.nix
+++ b/pkgs/by-name/ap/app2unit/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "app2unit";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "app2unit";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-upYW+aTJ6LCHrI0+IOYnA98uDLKPxu/wCi7uUWe/Geg=";
+    sha256 = "sha256-jUAjcpR4IszvmqWAIjZo0rWZt9yydCe3xH4X+mJ5O8k=";
   };
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix
index 2488f2473f25..72096bd19636 100644
--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@@ -21,13 +21,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "attic";
-  version = "0-unstable-2025-09-24";
+  version = "0-unstable-2026-06-14";
 
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "attic";
-    rev = "12cbeca141f46e1ade76728bce8adc447f2166c6";
-    hash = "sha256-0nZlCCDC5PfndsQJXXtcyrtrfW49I3KadGMDlutzaGU=";
+    rev = "6b22d76ca351c5a07a5e5a60b95bc23320f7e791";
+    hash = "sha256-sboz+gG8z0KX+q0kkvLloNcogXYLwiY5iw2xwN36rFo=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   buildInputs = lib.optional needNixInclude nix ++ [ boost ];
 
   cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
-  cargoHash = "sha256-h041o0s+bciXnvSuk4j+/uCY/sRRQWDVf+WEb9GEYeY=";
+  cargoHash = "sha256-LqE4jOIasxIG4DAhgZJMlTSyt/a900QR06wBFtRNRO8=";
 
   env = {
     ATTIC_DISTRIBUTOR = "nixpkgs";
diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
index 90674e4fd631..23ba8bfe7669 100644
--- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ayatana-indicator-power";
-  version = "24.5.2";
+  version = "26.6.0";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-power";
     tag = finalAttrs.version;
-    hash = "sha256-A9Kbs+qH01rkuLt8GINdPI2vCu0bCO+/g4kZhDj8GsY=";
+    hash = "sha256-3Jw3MrKHiyGw511GucAtV790UP43EuAC89Q1TMfytyY=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
index 39a05c6e5d03..f9e4f847e630 100644
--- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ayatana-indicator-session";
-  version = "24.5.1";
+  version = "26.6.1";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-session";
     tag = finalAttrs.version;
-    hash = "sha256-jqcgQTsC4VBit3wwtKKTdEG71CUPJpeMtpzikE4IGhE=";
+    hash = "sha256-rrjtLiZ+qaqB1QowGqp3SfWsgzqIYHYEzEzAERiLLBs=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
index 67a1e24a152e..f73be0485ca3 100644
--- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ayatana-indicator-sound";
-  version = "24.5.2";
+  version = "24.5.3";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-sound";
     tag = finalAttrs.version;
-    hash = "sha256-qdvte+Mm64O/JhI0luJAGAWoCgukKCbPrp5k8SIDuwM=";
+    hash = "sha256-6KrBlAh8do6O7CGb3mO25y1188w2cVwRxplQe8TBlQ4=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix
index 234f66ac031e..a55448023ecc 100644
--- a/pkgs/by-name/bc/bcompare/package.nix
+++ b/pkgs/by-name/bc/bcompare/package.nix
@@ -4,10 +4,13 @@
   bzip2,
   fetchurl,
   glibc,
+  gobject-introspection,
   kdePackages,
+  python3,
   stdenv,
   runtimeShell,
   unzip,
+  wrapGAppsHook3,
 }:
 
 let
@@ -32,53 +35,68 @@ let
 
   src = srcs.${stdenv.hostPlatform.system} or throwSystem;
 
-  linux = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      src
-      meta
-      ;
-    unpackPhase = ''
-      ar x $src
-      tar xfz data.tar.gz
-    '';
+  linux =
+    let
+      python = python3.withPackages (
+        pp: with pp; [
+          pygobject3
+        ]
+      );
+    in
+    stdenv.mkDerivation {
+      inherit
+        pname
+        version
+        src
+        meta
+        ;
+      unpackPhase = ''
+        ar x $src
+        tar xfz data.tar.gz
+      '';
 
-    installPhase = ''
-      mkdir -p $out/{bin,lib,share}
+      installPhase = ''
+        mkdir -p $out/{bin,lib,share}
 
-      cp -R usr/{bin,lib,share} $out/
+        cp -R usr/{bin,lib,share} $out/
 
-      # Remove library that refuses to be autoPatchelf'ed
-      #  - bcompare_ext_kde.amd64.so is linked with Qt4
-      #  - bcompare_ext_kde5.amd64.so is linked with Qt5
-      rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
-      rm $out/lib/beyondcompare/ext/bcompare_ext_kde5.amd64.so
+        # Remove library that refuses to be autoPatchelf'ed
+        #  - bcompare_ext_kde.amd64.so is linked with Qt4
+        #  - bcompare_ext_kde5.amd64.so is linked with Qt5
+        rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
+        rm $out/lib/beyondcompare/ext/bcompare_ext_kde5.amd64.so
 
-      substituteInPlace $out/bin/bcompare \
-        --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
-        --replace "ldd" "${glibc.bin}/bin/ldd" \
-        --replace "/bin/bash" "${runtimeShell}"
-    '';
+        substituteInPlace $out/bin/bcompare \
+          --replace-fail "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
+          --replace-fail "ldd" "${glibc.bin}/bin/ldd" \
+          --replace-fail "/bin/bash" "${runtimeShell}"
 
-    nativeBuildInputs = [ autoPatchelfHook ];
+        substituteInPlace $out/lib/beyondcompare/bcmount.sh \
+          --replace-fail "python3" "${python.interpreter}"
+      '';
 
-    buildInputs = [
-      (lib.getLib stdenv.cc.cc)
-      kdePackages.kio
-      kdePackages.kservice
-      kdePackages.ki18n
-      kdePackages.kcoreaddons
-      bzip2
-    ];
+      nativeBuildInputs = [
+        autoPatchelfHook
+        gobject-introspection
+        wrapGAppsHook3
+      ];
 
-    dontBuild = true;
-    dontConfigure = true;
-    dontWrapQtApps = true;
+      buildInputs = [
+        (lib.getLib stdenv.cc.cc)
+        kdePackages.kio
+        kdePackages.kservice
+        kdePackages.ki18n
+        kdePackages.kcoreaddons
+        bzip2
+      ];
 
-    __structuredAttrs = true;
-    strictDeps = true;
-  };
+      dontBuild = true;
+      dontConfigure = true;
+      dontWrapQtApps = true;
+
+      __structuredAttrs = true;
+      strictDeps = true;
+    };
 
   darwin = stdenv.mkDerivation {
     inherit
@@ -111,6 +129,7 @@ let
     maintainers = with lib.maintainers; [
       ktor
       arkivm
+      barsikus007
     ];
     platforms = builtins.attrNames srcs;
     mainProgram = "bcompare";
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index 34bae025e153..f799a92f56d1 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bottom";
-  version = "0.12.3";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "ClementTsang";
     repo = "bottom";
     tag = finalAttrs.version;
-    hash = "sha256-arbVp0UjapM8SQ99XQCP7c+iGInyuxxx6LMEONRVl6o=";
+    hash = "sha256-UlkdYrfIjZU6N9W3KSZj4Au333DdejQG3TPRu5CjuBE=";
   };
 
-  cargoHash = "sha256-miSMcqy4OFZFhAs9M+zdv4OzYgFxN2/uBo6V/kJql90=";
+  cargoHash = "sha256-bQOhLlnMHFq5O5OUPWGmt00miKJTycBdhDUnfuUWPVk=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath
diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix
index de649f7157d2..31640eae43bb 100644
--- a/pkgs/by-name/ca/capacities/package.nix
+++ b/pkgs/by-name/ca/capacities/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "capacities";
-  version = "1.64.6";
+  version = "1.65.13";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20260518194627/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.64.6.AppImage";
-    hash = "sha256-RCWzvoOhX14FRoPpoAJXMgMjmIevISDzzieiwGnX7uc=";
+    url = "https://web.archive.org/web/20260518194627/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.65.13.AppImage";
+    hash = "sha256-ATiX1h9hXmKMFtY6OEyZEoJ/SxJGgbj5/QZwFF1sfFQ=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index 3d80235e643a..cb28d2074460 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -10,6 +10,7 @@
   cjs,
   evolution-data-server,
   fetchFromGitHub,
+  fetchpatch,
   gcr,
   gdk-pixbuf,
   gettext,
@@ -86,6 +87,18 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./use-sane-install-dir.patch
     ./libdir.patch
+
+    # util.js: Adapt to GIR 2.0
+    (fetchpatch {
+      url = "https://github.com/linuxmint/cinnamon/commit/3a2d558aa575f0ea364c5b4e30d2eb3ee604ee58.patch";
+      hash = "sha256-+uAGuQJ0VsIvMvPFafyoXmU4MiHfbbRXLzeW/n62ucw=";
+    })
+
+    # cinnamon-calendar-server.py: Allow ICal 4.0
+    (fetchpatch {
+      url = "https://github.com/linuxmint/cinnamon/commit/dcf2d986c1ec167b0a8005ef2ca427317438c8d7.patch";
+      hash = "sha256-4sCZShUOXPaJoumiuEG558e0l8CIehH0P+C9OouG3vI=";
+    })
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix
index ac1b21918707..a89ef4cccf51 100644
--- a/pkgs/by-name/cp/cp2k/package.nix
+++ b/pkgs/by-name/cp/cp2k/package.nix
@@ -26,7 +26,7 @@
   pkg-config,
   plumed,
   zlib,
-  hdf5-fortran,
+  hdf5-fortran-mpi,
   sirius,
   libvdwxc,
   spla,
@@ -131,13 +131,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cp2k";
-  version = "2025.2";
+  version = "2026.1-unstable-2026-06-16";
 
   src = fetchFromGitHub {
     owner = "cp2k";
     repo = "cp2k";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-vfl5rCoFeGtYuZ7LcsVsESjKxFbN5IYDvBSzOqsd64w=";
+    rev = "c28f603b5956aa638ef130b21b091da4e3a17639";
+    hash = "sha256-LIghR2gCYbJDux4bFfeKCi+a+VDVbjcZfcVpYwjPkEg=";
     fetchSubmodules = true;
   };
 
@@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbcsr
     plumed
     zlib
-    hdf5-fortran
+    hdf5-fortran-mpi
     spla
     spfft
     libvdwxc
@@ -207,9 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs tools exts/dbcsr/tools/build_utils exts/dbcsr/.cp2k
-    substituteInPlace exts/build_dbcsr/Makefile \
-      --replace '/usr/bin/env python3' '${python3}/bin/python' \
-      --replace 'SHELL = /bin/sh' 'SHELL = bash'
   '';
 
   cmakeFlags = [
diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 91cff5b1404e..69b1b6dffe26 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
-  version = "0-unstable-2026-06-09";
+  version = "0-unstable-2026-06-15";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "b18d6992feeb7d4c4a0992257c85d96d761e68d2";
-    hash = "sha256-H5ehdZ3PmH8VcBns7h8KsmsAjRVJqS7TSTeUwW/ucTM=";
+    rev = "cdb54bbf405e5d75d42d21947cc717b35b0ccbf4";
+    hash = "sha256-PIzIEFTp+F5fC8aGgwjARhvlxktn60BlgGcRb56ZjIk=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json
index f05c521228cf..ba7392d2130e 100644
--- a/pkgs/by-name/cu/cudatext/deps.json
+++ b/pkgs/by-name/cu/cudatext/deps.json
@@ -16,8 +16,8 @@
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2026.05.20",
-    "hash": "sha256-r3DARtsBEXxkC9wBGuIuY6qU9GQcXPeakQsK2P8zXI0="
+    "rev": "2026.06.12",
+    "hash": "sha256-JTUxakTv9MVbMQArJJC995kSCD37Xs1rvLmDoyQhHf4="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
@@ -31,8 +31,8 @@
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
-    "rev": "2026.01.19",
-    "hash": "sha256-gfx+2HbssaB1frc8QQh3ua+Z4lEM2JnQtSPNZVusaTM="
+    "rev": "2026.06.10",
+    "hash": "sha256-WZnGdl0lt8nOKKZsqPIcSRTVXYEixGKDHtMPveOvE5E="
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",
diff --git a/pkgs/by-name/cu/cudatext/package.nix b/pkgs/by-name/cu/cudatext/package.nix
index 21dad5046557..6f2445c3172a 100644
--- a/pkgs/by-name/cu/cudatext/package.nix
+++ b/pkgs/by-name/cu/cudatext/package.nix
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cudatext";
-  version = "1.234.4.0";
+  version = "1.234.4.1";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     tag = finalAttrs.version;
-    hash = "sha256-eVdV02R1YZ3mdoucEoyp7iKhA30+QJNAqdbnOz2Xjy4=";
+    hash = "sha256-/2OXF0ggbBvgAlQTeQcjxITd8UbdOc9Hruml112XoEU=";
   };
 
   patches = [ ./proc_globdata.patch ];
diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index 8a91dfbd8b9e..c706a6e4e3e9 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -23,13 +23,13 @@ let
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.100.0";
+  version = "1.101.0";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     tag = version;
-    hash = "sha256-yjI89EgFHMitdVVkjutTAiV/bND/eGTNCrLyZp/As4w=";
+    hash = "sha256-hs028qXBzRGrh9xZAQGaFw7iXtkQm9fixMuBohupjrI=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index 3129a0553f0b..71ef2dcf30c6 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -144,11 +144,11 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "sha256": "956a3de0725ca232ad353565a8290d3357592bf4250f6f298a185e2d949c5d3d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.15.1"
     },
     "crypto": {
       "dependency": "direct dev",
@@ -374,11 +374,11 @@
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739",
+        "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.2"
+      "version": "1.18.3"
     },
     "mime": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/de/desync/package.nix b/pkgs/by-name/de/desync/package.nix
index 157861086c96..67233b311071 100644
--- a/pkgs/by-name/de/desync/package.nix
+++ b/pkgs/by-name/de/desync/package.nix
@@ -62,6 +62,9 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/folbricht/desync";
     changelog = "https://github.com/folbricht/desync/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ chaduffy ];
+    maintainers = with lib.maintainers; [
+      chaduffy
+      matshch
+    ];
   };
 })
diff --git a/pkgs/by-name/df/dftd4/fortran-module-dir.patch b/pkgs/by-name/df/dftd4/build-paths.patch
similarity index 73%
rename from pkgs/by-name/df/dftd4/fortran-module-dir.patch
rename to pkgs/by-name/df/dftd4/build-paths.patch
index 88d33a8d0499..4f29ecbd1ec5 100644
--- a/pkgs/by-name/df/dftd4/fortran-module-dir.patch
+++ b/pkgs/by-name/df/dftd4/build-paths.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f222aab..262b505 100644
+index 3db5442..64fa14a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -89,7 +89,6 @@ target_include_directories(
@@ -20,29 +20,38 @@ index f222aab..262b505 100644
  if(WITH_API)
    enable_language("C")
 diff --git a/config/template.cmake b/config/template.cmake
-index 8b5141d..8f94d66 100644
+index 8b5141d..76654d1 100644
 --- a/config/template.cmake
 +++ b/config/template.cmake
-@@ -6,7 +6,6 @@ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@)
+@@ -5,8 +5,7 @@ set("@PROJECT_NAME@_WITH_API_V2" @WITH_API_V2@)
+ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@)
  set(
    "@PROJECT_NAME@_INCLUDE_DIRS"
-   "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
+-  "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
 -  "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@module-dir@"
++  "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
  )
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
  
 diff --git a/config/template.pc b/config/template.pc
-index 3d6efbb..fea69e4 100644
+index 3d6efbb..55b899f 100644
 --- a/config/template.pc
 +++ b/config/template.pc
-@@ -6,4 +6,4 @@ Name: @PROJECT_NAME@
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: @PROJECT_NAME@
  Description: @PROJECT_DESCRIPTION@
  Version: @PROJECT_VERSION@
  Libs: -L${libdir} -l@PROJECT_NAME@
 -Cflags: -I${includedir} -I${includedir}/@module-dir@
 +Cflags: -I${includedir} -I${includedir}/
 diff --git a/meson.build b/meson.build
-index c9e9c58..ac8f0bd 100644
+index 7de7d61..81b8a7d 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -83,7 +83,7 @@ if install
diff --git a/pkgs/by-name/df/dftd4/cmake.patch b/pkgs/by-name/df/dftd4/cmake.patch
deleted file mode 100644
index 00c7e907733b..000000000000
--- a/pkgs/by-name/df/dftd4/cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config/template.pc b/config/template.pc
-index 3d6efbb..e338a42 100644
---- a/config/template.pc
-+++ b/config/template.pc
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: @PROJECT_NAME@
- Description: @PROJECT_DESCRIPTION@
diff --git a/pkgs/by-name/df/dftd4/package.nix b/pkgs/by-name/df/dftd4/package.nix
index 47bdd3495224..0b2c5944035c 100644
--- a/pkgs/by-name/df/dftd4/package.nix
+++ b/pkgs/by-name/df/dftd4/package.nix
@@ -26,21 +26,18 @@ assert (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dftd4";
-  version = "3.7.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "dftd4";
     repo = "dftd4";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dixPCLH5dWkE2/7ghGEXJmX2/g1DN30dB4jX2d7fmio=";
+    hash = "sha256-uKjNOIza3/I0oREp88oFESoNqEdumo1AztIjcrVb1O8=";
   };
 
   patches = [
-    # Make sure fortran headers are installed directly in /include
-    ./fortran-module-dir.patch
-
-    # Fix wrong generation of package config include paths
-    ./cmake.patch
+    # Fix pkg-config, meson and cmake paths for include and lib dirs
+    ./build-paths.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index 1a7cfa3bade6..f417db3d7fc5 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -232,6 +232,7 @@ python.pkgs.buildPythonApplication rec {
         mono
         ocaml
         odt2txt
+        oggvideotools
         openssh
         pdftk
         perl
@@ -255,8 +256,6 @@ python.pkgs.buildPythonApplication rec {
         r2pipe
         # docx2txt, nixpkgs packages another project named the same, which does not work
       ])
-      # oggvideotools is broken on Darwin, please put it back when it will be fixed?
-      ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ]
       # Causes an eval failure
       # See https://github.com/NixOS/nixpkgs/issues/463873
       ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) [
diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index 0764db1ccbbb..ab68977f6656 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dnscontrol";
-  version = "4.41.0";
+  version = "4.42.0";
 
   src = fetchFromGitHub {
     owner = "DNSControl";
     repo = "dnscontrol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oz4hF3W6QKjPda/6AZ7djeZr32oFMqdMD34gWLMnFRQ=";
+    hash = "sha256-iB2PFPvcASRwpBkFJQ3Vi2r89H3a9BBbC1moAymWDOI=";
   };
 
-  vendorHash = "sha256-DQmfwSPdUnoSmVDiKlwrHifKR59KuMe+0DGJtavpmLc=";
+  vendorHash = "sha256-8rL5v/0Vb+gxmbDaEB57UsQEnKCJtbZh0lFUyKYMZgs=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/eo/eom/package.nix b/pkgs/by-name/eo/eom/package.nix
index e8d86ae5898c..b69466468406 100644
--- a/pkgs/by-name/eo/eom/package.nix
+++ b/pkgs/by-name/eo/eom/package.nix
@@ -23,6 +23,11 @@
   wrapGAppsHook3,
   yelp-tools,
   gitUpdater,
+  gnome,
+  libavif,
+  libheif,
+  libjxl,
+  webp-pixbuf-loader,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -64,6 +69,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    # In postInstall to run before gappsWrapperArgsHook.
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          libavif
+          libheif.lib
+          libjxl
+          librsvg
+          webp-pixbuf-loader
+        ];
+      }
+    }"
+  '';
+
   passthru.updateScript = gitUpdater {
     odd-unstable = true;
     rev-prefix = "v";
diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix
index b8bfc4002bd8..78b919e10656 100644
--- a/pkgs/by-name/fa/fast-float/package.nix
+++ b/pkgs/by-name/fa/fast-float/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fast-float";
-  version = "8.2.8";
+  version = "8.2.10";
 
   src = fetchFromGitHub {
     owner = "fastfloat";
     repo = "fast_float";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wnWZyQJzg6vzaRi3hbNHCAZre+NrI7KMoJwJp94fy70=";
+    hash = "sha256-DOwDLnMwlXAP5SfDJuxhkmLmcBZ1wBvXEJr5RuHepp4=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix
index d642b2daf4a6..282360f814c8 100644
--- a/pkgs/by-name/fa/faugus-launcher/package.nix
+++ b/pkgs/by-name/fa/faugus-launcher/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "faugus-launcher";
-  version = "1.20.4";
+  version = "1.22.4";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Faugus";
     repo = "faugus-launcher";
     tag = finalAttrs.version;
-    hash = "sha256-Kt6ZZ5yivbRzlgV+ovWiZVolxjmquAifJ/0lk1oL4fA=";
+    hash = "sha256-Npfoqa6A1YSNSxV3zcIQL6prlht47dVaZYpq9+Dx9LY=";
   };
 
   nativeBuildInputs = [
@@ -53,15 +53,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
     substituteInPlace faugus-launcher \
       --replace-fail "/usr/bin/python3" "${python3Packages.python.interpreter}"
 
-    substituteInPlace faugus/launcher.py \
-      --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \
-      --replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
-      --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
-
-    substituteInPlace faugus/runner.py \
+    substituteInPlace faugus/path_manager.py \
       --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'"
 
-    substituteInPlace faugus/shortcut.py \
+    substituteInPlace faugus/launcher.py faugus/shortcut.py \
       --replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
       --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
   '';
diff --git a/pkgs/by-name/fc/fcitx5-chewing/package.nix b/pkgs/by-name/fc/fcitx5-chewing/package.nix
index f1f53547f01e..613fd355c34b 100644
--- a/pkgs/by-name/fc/fcitx5-chewing/package.nix
+++ b/pkgs/by-name/fc/fcitx5-chewing/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chewing";
-  version = "5.1.11";
+  version = "5.1.12";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-zOaXQUIW9+kOae2hajtnKLNmtlhZLuFAb+nts9gmivQ=";
+    hash = "sha256-WBCaknT1woPRmnxQP8WhJUodM5jTXYg3QP6trFw37gg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fc/fcitx5-hangul/package.nix b/pkgs/by-name/fc/fcitx5-hangul/package.nix
index 47dcd7b3e634..3e88529b78c0 100644
--- a/pkgs/by-name/fc/fcitx5-hangul/package.nix
+++ b/pkgs/by-name/fc/fcitx5-hangul/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-hangul";
-  version = "5.1.9";
+  version = "5.1.10";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-zxq/nINxLvhZCcndNyAUAOY74npFXcYUR78TlZVyRUk=";
+    hash = "sha256-ZeBTJ9SllLSVHt7kJOQL+q2SGjQkyYqD5SCXWj1QojE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/finamp/git-hashes.json b/pkgs/by-name/fi/finamp/git-hashes.json
index 6f0c48bd26a5..92a0e823d671 100644
--- a/pkgs/by-name/fi/finamp/git-hashes.json
+++ b/pkgs/by-name/fi/finamp/git-hashes.json
@@ -1,13 +1,14 @@
 {
   "balanced_text": "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=",
+  "flutter_carplay": "sha256-0lewLQFVx+0rW2aAxWSePz/9bhNmb/mWt4RBJ++BCuM=",
   "flutter_user_certificates_android": "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=",
   "isar": "sha256-Wg1m/HM7UnK+aC1DOyY41Bo4HuLrEaAxCtQw12ZrnN0=",
-  "isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=",
+  "isar_flutter_libs": "sha256-abfMKRRVJgrG5orGvXJbIJNTx8Fx0XTlvZZ9W+LcsP0=",
   "isar_generator": "sha256-fM8ygT6il7TdjmeTdmk8o4exc3Z/F1tYF878eoDK37E=",
   "just_audio": "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=",
-  "just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=",
+  "just_audio_media_kit": "sha256-ZdSX86xeqXZZrdHpdg8W240qtSnUTfZLN9XrM05rVTI=",
   "media_kit_libs_windows_audio": "sha256-XAObjn7wcN4qA7MW+hKqjNZv/L2Ec8t/cTF+d2ZoZ+k=",
   "palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=",
   "smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=",
   "split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="
-}
\ No newline at end of file
+}
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 4e2a80b5b16d..12c011f06952 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -15,7 +15,7 @@
   dart,
 }:
 let
-  version = "0.9.23-beta";
+  version = "0.9.24-beta";
 in
 flutter341.buildFlutterApplication {
   inherit version;
@@ -24,7 +24,7 @@ flutter341.buildFlutterApplication {
     owner = "UnicornsOnLSD";
     repo = "finamp";
     rev = version;
-    hash = "sha256-N1+6rB16geFMYMbfiF7eppnXfXC/pqv90I9aY/57lKI=";
+    hash = "sha256-o7q7Yr47maTrt4CG3PiV9Fdhy77ToboVdd8olZFfFts=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json
index 1a20e4851435..2c51383c3bf6 100644
--- a/pkgs/by-name/fi/finamp/pubspec.lock.json
+++ b/pkgs/by-name/fi/finamp/pubspec.lock.json
@@ -84,21 +84,21 @@
       "dependency": "direct main",
       "description": {
         "name": "app_set_id",
-        "sha256": "bdc50b3da4b3db791e7a24bfca46f7f791dda318c096a3b62481ea2110a24847",
+        "sha256": "fe20e185b907e75f9c06f42423db816d3bec64973f10be0034d5bc6703e015cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "archive": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.7"
+      "version": "4.0.9"
     },
     "args": {
       "dependency": "transitive",
@@ -114,11 +114,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "audio_service": {
       "dependency": "direct main",
@@ -134,11 +134,11 @@
       "dependency": "direct main",
       "description": {
         "name": "audio_service_mpris",
-        "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08",
+        "sha256": "8cb2ff2237f4cd2fd27f16451ed35b3aedc12df8a384435327c67a9f4d557ef4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "audio_service_platform_interface": {
       "dependency": "direct main",
@@ -164,11 +164,11 @@
       "dependency": "direct main",
       "description": {
         "name": "audio_session",
-        "sha256": "8f96a7fecbb718cb093070f868b4cdcb8a9b1053dce342ff8ab2fde10eb9afb7",
+        "sha256": "7217b229db57cc4dc577a8abb56b7429a5a212b978517a5be578704bfe5e568b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.2"
+      "version": "0.2.3"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -184,11 +184,11 @@
       "dependency": "direct main",
       "description": {
         "name": "background_downloader",
-        "sha256": "a3b340e42bc45598918944e378dc6a05877e587fcd0e1b8d2ea26339de87bdf9",
+        "sha256": "aceacec2b2a72ec3a8862ab5895fcbbc71ab33765f3619d57963f3110dd268e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.0"
+      "version": "9.5.5"
     },
     "balanced_text": {
       "dependency": "direct main",
@@ -325,11 +325,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139",
+        "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.1"
+      "version": "8.12.6"
     },
     "characters": {
       "dependency": "transitive",
@@ -355,11 +355,11 @@
       "dependency": "direct main",
       "description": {
         "name": "chopper",
-        "sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45",
+        "sha256": "2e7535c174752c6b051e18baa6f9a7dcaa13fc2159f77b755ab58b5537a8545c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.4.0"
+      "version": "8.6.0"
     },
     "chopper_generator": {
       "dependency": "direct dev",
@@ -411,15 +411,25 @@
       "source": "hosted",
       "version": "1.1.2"
     },
+    "code_assets": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_assets",
+        "sha256": "bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
+        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.11.0"
+      "version": "4.11.1"
     },
     "collection": {
       "dependency": "direct main",
@@ -445,21 +455,21 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
+        "sha256": "62ffa266d9a23b79fb3fcbc206afc00bb979417ba57b1324c546b5aab95ba057",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.1.1"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "connectivity_plus_platform_interface",
-        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.0"
     },
     "console": {
       "dependency": "transitive",
@@ -485,11 +495,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cross_file",
-        "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608",
+        "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.5+1"
+      "version": "0.3.5+2"
     },
     "crypto": {
       "dependency": "transitive",
@@ -575,21 +585,21 @@
       "dependency": "direct main",
       "description": {
         "name": "dbus",
-        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
+        "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.11"
+      "version": "0.7.12"
     },
     "device_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
+        "sha256": "b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.3.0"
+      "version": "12.4.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -601,6 +611,16 @@
       "source": "hosted",
       "version": "7.0.3"
     },
+    "diacritic": {
+      "dependency": "direct main",
+      "description": {
+        "name": "diacritic",
+        "sha256": "12981945ec38931748836cd76f2b38773118d0baef3c68404bdfde9566147876",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.6"
+    },
     "dynamic_color": {
       "dependency": "direct main",
       "description": {
@@ -615,11 +635,11 @@
       "dependency": "transitive",
       "description": {
         "name": "equatable",
-        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
+        "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.7"
+      "version": "2.0.8"
     },
     "fading_edge_scrollview": {
       "dependency": "transitive",
@@ -645,11 +665,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "file": {
       "dependency": "direct main",
@@ -665,11 +685,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200",
+        "sha256": "f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.7"
+      "version": "11.0.2"
     },
     "file_sizes": {
       "dependency": "direct main",
@@ -695,21 +715,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "f5b0b53d4ae0d59b1e28dfc21d5398e5028cf8e764518e491a52fd050aa23881",
+        "sha256": "a0979dd61f21b634717b98eb4ceaed2bfe009fe020ce8597aaf164b9eeb57aaa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.7.2"
+      "version": "3.8.0"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
       "description": {
         "name": "flex_seed_scheme",
-        "sha256": "828291a5a4d4283590541519d8b57821946660ac61d2e07d955f81cfcab22e5d",
+        "sha256": "a3183753bbcfc3af106224bff3ab3e1844b73f58062136b7499919f49f3667e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -737,6 +757,17 @@
       "source": "hosted",
       "version": "3.4.1"
     },
+    "flutter_carplay": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "017ce2e",
+        "resolved-ref": "017ce2e19711d3e043ed86ade25f941f96ebb7ba",
+        "url": "https://github.com/oguzhnatly/flutter_carplay.git"
+      },
+      "source": "git",
+      "version": "1.2.11"
+    },
     "flutter_discord_rpc": {
       "dependency": "direct main",
       "description": {
@@ -747,25 +778,31 @@
       "source": "hosted",
       "version": "1.1.0"
     },
+    "flutter_driver": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
     "flutter_gen_core": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_gen_core",
-        "sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311",
+        "sha256": "22b3198a4cb1255841a3662b41adad35d36d9037fcd9d129858240030417e0b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0+1"
     },
     "flutter_gen_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_gen_runner",
-        "sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29",
+        "sha256": "83fd55f5472a955725c5912819847e9770c4f295cd0ae4bdd26d99853f8a6546",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.13.0+1"
     },
     "flutter_launcher_icons": {
       "dependency": "direct dev",
@@ -807,11 +844,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.35"
     },
     "flutter_riverpod": {
       "dependency": "direct main",
@@ -824,7 +861,7 @@
       "version": "2.6.1"
     },
     "flutter_rust_bridge": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "flutter_rust_bridge",
         "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e",
@@ -857,11 +894,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95",
+        "sha256": "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.3.0"
     },
     "flutter_tabler_icons": {
       "dependency": "direct main",
@@ -936,15 +973,21 @@
       "source": "hosted",
       "version": "4.0.0"
     },
+    "fuchsia_remote_debug_protocol": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
     "gaimon": {
       "dependency": "direct main",
       "description": {
         "name": "gaimon",
-        "sha256": "fca9d9bef76604a4d3ad5d212a349406c68f78ed01172f40bebcbd5b4f55087a",
+        "sha256": "2024da7b9642dc295ad7bcc69ff0be4ba4b0c9ab4134338ae95c3bd58dd16fb0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.3"
     },
     "get_it": {
       "dependency": "direct main",
@@ -980,11 +1023,11 @@
       "dependency": "transitive",
       "description": {
         "name": "gtk",
-        "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
+        "sha256": "4ff85b2a16724029dd9e5bbb5a94b6918f9973f74ba571c949d2002801879cf5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "hashcodes": {
       "dependency": "transitive",
@@ -1000,21 +1043,21 @@
       "dependency": "direct main",
       "description": {
         "name": "hive_ce",
-        "sha256": "81d39a03c4c0ba5938260a8c3547d2e71af59defecea21793d57fc3551f0d230",
+        "sha256": "8e9980e68643afb1e765d3af32b47996552a64e190d03faf622cea07c1294418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.15.1"
+      "version": "2.19.3"
     },
     "hive_ce_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "hive_ce_flutter",
-        "sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a",
+        "sha256": "2677e95a333ff15af43ccd06af7eb7abbf1a4f154ea071997f3de4346cae913a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.3.4"
     },
     "hive_ce_generator": {
       "dependency": "direct dev",
@@ -1026,15 +1069,25 @@
       "source": "hosted",
       "version": "1.9.2"
     },
+    "hooks": {
+      "dependency": "transitive",
+      "description": {
+        "name": "hooks",
+        "sha256": "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
     "hotreloader": {
       "dependency": "transitive",
       "description": {
         "name": "hotreloader",
-        "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b",
+        "sha256": "66871df468fc24eee81f1a0a7cb98acc104716f9b7376d355437b48d633c4ebf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.4.0"
     },
     "html": {
       "dependency": "transitive",
@@ -1080,11 +1133,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.4"
+      "version": "4.8.0"
     },
     "image_size_getter": {
       "dependency": "transitive",
@@ -1100,11 +1153,17 @@
       "dependency": "direct main",
       "description": {
         "name": "infinite_scroll_pagination",
-        "sha256": "4047eb8191e8b33573690922a9e995af64c3949dc87efc844f936b039ea279df",
+        "sha256": "b0d28e37cd8f62490ff6aef63f9db93d4c78b7f11b7c6b26f33c69d8476fda78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "5.1.1"
+    },
+    "integration_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
     },
     "intl": {
       "dependency": "direct main",
@@ -1141,9 +1200,9 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
-        "resolved-ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
-        "url": "https://github.com/MrLittleWhite/isar_flutter_libs.git"
+        "ref": "21c20862e94bb33fca9e9c14b5ca72fc41307f4b",
+        "resolved-ref": "21c20862e94bb33fca9e9c14b5ca72fc41307f4b",
+        "url": "https://github.com/Komodo5197/isar_flutter_libs.git"
       },
       "source": "git",
       "version": "3.1.0+1"
@@ -1163,11 +1222,31 @@
       "dependency": "transitive",
       "description": {
         "name": "isolate_channel",
-        "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
+        "sha256": "a9d3d620695bc984244dafae00b95e4319d6974b2d77f4b9e1eb4f2efe099094",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.2+1"
+      "version": "0.6.1"
+    },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
     },
     "js": {
       "dependency": "transitive",
@@ -1215,7 +1294,7 @@
       "description": {
         "path": ".",
         "ref": "feat/queue-shuffle",
-        "resolved-ref": "f5237393a63da702426e4e20c6800b706a0b159f",
+        "resolved-ref": "5af56479c5a34d9ad9fcf2d94cc4e00b7f4ddace",
         "url": "https://github.com/Komodo5197/just_audio_media_kit.git"
       },
       "source": "git",
@@ -1275,11 +1354,11 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
+        "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.0"
     },
     "locale_names": {
       "dependency": "direct main",
@@ -1325,11 +1404,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.18"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1376,11 +1455,11 @@
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.17.0"
+      "version": "1.18.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1422,6 +1501,16 @@
       "source": "hosted",
       "version": "0.5.0"
     },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.4.1"
+    },
     "octo_image": {
       "dependency": "direct main",
       "description": {
@@ -1446,11 +1535,11 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
+        "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "9.0.1"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1507,21 +1596,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.3.1"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4",
+        "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.1"
+      "version": "2.6.0"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1534,7 +1623,7 @@
       "version": "2.2.1"
     },
     "path_provider_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "path_provider_platform_interface",
         "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
@@ -1557,11 +1646,11 @@
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
+        "sha256": "fe54465bcc62a4564c6e4db337bbaded6c0c0fa6e10487414436d163114784f6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "12.0.3"
     },
     "permission_handler_android": {
       "dependency": "transitive",
@@ -1577,11 +1666,11 @@
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_apple",
-        "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023",
+        "sha256": "e20daf680eef1ca62ffe8c8c526b778cc386d50137c77ac71c8ec9c88c13fb9d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.7"
+      "version": "9.4.9"
     },
     "permission_handler_html": {
       "dependency": "transitive",
@@ -1617,11 +1706,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.2"
     },
     "platform": {
       "dependency": "transitive",
@@ -1657,11 +1746,21 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.3"
+      "version": "6.5.0"
+    },
+    "process": {
+      "dependency": "transitive",
+      "description": {
+        "name": "process",
+        "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.0.5"
     },
     "progress_border": {
       "dependency": "direct main",
@@ -1707,11 +1806,21 @@
       "dependency": "transitive",
       "description": {
         "name": "qs_dart",
-        "sha256": "27da57e8b394163f96b74bccb6eb6115bfd2585de4b9ad6241bdf1a9797ab54f",
+        "sha256": "2758b3012c92fa1335b3867d89f5debaf33c71fa5fd086ab67e625f674ef0d10",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.6.0"
+      "version": "1.7.5"
+    },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
     },
     "riverpod": {
       "dependency": "transitive",
@@ -1777,11 +1886,11 @@
       "dependency": "transitive",
       "description": {
         "name": "safe_local_storage",
-        "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
+        "sha256": "287ea1f667c0b93cdc127dccc707158e2d81ee59fba0459c31a0c7da4d09c755",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.0.3"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1847,11 +1956,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
+        "sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "12.0.2"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1867,21 +1976,21 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.5"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc",
+        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.18"
+      "version": "2.4.23"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1907,11 +2016,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "shared_preferences_web": {
       "dependency": "transitive",
@@ -2014,11 +2123,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.1"
+      "version": "1.10.2"
     },
     "split_view": {
       "dependency": "direct main",
@@ -2035,31 +2144,31 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite",
-        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
+        "sha256": "564cfed0746fe53140c23b70b308e045c3b31f17778f2f326ccb7d804ea0250a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.2+1"
     },
     "sqflite_android": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_android",
-        "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88",
+        "sha256": "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2+2"
+      "version": "2.4.2+3"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
+        "sha256": "1581ffbf7a0e333b380d6a30737d78516b826cb35beb7fb0bf8a3ea0c678b465",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.6"
+      "version": "2.5.8"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -2131,15 +2240,25 @@
       "source": "hosted",
       "version": "1.4.1"
     },
+    "sync_http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sync_http",
+        "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.1"
+    },
     "synchronized": {
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
+        "sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.4.0+1"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -2155,31 +2274,31 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.9"
+      "version": "0.7.11"
     },
     "threshold": {
       "dependency": "transitive",
       "description": {
         "name": "threshold",
-        "sha256": "0a1585947eb84bfbe7ca6a6598c9075d3d71fe969e81668cd6d2122be664fd39",
+        "sha256": "33bdf79425c89d65f1dc32bec10328de8e89451946611c1e04b08ed28d647b85",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "1.0.6"
     },
     "time": {
       "dependency": "transitive",
       "description": {
         "name": "time",
-        "sha256": "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461",
+        "sha256": "46187cf30bffdab28c56be9a63861b36e4ab7347bf403297595d6a97e10c789f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.1.6"
     },
     "timing": {
       "dependency": "transitive",
@@ -2255,21 +2374,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "17bc677f0b301615530dd1d67e0a9828cafa2d0b6b6eae4cd3679b7eac4a273c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.30"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.6"
+      "version": "6.4.1"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2305,11 +2424,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2325,11 +2444,11 @@
       "dependency": "direct main",
       "description": {
         "name": "uuid",
-        "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.2"
+      "version": "4.5.3"
     },
     "value_layout_builder": {
       "dependency": "transitive",
@@ -2345,11 +2464,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
+        "sha256": "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.2.2"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -2365,11 +2484,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
+        "sha256": "7ee12e6dffe0fc8e755179d6d91b3b34f5924223fc104d85572ef9180d73d172",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.2.5"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -2395,51 +2514,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.2.0"
     },
     "wakelock_plus": {
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
+        "sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.2"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
+        "sha256": "b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.5.1"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.4"
-    },
-    "weak_map": {
-      "dependency": "transitive",
-      "description": {
-        "name": "weak_map",
-        "sha256": "5f8e5d5ce57dc624db5fae814dd689ccae1f17f92b426e52f0a7cbe7f6f4ab97",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.1"
+      "version": "1.2.1"
     },
     "web": {
       "dependency": "transitive",
@@ -2471,6 +2580,16 @@
       "source": "hosted",
       "version": "3.0.3"
     },
+    "webdriver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webdriver",
+        "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.0"
+    },
     "win32": {
       "dependency": "transitive",
       "description": {
@@ -2553,7 +2672,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.9.0 <4.0.0",
-    "flutter": ">=3.35.0"
+    "dart": ">=3.11.0 <4.0.0",
+    "flutter": ">=3.41.0"
   }
 }
diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix
index 28a72e4b8a3b..9154a2b3b412 100644
--- a/pkgs/by-name/fi/fish-lsp/package.nix
+++ b/pkgs/by-name/fi/fish-lsp/package.nix
@@ -16,18 +16,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish-lsp";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "ndonfris";
     repo = "fish-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G0RaDXn3UNkdrlnjNH75ftvcLgAuiY09aXY3MXjaLEE=";
+    hash = "sha256-kPGbEi0KCq/BsEq2RkFb5zfARncMIvXHniOUglNYk1s=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-uLrdja3G/OwHZXkQbKXsPmGRIs08b3sCPtxtP1a52fg=";
+    hash = "sha256-WrH56oWTTDG1P/OHC5WjLCkZM3j6HEirAvhF+6Xd76I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gc/gcan/package.nix b/pkgs/by-name/gc/gcan/package.nix
new file mode 100644
index 000000000000..ac9013c3d4b2
--- /dev/null
+++ b/pkgs/by-name/gc/gcan/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gcan";
+  version = "1.1.1";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "applicative-systems";
+    repo = "gcan";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BZfdc3ddAa9CPC3GOH9G3QJbECbSRY7ymzIMtYl076M=";
+  };
+
+  cargoHash = "sha256-5oE69FYTAV6JiTAN4A79+ndI0vHrbAi1JeEJcD+eY2c=";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "Analyze, filter, and prune Nix GC roots";
+    homepage = "https://github.com/applicative-systems/gcan";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.tfc ];
+    mainProgram = "gcan";
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix
index 360988c2c887..7fefe400072e 100644
--- a/pkgs/by-name/ge/gelly/package.nix
+++ b/pkgs/by-name/ge/gelly/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gelly";
-  version = "1.4.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "Fingel";
     repo = "gelly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3RXAipo8QzRu8OVJqrh2AHVXgvgbEYC7GJ4ho4rbNnI=";
+    hash = "sha256-yAbItAKzvn2mxNPqg+iuiI5GvFAYXw1721DaVzS0axI=";
   };
 
-  cargoHash = "sha256-yiW0neFnNPb9go7Yef+DLoUCZ32E3DLe1a0onbte+Xc=";
+  cargoHash = "sha256-nKWpawdvBdu57O/Fs+cumrfbYrPUouD3uL0YKWOZY+I=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index 474891dd0fd6..99b5c929c083 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.30.1";
+  version = "1.30.2";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-eccHFngmP0uUsbtlFSIT1agRMx3OCNyqPMHG8/mj5P8=";
+    hash = "sha256-z3eBORwrccIgTijdHcK7en4DvRY0fE3807Amn0MCuA8=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
diff --git a/pkgs/by-name/gh/ghr-cli/package.nix b/pkgs/by-name/gh/ghr-cli/package.nix
index 67d0ae0a7b34..e66d4997aa64 100644
--- a/pkgs/by-name/gh/ghr-cli/package.nix
+++ b/pkgs/by-name/gh/ghr-cli/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ghr-cli";
-  version = "0.8.1";
+  version = "0.8.2";
 
   __structuredAttrs = true;
 
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "chenyukang";
     repo = "ghr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lo8a5EhLslqjnUG/xM8XFU1x1Eam47lFD8KRMzuCSD4=";
+    hash = "sha256-ELYWoGUP6s2Trtnk9zgDLlT7MtaiHzfsFbzH+LmsKDE=";
   };
 
-  cargoHash = "sha256-PtnQVdW9yC2309047PFt/HXV1QyqNttZ0zJ8hocLRAo=";
+  cargoHash = "sha256-siMxS08K+7L8f9A32gEWwQF9PAQh5UPMA+xTkTlz13o=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix
index 24eb0d7f5cd5..b492fb0775e1 100644
--- a/pkgs/by-name/go/golds/package.nix
+++ b/pkgs/by-name/go/golds/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "golds";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "go101";
     repo = "golds";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s4vzQ+ntty1XLe65sEBxxN+Amp162k40LmJ7AT2/26U=";
+    hash = "sha256-Jt0Q6Ie1HSqRs4+zlmNOXlSMXfWu0nSIOjglduq4FUE=";
   };
 
   # nixpkgs is not using the go distpack archive and missing a VERSION file in the source
diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
index c48f30f86fa1..151889764c33 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.nix
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix
@@ -6,19 +6,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafana-image-renderer";
-  version = "5.7.3";
+  version = "5.8.11";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CrJkBx2BMGlFtqXR174A5CVTH2GIZHTVxxwJjCi68pg=";
+    hash = "sha256-qNi268XHyKQ2kvT24ovhzUEREaYMXWlGHfcuyRHjRYQ=";
   };
 
-  vendorHash = "sha256-3nd0m0PltTiJX5e1tbQ7LSgUmDRXC8nRktOVAIgHOCU=";
+  vendorHash = "sha256-QiseTdsFOBg3aDYpdmLHfXL9eFll6iJo4wSKwXvdGnM=";
 
   postPatch = ''
-    substituteInPlace go.mod --replace-fail 'go 1.26.1' 'go 1.25.7'
+    substituteInPlace go.mod --replace-fail 'go 1.26.4' 'go 1.26.3'
   '';
 
   subPackages = [ "." ];
diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index ecab9982f281..fcd242aaf754 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -11,16 +11,16 @@
 # it's updated.
 buildGo126Module (finalAttrs: {
   pname = "gtree";
-  version = "1.13.6";
+  version = "1.14.2";
 
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E3Nri8kFMh6NYp29vFFNAlJxdfOvLR1inbD+KALXZms=";
+    hash = "sha256-LMVXC22fTrPt4S5HkErMrpZwwanN5blY/TPUE8bg95s=";
   };
 
-  vendorHash = "sha256-Pkc2UV/77YdKm5ZWKCSKE0dljUzC5dw1f08T+3MvFTE=";
+  vendorHash = "sha256-Vd5VKKl79Qu5R7jOYS1CTtQuAis9vWUbpBWnEI7sgpk=";
 
   subPackages = [
     "cmd/gtree"
diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix
index db1dcc4c5618..77033747eb46 100644
--- a/pkgs/by-name/hi/hiredis/package.nix
+++ b/pkgs/by-name/hi/hiredis/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/redis/hiredis";
     description = "Minimalistic C client for Redis >= 1.2";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ hythera ];
     platforms = lib.platforms.all;
+    teams = [ lib.teams.redis ];
   };
 })
diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix
index cd0492506027..22358bf1783c 100644
--- a/pkgs/by-name/hy/hyperrogue/package.nix
+++ b/pkgs/by-name/hy/hyperrogue/package.nix
@@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.roguetemple.com/z/hyper/";
     changelog = "https://github.com/zenorogue/hyperrogue/releases/tag/v${finalAttrs.version}";
     mainProgram = "hyperrogue";
-    maintainers = with lib.maintainers; [ rardiol ];
+    maintainers = [ ];
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index bc563ca95895..7b9f98853290 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -98,6 +98,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_NLOHMANN_JSON" true)
     (lib.cmakeBool "USE_SYSTEM_YARA" true)
     (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "@executable_path/../Frameworks")
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
@@ -122,10 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
       ''
         mkdir -p $out/Applications
         mv $out/imhex.app $out/Applications
-        install_name_tool \
-          -change "$out/lib/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \
-          "@executable_path/../Frameworks/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \
-          "$out/Applications/imhex.app/Contents/MacOS/imhex"
         makeWrapper "$out/Applications/imhex.app/Contents/MacOS/imhex" "$out/bin/imhex"
       ''
     else
diff --git a/pkgs/by-name/jo/jonquil/package.nix b/pkgs/by-name/jo/jonquil/package.nix
index 5434e3fa091f..2792576f817b 100644
--- a/pkgs/by-name/jo/jonquil/package.nix
+++ b/pkgs/by-name/jo/jonquil/package.nix
@@ -21,13 +21,13 @@ assert (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jonquil";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "toml-f";
     repo = "jonquil";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2JCTHA0nyA7xE0IA+LNrEAulHU2eIbNRvFGQ7YSQMRE=";
+    hash = "sha256-xKL3EWZaHdMAuUK7pL2vjfRk8Fq2uNL65TrGUyFQ5cc=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix
index eb9ea1b0f1b1..54d294178e08 100644
--- a/pkgs/by-name/ju/just-lsp/package.nix
+++ b/pkgs/by-name/ju/just-lsp/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "just-lsp";
-  version = "0.4.6";
+  version = "0.4.7";
 
   __structuredAttrs = true;
 
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "terror";
     repo = "just-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-x58iZ1TSwMZSPQsxlXeMgBxBMezCLJkbGFMWE4gV2PE=";
+    hash = "sha256-Z35pRJDDUdyjz9Tw66wgBYjYicJCO87EI/J3Nux8udE=";
   };
 
-  cargoHash = "sha256-XSXzCTbacnxuK9rjuRhnNu9uglK+H1Ixfm00A+6O5MM=";
+  cargoHash = "sha256-qAeUk+1WmQ5TPdfJcoM+mrFVOfhhdVZnyBhxfzyh1Tc=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/ka/kanban/package.nix b/pkgs/by-name/ka/kanban/package.nix
index e1f27b49d744..f5e519993705 100644
--- a/pkgs/by-name/ka/kanban/package.nix
+++ b/pkgs/by-name/ka/kanban/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kanban";
-  version = "0.6.0";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "fulsomenko";
     repo = "kanban";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6L+f4+A9mRZch7/D1koCMHrkciusKcoZhYJICEDU4b8=";
+    hash = "sha256-4wvSVnVck3AJ4pv6whxFiwsmoWl4f5Q0a2lSFeMGdZs=";
   };
 
   env.GIT_COMMIT_HASH = finalAttrs.src.rev;
 
-  cargoHash = "sha256-NMFZW+LC5YYqbXCmgbmUyAx8O+M7o1TKigOC978k0/o=";
+  cargoHash = "sha256-Qmma0UkuuAhnD3zUUS5iCX2rUGvtO6U5zNFpg3Din7U=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix
index b8c91741953b..553d15b0b285 100644
--- a/pkgs/by-name/lc/lcevcdec/package.nix
+++ b/pkgs/by-name/lc/lcevcdec/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lcevcdec";
-  version = "4.1.0";
+  version = "4.2.0";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "v-novaltd";
     repo = "LCEVCdec";
     tag = finalAttrs.version;
-    hash = "sha256-QzejWq0XGPLu+YVNetfbzczNuZ6Gp5QJP5G2RZUan6M=";
+    hash = "sha256-EVp+ucydbBWlMMXbldkwDEbFlM88UIts8f/PspIqqSY=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/liberal-crime-squad/package.nix b/pkgs/by-name/li/liberal-crime-squad/package.nix
index a3812708c1b3..f8a2ca4420a2 100644
--- a/pkgs/by-name/li/liberal-crime-squad/package.nix
+++ b/pkgs/by-name/li/liberal-crime-squad/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       Welcome to Liberal Crime Squad! The Conservatives have taken the Executive, Legislative, and Judicial branches of government. Over time, the Liberal laws of this nation will erode and turn the country into a BACKWOODS YET CORPORATE NIGHTMARE. To prevent this from happening, the Liberal Crime Squad was established. The mood of the country is shifting, and we need to turn things around. Go out on the streets and indoctrinate Conservative automatons. That is, let them see their True Liberal Nature. Then arm them and send them forth to Stop Evil.
     '';
     homepage = "https://github.com/Kamal-Sadek/Liberal-Crime-Squad";
-    maintainers = [ lib.maintainers.rardiol ];
+    maintainers = [ ];
     mainProgram = "crimesquad";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/li/libtree/package.nix b/pkgs/by-name/li/libtree/package.nix
index 6ad5681d5ddf..2ad002f43cd2 100644
--- a/pkgs/by-name/li/libtree/package.nix
+++ b/pkgs/by-name/li/libtree/package.nix
@@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       prusnak
-      rardiol
     ];
   };
 })
diff --git a/pkgs/by-name/li/libwmf/package.nix b/pkgs/by-name/li/libwmf/package.nix
index 76872bf26404..4ca132dbddaf 100644
--- a/pkgs/by-name/li/libwmf/package.nix
+++ b/pkgs/by-name/li/libwmf/package.nix
@@ -2,7 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  autoreconfHook,
   pkg-config,
+  expat,
   freetype,
   glib,
   imagemagick,
@@ -14,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libwmf";
-  version = "0.2.13";
+  version = "0.2.15";
 
   outputs = [
     "out"
@@ -24,11 +26,15 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "caolanm";
     repo = "libwmf";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Bpxr04dQ6EjX1FBVF4KcbJQvUjsPK6L03xLIXG6F2FI=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
   buildInputs = [
     zlib
     imagemagick
@@ -37,10 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libjpeg
     libxml2
+    expat
   ];
   enableParallelBuilding = true;
 
   meta = {
+    changelog = "https://github.com/caolanm/libwmf/blob/${finalAttrs.src.tag}/ChangeLog";
     description = "WMF library from wvWare";
     homepage = "https://wvware.sourceforge.net/libwmf.html";
     downloadPage = "https://github.com/caolanm/libwmf/releases";
diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix
index e9fcc3aefe8c..cd33b5355531 100644
--- a/pkgs/by-name/li/lima/source.nix
+++ b/pkgs/by-name/li/lima/source.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.1.2";
+  version = "2.1.3";
 in
 {
   inherit version;
@@ -13,7 +13,7 @@ in
     owner = "lima-vm";
     repo = "lima";
     tag = "v${version}";
-    hash = "sha256-WN0HsSnxLh8MiA9UQoYWnfp5fJyEc6w1XJaencZCsL4=";
+    hash = "sha256-7hr89PApcxi/qoYZK8xPuGbhG95RfiYjkyVvZYIflyw=";
   };
 
   vendorHash = "sha256-8AksUgle1SlWuALi553TlpZ2qwO+jMA1kZQke91fimU=";
diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix
index 022d2797a46a..2da809ad248d 100644
--- a/pkgs/by-name/ls/lstk/package.nix
+++ b/pkgs/by-name/ls/lstk/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lstk";
-  version = "0.11.0";
+  version = "0.13.0";
 
   __structuredAttrs = true;
 
@@ -15,10 +15,10 @@ buildGoModule (finalAttrs: {
     owner = "localstack";
     repo = "lstk";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-2PViyzcJ2AGigfxLwQ5FnULV4zF0FPQIr6nqg5d90S4=";
+    sha256 = "sha256-UF+ySjw3fdb9aTA/tRDmFR3EXYA7nvbuv/esT/3Rsv4=";
   };
 
-  vendorHash = "sha256-y/QlgdYS4IeU9Xf/2trHRvjB5QOHDbFDrF57y9B6jxI=";
+  vendorHash = "sha256-zKEUGn9eKYdxSinS+NXc7PrgZkrQRZnIxTNH3yNL4GE=";
 
   excludedPackages = "test/integration";
 
diff --git a/pkgs/by-name/lx/lxmf-rs/package.nix b/pkgs/by-name/lx/lxmf-rs/package.nix
index 584938ee875a..f528141e83a7 100644
--- a/pkgs/by-name/lx/lxmf-rs/package.nix
+++ b/pkgs/by-name/lx/lxmf-rs/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lxmf-rs";
-  version = "0.4.1";
+  version = "0.5.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "FreeTAKTeam";
     repo = "LXMF-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GCN4HpqbCM2xCBpBRpUALmHGfhOm1qZScdYgBqJqLQU=";
+    hash = "sha256-9yTteJCH/5/LGvp6AH74oKYcnue1NetD7DG3fMz+D2Y=";
   };
 
   cargoHash = "sha256-a6O1VslizDom6AuJKF5xZgKNSgrw1EfvJRWpG9J7Le8=";
diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mangowc/package.nix
index 73d105379d7a..b691f96d8ed0 100644
--- a/pkgs/by-name/ma/mangowc/package.nix
+++ b/pkgs/by-name/ma/mangowc/package.nix
@@ -1,4 +1,5 @@
 {
+  cjson,
   lib,
   libx11,
   libinput,
@@ -23,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangowc";
-  version = "0.12.8";
+  version = "0.14.4";
 
   src = fetchFromGitHub {
     owner = "mangowm";
     repo = "mango";
     tag = finalAttrs.version;
-    hash = "sha256-k9qFn9I+eeAq1kBfw6QRLRMDb6sIV+pgd5zpKNoc1ck=";
+    hash = "sha256-WfQNALT+8ZbjZG2co1tz2dZZZw1tcU5ynuFe+vVMbV0=";
   };
 
   nativeBuildInputs = [
@@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    cjson
     libinput
     libxcb
     libxkbcommon
@@ -72,7 +74,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Lightweight and feature-rich Wayland compositor based on dwl";
     homepage = "https://mangowm.github.io";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ hustlerone ];
+    maintainers = with lib.maintainers; [
+      hustlerone
+      yvnth
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix
index 3473b3dbaa7e..abf2cd1a8509 100644
--- a/pkgs/by-name/mc/mctc-lib/package.nix
+++ b/pkgs/by-name/mc/mctc-lib/package.nix
@@ -50,7 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional (buildType == "cmake") cmake;
 
-  buildInputs = [
+  propagatedBuildInputs = [
+    # jonquil (and the toml-f it propagates) appears in mctc-lib.pc's Requires.private, so it must
+    # be propagated for pkg-config consumers (e.g. dftd4) to resolve mctc-lib
     jonquil
   ];
 
diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix
index 4af517778434..f1c67bfb0d54 100644
--- a/pkgs/by-name/me/memtier-benchmark/package.nix
+++ b/pkgs/by-name/me/memtier-benchmark/package.nix
@@ -37,10 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/redis/memtier_benchmark";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      thoughtpolice
-      hythera
-    ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
     mainProgram = "memtier_benchmark";
+    teams = [ lib.teams.redis ];
   };
 })
diff --git a/pkgs/by-name/me/meshcentral/optionalDependencies.patch b/pkgs/by-name/me/meshcentral/optionalDependencies.patch
index 09ad09fdfdb3..a1e393979d70 100644
--- a/pkgs/by-name/me/meshcentral/optionalDependencies.patch
+++ b/pkgs/by-name/me/meshcentral/optionalDependencies.patch
@@ -1,36 +1,36 @@
-From 2036fde7f3e47d3268acdbe4f9c9bc7453d100da Mon Sep 17 00:00:00 2001
+From b4628a6a19629bfdff70d92dfaf0792e3b658ad6 Mon Sep 17 00:00:00 2001
 From: Maximilian Bosch <maximilian@mbosch.me>
 Date: Sat, 25 Apr 2026 15:29:21 +0200
 Subject: [PATCH] Add optional deps
 
 ---
- package-lock.json | 18249 +++++++++++++++++++++++++++++++++++++++-----
+ package-lock.json | 17442 +++++++++++++++++++++++++++++++++++++++-----
  package.json      |    59 +
- 2 files changed, 16601 insertions(+), 1707 deletions(-)
+ 2 files changed, 15866 insertions(+), 1635 deletions(-)
 
 diff --git a/package-lock.json b/package-lock.json
-index 2af3a0d1..5c5f4b73 100644
+index c1334f60..7855a902 100644
 --- a/package-lock.json
 +++ b/package-lock.json
 @@ -1,12 +1,12 @@
  {
    "name": "meshcentral",
--  "version": "1.1.58",
-+  "version": "1.1.59",
+-  "version": "1.1.59",
++  "version": "1.2.0",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
      "": {
        "name": "meshcentral",
--      "version": "1.1.58",
-+      "version": "1.1.59",
+-      "version": "1.1.59",
++      "version": "1.2.0",
        "license": "Apache-2.0",
        "dependencies": {
          "@seald-io/nedb": "4.1.2",
-@@ -33,2433 +33,16574 @@
+@@ -33,1309 +33,14255 @@
        },
        "engines": {
-         "node": ">=16.0.0"
+         "node": ">=20.0.0"
 +      },
 +      "optionalDependencies": {
 +        "@crowdsec/express-bouncer": "^0.1.0",
@@ -97,10 +97,10 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
 -      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
 -      "license": "ISC",
-+    "node_modules/@aws-crypto/sha256-browser": {
++    "node_modules/@aws-crypto/crc32": {
 +      "version": "5.2.0",
-+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
-+      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
++      "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
++      "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
@@ -110,27 +110,13 @@ index 2af3a0d1..5c5f4b73 100644
 -        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
 -        "wrap-ansi": "^8.1.0",
 -        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-+        "@aws-crypto/sha256-js": "^5.2.0",
-+        "@aws-crypto/supports-web-crypto": "^5.2.0",
 +        "@aws-crypto/util": "^5.2.0",
 +        "@aws-sdk/types": "^3.222.0",
-+        "@aws-sdk/util-locate-window": "^3.0.0",
-+        "@smithy/util-utf8": "^2.0.0",
-+        "tslib": "^2.6.2"
-+      }
-+    },
-+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
 +        "tslib": "^2.6.2"
        },
        "engines": {
 -        "node": ">=12"
-+        "node": ">=14.0.0"
++        "node": ">=16.0.0"
        }
      },
 -    "node_modules/@otplib/core": {
@@ -145,19 +131,21 @@ index 2af3a0d1..5c5f4b73 100644
 -      "integrity": "sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==",
 -      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
 -      "license": "MIT",
-+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
++    "node_modules/@aws-crypto/sha256-browser": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
++      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
 -        "@otplib/core": "^12.0.1"
-+        "@smithy/is-array-buffer": "^2.2.0",
++        "@aws-crypto/sha256-js": "^5.2.0",
++        "@aws-crypto/supports-web-crypto": "^5.2.0",
++        "@aws-crypto/util": "^5.2.0",
++        "@aws-sdk/types": "^3.222.0",
++        "@aws-sdk/util-locate-window": "^3.0.0",
++        "@smithy/util-utf8": "^2.0.0",
 +        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=14.0.0"
        }
      },
 -    "node_modules/@otplib/plugin-thirty-two": {
@@ -166,28 +154,6 @@ index 2af3a0d1..5c5f4b73 100644
 -      "integrity": "sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==",
 -      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
 -      "license": "MIT",
-+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "@otplib/core": "^12.0.1",
--        "thirty-two": "^1.0.2"
-+        "@smithy/util-buffer-from": "^2.2.0",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=14.0.0"
-       }
-     },
--    "node_modules/@otplib/preset-default": {
--      "version": "12.0.1",
--      "resolved": "https://registry.npmjs.org/@otplib/preset-default/-/preset-default-12.0.1.tgz",
--      "integrity": "sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==",
--      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
--      "license": "MIT",
 +    "node_modules/@aws-crypto/sha256-js": {
 +      "version": "5.2.0",
 +      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
@@ -196,8 +162,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true,
        "dependencies": {
 -        "@otplib/core": "^12.0.1",
--        "@otplib/plugin-crypto": "^12.0.1",
--        "@otplib/plugin-thirty-two": "^12.0.1"
+-        "thirty-two": "^1.0.2"
 +        "@aws-crypto/util": "^5.2.0",
 +        "@aws-sdk/types": "^3.222.0",
 +        "tslib": "^2.6.2"
@@ -206,10 +171,11 @@ index 2af3a0d1..5c5f4b73 100644
 +        "node": ">=16.0.0"
        }
      },
--    "node_modules/@otplib/preset-v11": {
+-    "node_modules/@otplib/preset-default": {
 -      "version": "12.0.1",
--      "resolved": "https://registry.npmjs.org/@otplib/preset-v11/-/preset-v11-12.0.1.tgz",
--      "integrity": "sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==",
+-      "resolved": "https://registry.npmjs.org/@otplib/preset-default/-/preset-default-12.0.1.tgz",
+-      "integrity": "sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==",
+-      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
 -      "license": "MIT",
 +    "node_modules/@aws-crypto/supports-web-crypto": {
 +      "version": "5.2.0",
@@ -224,25 +190,54 @@ index 2af3a0d1..5c5f4b73 100644
 +        "tslib": "^2.6.2"
        }
      },
--    "node_modules/@pkgjs/parseargs": {
--      "version": "0.11.0",
--      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
--      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+-    "node_modules/@otplib/preset-v11": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/@otplib/preset-v11/-/preset-v11-12.0.1.tgz",
+-      "integrity": "sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==",
 -      "license": "MIT",
 +    "node_modules/@aws-crypto/util": {
 +      "version": "5.2.0",
 +      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
 +      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
 +      "license": "Apache-2.0",
-       "optional": true,
--      "engines": {
--        "node": ">=14"
-+      "dependencies": {
++      "optional": true,
+       "dependencies": {
+-        "@otplib/core": "^12.0.1",
+-        "@otplib/plugin-crypto": "^12.0.1",
+-        "@otplib/plugin-thirty-two": "^12.0.1"
 +        "@aws-sdk/types": "^3.222.0",
 +        "@smithy/util-utf8": "^2.0.0",
 +        "tslib": "^2.6.2"
        }
      },
+-    "node_modules/@pkgjs/parseargs": {
+-      "version": "0.11.0",
+-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/client-cognito-identity": {
++      "version": "3.1072.0",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.1072.0.tgz",
++      "integrity": "sha512-V4Ic0hmxYlDiyMGArYoPL0EG6A4NHO6tlXC0oIfVJNAr/4uG9cbEMwcutrZkWVMU0QnxYk4iuOjUenF3wOGEBg==",
++      "license": "Apache-2.0",
+       "optional": true,
++      "dependencies": {
++        "@aws-crypto/sha256-browser": "5.2.0",
++        "@aws-crypto/sha256-js": "5.2.0",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/credential-provider-node": "^3.972.57",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/fetch-http-handler": "^5.4.6",
++        "@smithy/node-http-handler": "^4.7.6",
++        "@smithy/types": "^4.14.3",
++        "tslib": "^2.6.2"
++      },
+       "engines": {
+-        "node": ">=14"
++        "node": ">=20.0.0"
+       }
+     },
 -    "node_modules/@seald-io/binary-search-tree": {
 -      "version": "1.0.3",
 -      "resolved": "https://registry.npmjs.org/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz",
@@ -253,20 +248,27 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/@seald-io/nedb/-/nedb-4.1.2.tgz",
 -      "integrity": "sha512-bDr6TqjBVS2rDyYM9CPxAnotj5FuNL9NF8o7h7YyFXM7yruqT4ddr+PkSb2mJvvw991bqdftazkEo38gykvaww==",
 -      "license": "MIT",
-+    "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
++    "node_modules/@aws-sdk/core": {
++      "version": "3.974.22",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.22.tgz",
++      "integrity": "sha512-YofH63shc6YRdXjz80BJkpJW+Bkn0Cuu2dn4Rv7s9G2Idt58tgtzQEWxrR2xVljlVfIBeUjPuULnSVYLke3sUQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
 -        "@seald-io/binary-search-tree": "^1.0.3",
 -        "localforage": "^1.10.0",
 -        "util": "^0.12.5"
++        "@aws-sdk/types": "^3.973.13",
++        "@aws-sdk/xml-builder": "^3.972.30",
++        "@aws/lambda-invoke-store": "^0.2.2",
++        "@smithy/core": "^3.24.6",
++        "@smithy/signature-v4": "^5.4.6",
++        "@smithy/types": "^4.14.3",
++        "bowser": "^2.11.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
-+        "node": ">=14.0.0"
++        "node": ">=20.0.0"
        }
      },
 -    "node_modules/abort-controller": {
@@ -274,20 +276,23 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
 -      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
 -      "license": "MIT",
-+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
-+      "version": "2.2.0",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
++    "node_modules/@aws-sdk/credential-provider-cognito-identity": {
++      "version": "3.972.47",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.972.47.tgz",
++      "integrity": "sha512-IEW+q7yXgTT6+TFgJlOW+K5FK7kj1pBFW7oc04J/jlitMxq+vOJpmU42j+xaQlhwPx2JR805ryi73aLRWicXjQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
 -        "event-target-shim": "^5.0.0"
-+        "@smithy/is-array-buffer": "^2.2.0",
++        "@aws-sdk/nested-clients": "^3.997.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
        "engines": {
 -        "node": ">=6.5"
-+        "node": ">=14.0.0"
++        "node": ">=20.0.0"
        }
      },
 -    "node_modules/accepts": {
@@ -295,21 +300,24 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
 -      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
 -      "license": "MIT",
-+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
++    "node_modules/@aws-sdk/credential-provider-env": {
++      "version": "3.972.48",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.48.tgz",
++      "integrity": "sha512-h6FEC95fbexUd6zxm4PdgS82bTcI2PRtUb2ZwMipb/Xr8bPwtf0G8rBo2jp7NA24Mbx2JA8/WingiYpA9RCCyw==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
 -        "mime-types": "~2.1.34",
 -        "negotiator": "0.6.3"
-+        "@smithy/util-buffer-from": "^2.2.0",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
        "engines": {
 -        "node": ">= 0.6"
-+        "node": ">=14.0.0"
++        "node": ">=20.0.0"
        }
      },
 -    "node_modules/accepts/node_modules/negotiator": {
@@ -317,51 +325,19 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
 -      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
 -      "license": "MIT",
-+    "node_modules/@aws-sdk/client-cognito-identity": {
-+      "version": "3.1037.0",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.1037.0.tgz",
-+      "integrity": "sha512-/BQAyz98JRQFg3E8de3fGGydIYnsFRd6Cla4+zkviOe641fLCG0ZkPIk9D22HSi8qy9XKx+zk6ed2PcLO8uuPw==",
++    "node_modules/@aws-sdk/credential-provider-http": {
++      "version": "3.972.50",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.50.tgz",
++      "integrity": "sha512-lJO3OLpjvz5m/RSBQmsG/CEUGsvCy5ruxKwPQaOCqxqCMuyYT2BZwQUTDZVVwqQ9LrZKuK24JSa6r31hL/tvkg==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@aws-crypto/sha256-browser": "5.2.0",
-+        "@aws-crypto/sha256-js": "5.2.0",
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/credential-provider-node": "^3.972.36",
-+        "@aws-sdk/middleware-host-header": "^3.972.10",
-+        "@aws-sdk/middleware-logger": "^3.972.10",
-+        "@aws-sdk/middleware-recursion-detection": "^3.972.11",
-+        "@aws-sdk/middleware-user-agent": "^3.972.35",
-+        "@aws-sdk/region-config-resolver": "^3.972.13",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@aws-sdk/util-endpoints": "^3.996.8",
-+        "@aws-sdk/util-user-agent-browser": "^3.972.10",
-+        "@aws-sdk/util-user-agent-node": "^3.973.21",
-+        "@smithy/config-resolver": "^4.4.17",
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/fetch-http-handler": "^5.3.17",
-+        "@smithy/hash-node": "^4.2.14",
-+        "@smithy/invalid-dependency": "^4.2.14",
-+        "@smithy/middleware-content-length": "^4.2.14",
-+        "@smithy/middleware-endpoint": "^4.4.32",
-+        "@smithy/middleware-retry": "^4.5.5",
-+        "@smithy/middleware-serde": "^4.2.20",
-+        "@smithy/middleware-stack": "^4.2.14",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/node-http-handler": "^4.6.1",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/url-parser": "^4.2.14",
-+        "@smithy/util-base64": "^4.3.2",
-+        "@smithy/util-body-length-browser": "^4.2.2",
-+        "@smithy/util-body-length-node": "^4.2.3",
-+        "@smithy/util-defaults-mode-browser": "^4.3.49",
-+        "@smithy/util-defaults-mode-node": "^4.2.54",
-+        "@smithy/util-endpoints": "^3.4.2",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "@smithy/util-retry": "^4.3.4",
-+        "@smithy/util-utf8": "^4.2.2",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/fetch-http-handler": "^5.4.6",
++        "@smithy/node-http-handler": "^4.7.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
 +      },
        "engines": {
@@ -376,57 +352,41 @@ index 2af3a0d1..5c5f4b73 100644
 -      "license": "MIT",
 -      "engines": {
 -        "node": ">=12"
-+    "node_modules/@aws-sdk/core": {
-+      "version": "3.974.5",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.5.tgz",
-+      "integrity": "sha512-lMPlYlYfQdNZhlkJgnkmESwrY+hNh3PljmZ+37oAqLNdJ6rnILAwFSyc6B3bJeDOtMORNnMQIej0aTRuOlDyhQ==",
++    "node_modules/@aws-sdk/credential-provider-ini": {
++      "version": "3.972.55",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.55.tgz",
++      "integrity": "sha512-TBoF4buBGYhXjdZAryayY2TrkQj2B2KfE/msG4V53XCt+w0EhEwM2JRjx8p2grJ2C6gtH5++SAwEvGMRdi0yyw==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@aws-sdk/types": "^3.973.8",
-+        "@aws-sdk/xml-builder": "^3.972.19",
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/signature-v4": "^5.3.14",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-base64": "^4.3.2",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "@smithy/util-retry": "^4.3.4",
-+        "@smithy/util-utf8": "^4.2.2",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/credential-provider-env": "^3.972.48",
++        "@aws-sdk/credential-provider-http": "^3.972.50",
++        "@aws-sdk/credential-provider-login": "^3.972.54",
++        "@aws-sdk/credential-provider-process": "^3.972.48",
++        "@aws-sdk/credential-provider-sso": "^3.972.54",
++        "@aws-sdk/credential-provider-web-identity": "^3.972.54",
++        "@aws-sdk/nested-clients": "^3.997.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/credential-provider-imds": "^4.3.7",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
 -      "funding": {
 -        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-+      "engines": {
-+        "node": ">=20.0.0"
-       }
-     },
+-      }
+-    },
 -    "node_modules/ansi-styles": {
 -      "version": "6.2.3",
 -      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
 -      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
 -      "license": "MIT",
--      "engines": {
+       "engines": {
 -        "node": ">=12"
-+    "node_modules/@aws-sdk/credential-provider-cognito-identity": {
-+      "version": "3.972.28",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.972.28.tgz",
-+      "integrity": "sha512-UXhc4FfxbfNaIqycDnIZ+W8CMAoCtcJJfZkq+cWSUwQRN0V0d0uAoN2qCFyKZip8inlHeKJmNQsPliKKcElP8Q==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@aws-sdk/nested-clients": "^3.997.3",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-       },
+-      },
 -      "funding": {
 -        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-+      "engines": {
 +        "node": ">=20.0.0"
        }
      },
@@ -435,10 +395,10 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
 -      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
 -      "license": "MIT",
-+    "node_modules/@aws-sdk/credential-provider-env": {
-+      "version": "3.972.31",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.31.tgz",
-+      "integrity": "sha512-X/yGB73LmDW/6MdDJGCDzZBUXnM3ys4vs9l+5ZTJmiEswDdP1OjeoAFlFjVGS9o4KB2wZWQ9KOfdVNSSK6Ep3w==",
++    "node_modules/@aws-sdk/credential-provider-login": {
++      "version": "3.972.54",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.54.tgz",
++      "integrity": "sha512-hBWI3wZTdTGiuMfmPts6AWbAjFfRniOQnqx68tc2cQvRKWawFbN9wkLOVPWM1FAOyowZU73mC6Fi+rHSHNyLFw==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
@@ -449,10 +409,11 @@ index 2af3a0d1..5c5f4b73 100644
 -        "readdir-glob": "^1.1.2",
 -        "tar-stream": "^3.0.0",
 -        "zip-stream": "^6.0.1"
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/types": "^4.14.1",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/nested-clients": "^3.997.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
        "engines": {
@@ -465,10 +426,10 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
 -      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
 -      "license": "MIT",
-+    "node_modules/@aws-sdk/credential-provider-http": {
-+      "version": "3.972.33",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.33.tgz",
-+      "integrity": "sha512-c0ZF+lwoWVvX5iCaGKL5T/4DnIw88CGqxA0BcBs3U86mIp5EZYPVg+KSPkMXOyokmADvNewiMUfSG2uFwjRp0g==",
++    "node_modules/@aws-sdk/credential-provider-node": {
++      "version": "3.972.57",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.57.tgz",
++      "integrity": "sha512-u6dClpzNdWf1HGWz4wwhdXi1wiOofCLniM9S4BQQGlLAN9TW7VB+ld5V533GdKrYMaFeBGFqKnj0JCYvynLqwQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
@@ -479,15 +440,16 @@ index 2af3a0d1..5c5f4b73 100644
 -        "lodash": "^4.17.15",
 -        "normalize-path": "^3.0.0",
 -        "readable-stream": "^4.0.0"
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/fetch-http-handler": "^5.3.17",
-+        "@smithy/node-http-handler": "^4.6.1",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-stream": "^4.5.25",
++        "@aws-sdk/credential-provider-env": "^3.972.48",
++        "@aws-sdk/credential-provider-http": "^3.972.50",
++        "@aws-sdk/credential-provider-ini": "^3.972.55",
++        "@aws-sdk/credential-provider-process": "^3.972.48",
++        "@aws-sdk/credential-provider-sso": "^3.972.54",
++        "@aws-sdk/credential-provider-web-identity": "^3.972.54",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/credential-provider-imds": "^4.3.7",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
        "engines": {
@@ -512,27 +474,18 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
 -      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
 -      "license": "MIT",
-+    "node_modules/@aws-sdk/credential-provider-ini": {
-+      "version": "3.972.35",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.35.tgz",
-+      "integrity": "sha512-jsU4u/cRkKFLKQS0k918FQ27fzXLG5ENiLWQMYE6581zLeI2hWh04ptlrvZMB3wJT/5d+vSzJk74X1CMFr4y8Q==",
++    "node_modules/@aws-sdk/credential-provider-process": {
++      "version": "3.972.48",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.48.tgz",
++      "integrity": "sha512-w6VZwojPt12WnEkAUy6Nu4K6sWCbBmR7QX390b0nE6vRvkXbrYr9Lq9VySGkfjiMjpUA87op+J4EgvRmtWIDoQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
 -        "possible-typed-array-names": "^1.0.0"
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/credential-provider-env": "^3.972.31",
-+        "@aws-sdk/credential-provider-http": "^3.972.33",
-+        "@aws-sdk/credential-provider-login": "^3.972.35",
-+        "@aws-sdk/credential-provider-process": "^3.972.31",
-+        "@aws-sdk/credential-provider-sso": "^3.972.35",
-+        "@aws-sdk/credential-provider-web-identity": "^3.972.35",
-+        "@aws-sdk/nested-clients": "^3.997.3",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/credential-provider-imds": "^4.2.14",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
        "engines": {
@@ -547,22 +500,21 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "1.8.0",
 -      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
 -      "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
-+    "node_modules/@aws-sdk/credential-provider-login": {
-+      "version": "3.972.35",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.35.tgz",
-+      "integrity": "sha512-5oa3j0cA50jPqgNhZ9XdJVopuzUf1klRb28/2MfLYWWiPi9DRVvbrBWT+DidbHTT36520VuXZJahQwR+YgSjrg==",
++    "node_modules/@aws-sdk/credential-provider-sso": {
++      "version": "3.972.54",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.54.tgz",
++      "integrity": "sha512-23uZpIpF2SIFDCa1fcWa202tK4gGeyvX6GIIAjiB8WBsvsVRBMnJ/7dCxHzxf7eZT7GToJg837LDIBnZsl/VUg==",
        "license": "Apache-2.0",
 -      "peerDependencies": {
 -        "react-native-b4a": "*"
 +      "optional": true,
 +      "dependencies": {
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/nested-clients": "^3.997.3",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/nested-clients": "^3.997.22",
++        "@aws-sdk/token-providers": "3.1071.0",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
 -      "peerDependenciesMeta": {
@@ -583,26 +535,20 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "2.8.2",
 -      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
 -      "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
-+    "node_modules/@aws-sdk/credential-provider-node": {
-+      "version": "3.972.36",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.36.tgz",
-+      "integrity": "sha512-4nT2T8Z7vH8KE9EdjEsuIlHpZSlcaK2PrKbQBjuUGU46BCCzF3WvP0u0Uiosni3Ykmmn4rWLVawoOCLotUtCbg==",
++    "node_modules/@aws-sdk/credential-provider-web-identity": {
++      "version": "3.972.54",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.54.tgz",
++      "integrity": "sha512-0Iv5QttS6wcATlodYKgvQj6B9Db51rx7NU9fqu0PoLeS4BIgdYMc/QK4smwLwpm5RFrs02V/eLyEFp3FklvlNQ==",
        "license": "Apache-2.0",
 -      "peerDependencies": {
 -        "bare-abort-controller": "*"
 +      "optional": true,
 +      "dependencies": {
-+        "@aws-sdk/credential-provider-env": "^3.972.31",
-+        "@aws-sdk/credential-provider-http": "^3.972.33",
-+        "@aws-sdk/credential-provider-ini": "^3.972.35",
-+        "@aws-sdk/credential-provider-process": "^3.972.31",
-+        "@aws-sdk/credential-provider-sso": "^3.972.35",
-+        "@aws-sdk/credential-provider-web-identity": "^3.972.35",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/credential-provider-imds": "^4.2.14",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/nested-clients": "^3.997.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
 -      "peerDependenciesMeta": {
@@ -617,10 +563,10 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "4.5.5",
 -      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.5.tgz",
 -      "integrity": "sha512-XvwYM6VZqKoqDll8BmSww5luA5eflDzY0uEFfBJtFKe4PAAtxBjU3YIxzIBzhyaEQBy1VXEQBto4cpN5RZJw+w==",
-+    "node_modules/@aws-sdk/credential-provider-process": {
-+      "version": "3.972.31",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.31.tgz",
-+      "integrity": "sha512-eKeT4MXumpBJsrDLCYcSzIkFPVTFn/es7It2oogp2OhU/ic7P/+xzFpQx9ZhwtXS57Mc5S42BPWi7lHmvs/nYg==",
++    "node_modules/@aws-sdk/credential-providers": {
++      "version": "3.1072.0",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.1072.0.tgz",
++      "integrity": "sha512-TapaSwjVRVOV/1yEqlNRg6Co+YFnUBhYBlYZomHaY5FfbrsrtFueCBy0cDDrvr9s5wVIUkYLdsfiXeitatHfJg==",
        "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
@@ -629,11 +575,22 @@ index 2af3a0d1..5c5f4b73 100644
 -        "bare-stream": "^2.6.4",
 -        "bare-url": "^2.2.2",
 -        "fast-fifo": "^1.3.2"
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
++        "@aws-sdk/client-cognito-identity": "3.1072.0",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/credential-provider-cognito-identity": "^3.972.47",
++        "@aws-sdk/credential-provider-env": "^3.972.48",
++        "@aws-sdk/credential-provider-http": "^3.972.50",
++        "@aws-sdk/credential-provider-ini": "^3.972.55",
++        "@aws-sdk/credential-provider-login": "^3.972.54",
++        "@aws-sdk/credential-provider-node": "^3.972.57",
++        "@aws-sdk/credential-provider-process": "^3.972.48",
++        "@aws-sdk/credential-provider-sso": "^3.972.54",
++        "@aws-sdk/credential-provider-web-identity": "^3.972.54",
++        "@aws-sdk/nested-clients": "^3.997.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/credential-provider-imds": "^4.3.7",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
        "engines": {
@@ -653,20 +610,22 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "3.7.1",
 -      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.7.1.tgz",
 -      "integrity": "sha512-ebvMaS5BgZKmJlvuWh14dg9rbUI84QeV3WlWn6Ph6lFI8jJoh7ADtVTyD2c93euwbe+zgi0DVrl4YmqXeM9aIA==",
-+    "node_modules/@aws-sdk/credential-provider-sso": {
-+      "version": "3.972.35",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.35.tgz",
-+      "integrity": "sha512-bCuBdfnj0KGDMdLp6utMTLiJcFN2ek9EgZinxQZZSc3FxjJ/HSqeqab2cjbnoNfy8RM6suDCsRkmVY1izp9I+A==",
++    "node_modules/@aws-sdk/nested-clients": {
++      "version": "3.997.22",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.997.22.tgz",
++      "integrity": "sha512-4IwtcYSxEIVw5hcp8ogq0CMbFNZFw7jJUetpfFUhFFeqsa1K8j2Ihg2hnxLyOp3stMZnXda6VzOmPi1AFZQXcg==",
        "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/nested-clients": "^3.997.3",
-+        "@aws-sdk/token-providers": "3.1036.0",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
++        "@aws-crypto/sha256-browser": "5.2.0",
++        "@aws-crypto/sha256-js": "5.2.0",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/signature-v4-multi-region": "^3.996.35",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/fetch-http-handler": "^5.4.6",
++        "@smithy/node-http-handler": "^4.7.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
 +      },
        "engines": {
@@ -678,20 +637,17 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "3.0.0",
 -      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
 -      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
-+    "node_modules/@aws-sdk/credential-provider-web-identity": {
-+      "version": "3.972.35",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.35.tgz",
-+      "integrity": "sha512-swW6Bwvl8lanyEMtZOWE/oR6yqcRQH4HTQZUVsnDVgoXvRjRywpYpLv2BWwjUFyjPrqsdX6FeTkf4tMSe/qFTQ==",
++    "node_modules/@aws-sdk/signature-v4-multi-region": {
++      "version": "3.996.35",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.35.tgz",
++      "integrity": "sha512-6L/VWs+Wch2stHemCGTmUNqKLMzURxQDK5boNG3Jn3kAOp71meDUuS5sbObpEvFxHDq0uWeSLFDNSYsjNt+Dlg==",
        "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
 -        "bare-os": "^3.0.1"
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/nested-clients": "^3.997.3",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/signature-v4": "^5.4.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
@@ -702,10 +658,10 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "2.8.0",
 -      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.8.0.tgz",
 -      "integrity": "sha512-reUN0M2sHRqCdG4lUK3Fw8w98eeUIZHL5c3H7Mbhk2yVBL+oofgaIp0ieLfD5QXwPCypBpmEEKU2WZKzbAk8GA==",
-+    "node_modules/@aws-sdk/credential-providers": {
-+      "version": "3.1037.0",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.1037.0.tgz",
-+      "integrity": "sha512-TPPoQzfNkWltNgjJn3RRY1S8VXffDvv49xGGs9K0DrYS9LZCLLsoHmSmShx9HQusPc/4Oz23rfRWTolCU19PdQ==",
++    "node_modules/@aws-sdk/token-providers": {
++      "version": "3.1071.0",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.1071.0.tgz",
++      "integrity": "sha512-4LDW2Qob6LoLFuqYSYZq2AyTE9koSE9+i+n5UZcm10GpmQOK0zRD9L4uYlzItiTKksIWgC/qMFChAi3RvKYtMg==",
        "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
@@ -715,25 +671,11 @@ index 2af3a0d1..5c5f4b73 100644
 -      "peerDependencies": {
 -        "bare-buffer": "*",
 -        "bare-events": "*"
-+        "@aws-sdk/client-cognito-identity": "3.1037.0",
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/credential-provider-cognito-identity": "^3.972.28",
-+        "@aws-sdk/credential-provider-env": "^3.972.31",
-+        "@aws-sdk/credential-provider-http": "^3.972.33",
-+        "@aws-sdk/credential-provider-ini": "^3.972.35",
-+        "@aws-sdk/credential-provider-login": "^3.972.35",
-+        "@aws-sdk/credential-provider-node": "^3.972.36",
-+        "@aws-sdk/credential-provider-process": "^3.972.31",
-+        "@aws-sdk/credential-provider-sso": "^3.972.35",
-+        "@aws-sdk/credential-provider-web-identity": "^3.972.35",
-+        "@aws-sdk/nested-clients": "^3.997.3",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/config-resolver": "^4.4.17",
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/credential-provider-imds": "^4.2.14",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/types": "^4.14.1",
++        "@aws-sdk/core": "^3.974.22",
++        "@aws-sdk/nested-clients": "^3.997.22",
++        "@aws-sdk/types": "^3.973.13",
++        "@smithy/core": "^3.24.6",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
        },
 -      "peerDependenciesMeta": {
@@ -751,10 +693,10 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "2.3.2",
 -      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.3.2.tgz",
 -      "integrity": "sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==",
-+    "node_modules/@aws-sdk/middleware-host-header": {
-+      "version": "3.972.10",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.10.tgz",
-+      "integrity": "sha512-IJSsIMeVQ8MMCPbuh1AbltkFhLBLXn7aejzfX5YKT/VLDHn++Dcz8886tXckE+wQssyPUhaXrJhdakO2VilRhg==",
++    "node_modules/@aws-sdk/types": {
++      "version": "3.973.13",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.13.tgz",
++      "integrity": "sha512-pEHZqRkAlHfnfAU9tK+WpKv/gBNjGJrHMgA3A0iYRGyswBS2t0pfez+lWlwktb3Bqa0ovh7w/QJTFwp3fDxLNg==",
        "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
@@ -786,9 +728,7 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
 -      "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
 -      "license": "MIT",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
++        "@smithy/types": "^4.14.3",
 +        "tslib": "^2.6.2"
 +      },
        "engines": {
@@ -801,10 +741,10 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
 -      "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
 -      "license": "MIT",
-+    "node_modules/@aws-sdk/middleware-logger": {
-+      "version": "3.972.10",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.10.tgz",
-+      "integrity": "sha512-OOuGvvz1Dm20SjZo5oEBePFqxt5nf8AwkNDSyUHvD9/bfNASmstcYxFAHUowy4n6Io7mWUZ04JURZwSBvyQanQ==",
++    "node_modules/@aws-sdk/util-locate-window": {
++      "version": "3.965.8",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.965.8.tgz",
++      "integrity": "sha512-uUbMs1cBZPafD0ohUj6EwNf0fPZ534NvBxHox4hjX+0Rxq5paSYUem7+hi833pYrzrcnBATKIYpR02MDXT5M9g==",
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
@@ -820,22 +760,32 @@ index 2af3a0d1..5c5f4b73 100644
 -        "raw-body": "~2.5.3",
 -        "type-is": "~1.6.18",
 -        "unpipe": "~1.0.0"
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/types": "^4.14.1",
 +        "tslib": "^2.6.2"
        },
        "engines": {
 -        "node": ">= 0.8",
 -        "npm": "1.2.8000 || >= 1.4.16"
--      }
--    },
++        "node": ">=20.0.0"
+       }
+     },
 -    "node_modules/brace-expansion": {
 -      "version": "2.0.2",
 -      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
 -      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 -      "license": "MIT",
--      "dependencies": {
++    "node_modules/@aws-sdk/xml-builder": {
++      "version": "3.972.30",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.30.tgz",
++      "integrity": "sha512-StElZPEoBquWwNqw1AcfpzEyZqJvFxouG+mpDNYlcH6ZOrqd2CuIryv+8LV8gNHZUOyKyJF3Dq9vxaXEmDR9TQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
 -        "balanced-match": "^1.0.0"
++        "@smithy/types": "^4.14.3",
++        "fast-xml-parser": "5.7.3",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
 +        "node": ">=20.0.0"
        }
      },
@@ -843,9 +793,13 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "6.0.3",
 -      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
 -      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
--      "funding": [
--        {
--          "type": "github",
++    "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
++      "version": "5.7.3",
++      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.3.tgz",
++      "integrity": "sha512-C0AaNuC+mscy6vrAQKAc/rMq+zAPHodfHGZu4sGVehvAQt/JLG1O5zEcYcXSY5zSqr4YVgxsB+pHXTq0i7eDlg==",
+       "funding": [
+         {
+           "type": "github",
 -          "url": "https://github.com/sponsors/feross"
 -        },
 -        {
@@ -855,438 +809,16 @@ index 2af3a0d1..5c5f4b73 100644
 -        {
 -          "type": "consulting",
 -          "url": "https://feross.org/support"
--        }
--      ],
--      "license": "MIT",
-+    "node_modules/@aws-sdk/middleware-recursion-detection": {
-+      "version": "3.972.11",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.11.tgz",
-+      "integrity": "sha512-+zz6f79Kj9V5qFK2P+D8Ehjnw4AhphAlCAsPjUqEcInA9umtSSKMrHbSagEeOIsDNuvVrH98bjRHcyQukTrhaQ==",
-+      "license": "Apache-2.0",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
+         }
+       ],
+       "license": "MIT",
 +      "optional": true,
        "dependencies": {
 -        "base64-js": "^1.3.1",
 -        "ieee754": "^1.2.1"
--      }
--    },
--    "node_modules/buffer-crc32": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
--      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
--      "license": "MIT",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@aws/lambda-invoke-store": "^0.2.2",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-       "engines": {
--        "node": ">=8.0.0"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/bytes": {
--      "version": "3.1.2",
--      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
--      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/middleware-sdk-s3": {
-+      "version": "3.972.34",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.34.tgz",
-+      "integrity": "sha512-/UL96JKjsjdodcRRMKl99tLQvK6Oi9ptLC9iU1yiTF/ruaDX0mtBBtnLNZDxIZRJOCVOtB49ed1YaTadqygk8Q==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@aws-sdk/util-arn-parser": "^3.972.3",
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/signature-v4": "^5.3.14",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-config-provider": "^4.2.2",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "@smithy/util-stream": "^4.5.25",
-+        "@smithy/util-utf8": "^4.2.2",
-+        "tslib": "^2.6.2"
-+      },
-       "engines": {
--        "node": ">= 0.8"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/call-bind": {
--      "version": "1.0.8",
--      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
--      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/middleware-user-agent": {
-+      "version": "3.972.35",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.35.tgz",
-+      "integrity": "sha512-hOFWNOjVmOocpRlrU04nYxjMOeoe0Obu5AXEuhB8zblMCPl3cG1hdluQCZERRKFyhMQjwZnDbhSHjoMUjetFGw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "call-bind-apply-helpers": "^1.0.0",
--        "es-define-property": "^1.0.0",
--        "get-intrinsic": "^1.2.4",
--        "set-function-length": "^1.2.2"
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@aws-sdk/util-endpoints": "^3.996.8",
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-retry": "^4.3.4",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/call-bind-apply-helpers": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
--      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/nested-clients": {
-+      "version": "3.997.3",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.997.3.tgz",
-+      "integrity": "sha512-SivE6GP228IVgfsrr2c/vqTg95X0Qj39Yw4uIrcddpkUzIltNMoNOR62leHOLhODfjv9K8X2mPTwS69A5kT0nQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "es-errors": "^1.3.0",
--        "function-bind": "^1.1.2"
-+        "@aws-crypto/sha256-browser": "5.2.0",
-+        "@aws-crypto/sha256-js": "5.2.0",
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/middleware-host-header": "^3.972.10",
-+        "@aws-sdk/middleware-logger": "^3.972.10",
-+        "@aws-sdk/middleware-recursion-detection": "^3.972.11",
-+        "@aws-sdk/middleware-user-agent": "^3.972.35",
-+        "@aws-sdk/region-config-resolver": "^3.972.13",
-+        "@aws-sdk/signature-v4-multi-region": "^3.996.22",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@aws-sdk/util-endpoints": "^3.996.8",
-+        "@aws-sdk/util-user-agent-browser": "^3.972.10",
-+        "@aws-sdk/util-user-agent-node": "^3.973.21",
-+        "@smithy/config-resolver": "^4.4.17",
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/fetch-http-handler": "^5.3.17",
-+        "@smithy/hash-node": "^4.2.14",
-+        "@smithy/invalid-dependency": "^4.2.14",
-+        "@smithy/middleware-content-length": "^4.2.14",
-+        "@smithy/middleware-endpoint": "^4.4.32",
-+        "@smithy/middleware-retry": "^4.5.5",
-+        "@smithy/middleware-serde": "^4.2.20",
-+        "@smithy/middleware-stack": "^4.2.14",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/node-http-handler": "^4.6.1",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/url-parser": "^4.2.14",
-+        "@smithy/util-base64": "^4.3.2",
-+        "@smithy/util-body-length-browser": "^4.2.2",
-+        "@smithy/util-body-length-node": "^4.2.3",
-+        "@smithy/util-defaults-mode-browser": "^4.3.49",
-+        "@smithy/util-defaults-mode-node": "^4.2.54",
-+        "@smithy/util-endpoints": "^3.4.2",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "@smithy/util-retry": "^4.3.4",
-+        "@smithy/util-utf8": "^4.2.2",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 0.4"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/call-bound": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
--      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/region-config-resolver": {
-+      "version": "3.972.13",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.13.tgz",
-+      "integrity": "sha512-CvJ2ZIjK/jVD/lbOpowBVElJyC1YxLTIJ13yM0AEo0t2v7swOzGjSA6lJGH+DwZXQhcjUjoYwc8bVYCX5MDr1A==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "call-bind-apply-helpers": "^1.0.2",
--        "get-intrinsic": "^1.3.0"
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/config-resolver": "^4.4.17",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/cbor": {
--      "version": "5.2.0",
--      "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz",
--      "integrity": "sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/signature-v4-multi-region": {
-+      "version": "3.996.22",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.22.tgz",
-+      "integrity": "sha512-/rXhMXteD+BqhFd0nYprAgcZ/KtU+963uftPqd3tiFcFfooHZINXUGtOmo2SQjRVauCTNqIEzkwuSETdZFqTTA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "bignumber.js": "^9.0.1",
--        "nofilter": "^1.0.4"
-+        "@aws-sdk/middleware-sdk-s3": "^3.972.34",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/signature-v4": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">=6.0.0"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/color-convert": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
--      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/token-providers": {
-+      "version": "3.1036.0",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.1036.0.tgz",
-+      "integrity": "sha512-aNSJ6jjDYayxN9ZA1JpycVScX93Lx03kKZ1EXt3DGOTahcWVLJj3oLAlop0xKP+vP2Ga2t49p1tEaMkTbCCaZA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "color-name": "~1.1.4"
-+        "@aws-sdk/core": "^3.974.5",
-+        "@aws-sdk/nested-clients": "^3.997.3",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">=7.0.0"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/color-name": {
--      "version": "1.1.4",
--      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
--      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
--      "license": "MIT"
--    },
--    "node_modules/compress-commons": {
--      "version": "6.0.2",
--      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
--      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/types": {
-+      "version": "3.973.8",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
-+      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "crc-32": "^1.2.0",
--        "crc32-stream": "^6.0.0",
--        "is-stream": "^2.0.1",
--        "normalize-path": "^3.0.0",
--        "readable-stream": "^4.0.0"
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 14"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/compressible": {
--      "version": "2.0.18",
--      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
--      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/util-arn-parser": {
-+      "version": "3.972.3",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.3.tgz",
-+      "integrity": "sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "mime-db": ">= 1.43.0 < 2"
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 0.6"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/compression": {
--      "version": "1.8.1",
--      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
--      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/util-endpoints": {
-+      "version": "3.996.8",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.8.tgz",
-+      "integrity": "sha512-oOZHcRDihk5iEe5V25NVWg45b3qEA8OpHWVdU/XQh8Zj4heVPAJqWvMphQnU7LkufmUo10EpvFPZuQMiFLJK3g==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "bytes": "3.1.2",
--        "compressible": "~2.0.18",
--        "debug": "2.6.9",
--        "negotiator": "~0.6.4",
--        "on-headers": "~1.1.0",
--        "safe-buffer": "5.2.1",
--        "vary": "~1.1.2"
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/url-parser": "^4.2.14",
-+        "@smithy/util-endpoints": "^3.4.2",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 0.8.0"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/content-disposition": {
--      "version": "0.5.4",
--      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
--      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/util-locate-window": {
-+      "version": "3.965.5",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.965.5.tgz",
-+      "integrity": "sha512-WhlJNNINQB+9qtLtZJcpQdgZw3SCDCpXdUJP7cToGwHbCWCnRckGlc6Bx/OhWwIYFNAn+FIydY8SZ0QmVu3xTQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "safe-buffer": "5.2.1"
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 0.6"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/content-type": {
--      "version": "1.0.5",
--      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
--      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
--      "license": "MIT",
--      "engines": {
--        "node": ">= 0.6"
-+    "node_modules/@aws-sdk/util-user-agent-browser": {
-+      "version": "3.972.10",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.10.tgz",
-+      "integrity": "sha512-FAzqXvfEssGdSIz8ejatan0bOdx1qefBWKF/gWmVBXIP1HkS7v/wjjaqrAGGKvyihrXTXW00/2/1nTJtxpXz7g==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/types": "^4.14.1",
-+        "bowser": "^2.11.0",
-+        "tslib": "^2.6.2"
-       }
-     },
--    "node_modules/cookie": {
--      "version": "0.7.2",
--      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
--      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/util-user-agent-node": {
-+      "version": "3.973.21",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.21.tgz",
-+      "integrity": "sha512-Av4UHTcAWgdvbN0IP9pbtf4Qa1+6LtJqQdZWj5pLn5J67w0pnJJAZZ+7JPPcj2KN3378zD2JDM9DwJKEyvyMTQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@aws-sdk/middleware-user-agent": "^3.972.35",
-+        "@aws-sdk/types": "^3.973.8",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-config-provider": "^4.2.2",
-+        "tslib": "^2.6.2"
-+      },
-       "engines": {
--        "node": ">= 0.6"
-+        "node": ">=20.0.0"
-+      },
-+      "peerDependencies": {
-+        "aws-crt": ">=1.0.0"
-+      },
-+      "peerDependenciesMeta": {
-+        "aws-crt": {
-+          "optional": true
-+        }
-       }
-     },
--    "node_modules/cookie-session": {
--      "version": "2.1.1",
--      "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.1.tgz",
--      "integrity": "sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==",
--      "license": "MIT",
-+    "node_modules/@aws-sdk/xml-builder": {
-+      "version": "3.972.19",
-+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.19.tgz",
-+      "integrity": "sha512-Cw8IOMdBUEIl8ZlhRC3Dc/E64D5B5/8JhV6vhPLiPfJwcRC84S6F8aBOIi/N4vR9ZyA4I5Cc0Ateb/9EHaJXeQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "cookies": "0.9.1",
--        "debug": "3.2.7",
--        "on-headers": "~1.1.0",
--        "safe-buffer": "5.2.1"
-+        "@smithy/types": "^4.14.1",
-+        "fast-xml-parser": "5.7.1",
-+        "tslib": "^2.6.2"
-       },
-       "engines": {
--        "node": ">= 0.10"
-+        "node": ">=20.0.0"
-       }
-     },
--    "node_modules/cookie-session/node_modules/debug": {
--      "version": "3.2.7",
--      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
--      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-+    "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
-+      "version": "5.7.1",
-+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz",
-+      "integrity": "sha512-8Cc3f8GUGUULg34pBch/KGyPLglS+OFs05deyOlY7fL2MTagYPKrVQNmR1fLF/yJ9PH5ZSTd3YDF6pnmeZU+zA==",
-+      "funding": [
-+        {
-+          "type": "github",
-+          "url": "https://github.com/sponsors/NaturalIntelligence"
-+        }
-+      ],
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "ms": "^2.1.1"
 +        "@nodable/entities": "^2.1.0",
-+        "fast-xml-builder": "^1.1.5",
++        "fast-xml-builder": "^1.1.7",
 +        "path-expression-matcher": "^1.5.0",
 +        "strnum": "^2.2.3"
 +      },
@@ -1294,40 +826,33 @@ index 2af3a0d1..5c5f4b73 100644
 +        "fxparser": "src/cli/cli.js"
        }
      },
--    "node_modules/cookie-session/node_modules/ms": {
--      "version": "2.1.3",
--      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
--      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
--      "license": "MIT"
--    },
--    "node_modules/cookie-signature": {
--      "version": "1.0.7",
--      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
--      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
--      "license": "MIT"
+-    "node_modules/buffer-crc32": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+-      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+-      "license": "MIT",
 +    "node_modules/@aws/lambda-invoke-store": {
 +      "version": "0.2.4",
 +      "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.4.tgz",
 +      "integrity": "sha512-iY8yvjE0y651BixKNPgmv1WrQc+GZ142sb0z4gYnChDDY2YqI4P/jsSopBWrKfAt7LOJAkOXt7rC/hms+WclQQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-+      "engines": {
+       "engines": {
+-        "node": ">=8.0.0"
 +        "node": ">=18.0.0"
-+      }
+       }
      },
--    "node_modules/cookies": {
--      "version": "0.9.1",
--      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
--      "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
+-    "node_modules/bytes": {
+-      "version": "3.1.2",
+-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
 +    "node_modules/@babel/cli": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.28.6.tgz",
-+      "integrity": "sha512-6EUNcuBbNkj08Oj4gAZ+BUU8yLCgKzgVX4gaTh09Ya2C8ICM4P+G30g4m3akRxSYAp3A/gnWchrNst7px4/nUQ==",
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.29.7.tgz",
++      "integrity": "sha512-/75HwRbAYPqXv/Ax1h7Fg3IZfXgdU98jnA8H93/m/QBaPV3Hp5ICoLqzGYye1yHBCgpmXvtqgSUN8oOKX5tojQ==",
        "license": "MIT",
 +      "optional": true,
-       "dependencies": {
--        "depd": "~2.0.0",
--        "keygrip": "~1.1.0"
++      "dependencies": {
 +        "@jridgewell/trace-mapping": "^0.3.28",
 +        "commander": "^6.2.0",
 +        "convert-source-map": "^2.0.0",
@@ -1339,7 +864,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "bin": {
 +        "babel": "bin/babel.js",
 +        "babel-external-helpers": "bin/babel-external-helpers.js"
-       },
++      },
        "engines": {
 -        "node": ">= 0.8"
 +        "node": ">=6.9.0"
@@ -1352,29 +877,25 @@ index 2af3a0d1..5c5f4b73 100644
 +        "@babel/core": "^7.0.0-0"
        }
      },
--    "node_modules/core-util-is": {
--      "version": "1.0.3",
--      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
--      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
--      "license": "MIT"
+-    "node_modules/call-bind": {
+-      "version": "1.0.8",
+-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
 +    "node_modules/@babel/cli/node_modules/brace-expansion": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
-+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
-+      "license": "MIT",
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
++      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "call-bind-apply-helpers": "^1.0.0",
+-        "es-define-property": "^1.0.0",
+-        "get-intrinsic": "^1.2.4",
+-        "set-function-length": "^1.2.2"
 +        "balanced-match": "^1.0.0",
 +        "concat-map": "0.0.1"
 +      }
-     },
--    "node_modules/crc-32": {
--      "version": "1.2.2",
--      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
--      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
--      "license": "Apache-2.0",
--      "bin": {
--        "crc32": "bin/crc32.njs"
++    },
 +    "node_modules/@babel/cli/node_modules/glob": {
 +      "version": "7.2.3",
 +      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -1391,17 +912,18 @@ index 2af3a0d1..5c5f4b73 100644
 +        "path-is-absolute": "^1.0.0"
        },
        "engines": {
--        "node": ">=0.8"
+-        "node": ">= 0.4"
 +        "node": "*"
-+      },
-+      "funding": {
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +        "url": "https://github.com/sponsors/isaacs"
        }
      },
--    "node_modules/crc32-stream": {
--      "version": "6.0.0",
--      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
--      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
+-    "node_modules/call-bind-apply-helpers": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
 -      "license": "MIT",
 +    "node_modules/@babel/cli/node_modules/minimatch": {
 +      "version": "3.1.5",
@@ -1410,77 +932,72 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "ISC",
 +      "optional": true,
        "dependencies": {
--        "crc-32": "^1.2.0",
--        "readable-stream": "^4.0.0"
+-        "es-errors": "^1.3.0",
+-        "function-bind": "^1.1.2"
 +        "brace-expansion": "^1.1.7"
        },
        "engines": {
--        "node": ">= 14"
+-        "node": ">= 0.4"
 +        "node": "*"
        }
      },
--    "node_modules/cross-spawn": {
--      "version": "7.0.6",
--      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
--      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+-    "node_modules/call-bound": {
+-      "version": "1.0.4",
+-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
 +    "node_modules/@babel/code-frame": {
-+      "version": "7.29.0",
-+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
-+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
++      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "path-key": "^3.1.0",
--        "shebang-command": "^2.0.0",
--        "which": "^2.0.1"
-+        "@babel/helper-validator-identifier": "^7.28.5",
+-        "call-bind-apply-helpers": "^1.0.2",
+-        "get-intrinsic": "^1.3.0"
++        "@babel/helper-validator-identifier": "^7.29.7",
 +        "js-tokens": "^4.0.0",
 +        "picocolors": "^1.1.1"
        },
        "engines": {
--        "node": ">= 8"
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +        "node": ">=6.9.0"
        }
      },
--    "node_modules/debug": {
--      "version": "2.6.9",
--      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
--      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+-    "node_modules/cbor": {
+-      "version": "5.2.0",
+-      "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz",
+-      "integrity": "sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==",
 +    "node_modules/@babel/compat-data": {
-+      "version": "7.29.0",
-+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
-+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
-       "license": "MIT",
--      "dependencies": {
--        "ms": "2.0.0"
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
++      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
++      "license": "MIT",
 +      "optional": true,
 +      "engines": {
 +        "node": ">=6.9.0"
-       }
-     },
--    "node_modules/define-data-property": {
--      "version": "1.1.4",
--      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
--      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
++      }
++    },
 +    "node_modules/@babel/core": {
-+      "version": "7.29.0",
-+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
-+      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
++      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "es-define-property": "^1.0.0",
--        "es-errors": "^1.3.0",
--        "gopd": "^1.0.1"
-+        "@babel/code-frame": "^7.29.0",
-+        "@babel/generator": "^7.29.0",
-+        "@babel/helper-compilation-targets": "^7.28.6",
-+        "@babel/helper-module-transforms": "^7.28.6",
-+        "@babel/helpers": "^7.28.6",
-+        "@babel/parser": "^7.29.0",
-+        "@babel/template": "^7.28.6",
-+        "@babel/traverse": "^7.29.0",
-+        "@babel/types": "^7.29.0",
+-        "bignumber.js": "^9.0.1",
+-        "nofilter": "^1.0.4"
++        "@babel/code-frame": "^7.29.7",
++        "@babel/generator": "^7.29.7",
++        "@babel/helper-compilation-targets": "^7.29.7",
++        "@babel/helper-module-transforms": "^7.29.7",
++        "@babel/helpers": "^7.29.7",
++        "@babel/parser": "^7.29.7",
++        "@babel/template": "^7.29.7",
++        "@babel/traverse": "^7.29.7",
++        "@babel/types": "^7.29.7",
 +        "@jridgewell/remapping": "^2.3.5",
 +        "convert-source-map": "^2.0.0",
 +        "debug": "^4.1.0",
@@ -1489,30 +1006,30 @@ index 2af3a0d1..5c5f4b73 100644
 +        "semver": "^6.3.1"
        },
        "engines": {
--        "node": ">= 0.4"
+-        "node": ">=6.0.0"
 +        "node": ">=6.9.0"
-       },
-       "funding": {
--        "url": "https://github.com/sponsors/ljharb"
++      },
++      "funding": {
 +        "type": "opencollective",
 +        "url": "https://opencollective.com/babel"
        }
      },
--    "node_modules/depd": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
--      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+-    "node_modules/color-convert": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 +    "node_modules/@babel/core/node_modules/debug": {
 +      "version": "4.4.3",
 +      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
 +      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
        "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "color-name": "~1.1.4"
 +        "ms": "^2.1.3"
-+      },
+       },
        "engines": {
--        "node": ">= 0.8"
+-        "node": ">=7.0.0"
 +        "node": ">=6.0"
 +      },
 +      "peerDependenciesMeta": {
@@ -1521,31 +1038,415 @@ index 2af3a0d1..5c5f4b73 100644
 +        }
        }
      },
--    "node_modules/destroy": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
--      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+-    "node_modules/color-name": {
+-      "version": "1.1.4",
+-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+-      "license": "MIT"
 +    "node_modules/@babel/core/node_modules/ms": {
 +      "version": "2.1.3",
 +      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
 +      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 +      "license": "MIT",
 +      "optional": true
-+    },
+     },
+-    "node_modules/compress-commons": {
+-      "version": "6.0.2",
+-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+-      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
 +    "node_modules/@babel/generator": {
-+      "version": "7.29.1",
-+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
-+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
++      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
        "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
-+        "@babel/parser": "^7.29.0",
-+        "@babel/types": "^7.29.0",
+       "dependencies": {
+-        "crc-32": "^1.2.0",
+-        "crc32-stream": "^6.0.0",
+-        "is-stream": "^2.0.1",
+-        "normalize-path": "^3.0.0",
+-        "readable-stream": "^4.0.0"
++        "@babel/parser": "^7.29.7",
++        "@babel/types": "^7.29.7",
 +        "@jridgewell/gen-mapping": "^0.3.12",
 +        "@jridgewell/trace-mapping": "^0.3.28",
 +        "jsesc": "^3.0.2"
+       },
+       "engines": {
+-        "node": ">= 14"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/compressible": {
+-      "version": "2.0.18",
+-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
++    "node_modules/@babel/helper-annotate-as-pure": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.29.7.tgz",
++      "integrity": "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "mime-db": ">= 1.43.0 < 2"
++        "@babel/types": "^7.29.7"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/compression": {
+-      "version": "1.8.1",
+-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+-      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
++    "node_modules/@babel/helper-compilation-targets": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
++      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "bytes": "3.1.2",
+-        "compressible": "~2.0.18",
+-        "debug": "2.6.9",
+-        "negotiator": "~0.6.4",
+-        "on-headers": "~1.1.0",
+-        "safe-buffer": "5.2.1",
+-        "vary": "~1.1.2"
++        "@babel/compat-data": "^7.29.7",
++        "@babel/helper-validator-option": "^7.29.7",
++        "browserslist": "^4.24.0",
++        "lru-cache": "^5.1.1",
++        "semver": "^6.3.1"
+       },
+       "engines": {
+-        "node": ">= 0.8.0"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/content-disposition": {
+-      "version": "0.5.4",
+-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+-      "license": "MIT",
++    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
++      "version": "5.1.1",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
++      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
++      "license": "ISC",
++      "optional": true,
+       "dependencies": {
+-        "safe-buffer": "5.2.1"
+-      },
+-      "engines": {
+-        "node": ">= 0.6"
++        "yallist": "^3.0.2"
+       }
+     },
+-    "node_modules/content-type": {
+-      "version": "1.0.5",
+-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
++    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
++      "version": "3.1.1",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
++      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/@babel/helper-globals": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
++      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/cookie": {
+-      "version": "0.7.2",
+-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
++    "node_modules/@babel/helper-module-imports": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
++      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/traverse": "^7.29.7",
++        "@babel/types": "^7.29.7"
 +      },
        "engines": {
+-        "node": ">= 0.6"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/cookie-session": {
+-      "version": "2.1.1",
+-      "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.1.tgz",
+-      "integrity": "sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==",
++    "node_modules/@babel/helper-module-transforms": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
++      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "cookies": "0.9.1",
+-        "debug": "3.2.7",
+-        "on-headers": "~1.1.0",
+-        "safe-buffer": "5.2.1"
++        "@babel/helper-module-imports": "^7.29.7",
++        "@babel/helper-validator-identifier": "^7.29.7",
++        "@babel/traverse": "^7.29.7"
+       },
+       "engines": {
+-        "node": ">= 0.10"
++        "node": ">=6.9.0"
++      },
++      "peerDependencies": {
++        "@babel/core": "^7.0.0"
+       }
+     },
+-    "node_modules/cookie-session/node_modules/debug": {
+-      "version": "3.2.7",
+-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
++    "node_modules/@babel/helper-plugin-utils": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz",
++      "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==",
+       "license": "MIT",
+-      "dependencies": {
+-        "ms": "^2.1.1"
++      "optional": true,
++      "engines": {
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/cookie-session/node_modules/ms": {
+-      "version": "2.1.3",
+-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+-      "license": "MIT"
+-    },
+-    "node_modules/cookie-signature": {
+-      "version": "1.0.7",
+-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+-      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
+-      "license": "MIT"
++    "node_modules/@babel/helper-string-parser": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
++      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6.9.0"
++      }
+     },
+-    "node_modules/cookies": {
+-      "version": "0.9.1",
+-      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
+-      "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
++    "node_modules/@babel/helper-validator-identifier": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
++      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+       "license": "MIT",
+-      "dependencies": {
+-        "depd": "~2.0.0",
+-        "keygrip": "~1.1.0"
+-      },
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/core-util-is": {
+-      "version": "1.0.3",
+-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+-      "license": "MIT"
++    "node_modules/@babel/helper-validator-option": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
++      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6.9.0"
++      }
+     },
+-    "node_modules/crc-32": {
+-      "version": "1.2.2",
+-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+-      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+-      "license": "Apache-2.0",
+-      "bin": {
+-        "crc32": "bin/crc32.njs"
++    "node_modules/@babel/helpers": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
++      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/template": "^7.29.7",
++        "@babel/types": "^7.29.7"
+       },
+       "engines": {
+-        "node": ">=0.8"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/crc32-stream": {
+-      "version": "6.0.0",
+-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+-      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
++    "node_modules/@babel/node": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.29.7.tgz",
++      "integrity": "sha512-nfdPXz8/mD3/t+1nE1DKwGR14Ccjt5xeF7u3g7sqWnLi4yR6n+9Z0kThIROF8SRM07ZKpEtiWSKpWKxsMiJeew==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "crc-32": "^1.2.0",
+-        "readable-stream": "^4.0.0"
++        "@babel/register": "^7.29.7",
++        "commander": "^6.2.0",
++        "core-js": "^3.48.0",
++        "node-environment-flags": "^1.0.5",
++        "regenerator-runtime": "^0.14.0",
++        "v8flags": "^3.1.1"
++      },
++      "bin": {
++        "babel-node": "bin/babel-node.js"
+       },
+       "engines": {
+-        "node": ">= 14"
++        "node": ">=6.9.0"
++      },
++      "peerDependencies": {
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/cross-spawn": {
+-      "version": "7.0.6",
+-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
++    "node_modules/@babel/parser": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
++      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "path-key": "^3.1.0",
+-        "shebang-command": "^2.0.0",
+-        "which": "^2.0.1"
++        "@babel/types": "^7.29.7"
++      },
++      "bin": {
++        "parser": "bin/babel-parser.js"
+       },
+       "engines": {
+-        "node": ">= 8"
++        "node": ">=6.0.0"
+       }
+     },
+-    "node_modules/debug": {
+-      "version": "2.6.9",
+-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
++    "node_modules/@babel/plugin-syntax-jsx": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.29.7.tgz",
++      "integrity": "sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "ms": "2.0.0"
++        "@babel/helper-plugin-utils": "^7.29.7"
++      },
++      "engines": {
++        "node": ">=6.9.0"
++      },
++      "peerDependencies": {
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/define-data-property": {
+-      "version": "1.1.4",
+-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
++    "node_modules/@babel/plugin-transform-react-jsx": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.29.7.tgz",
++      "integrity": "sha512-WsZulLVBUHXVj2cUcPVx6UE21TpalB6bHbSFErKT0Ib++ax24jjXe73FqlWvdylFOjiuPHYi6VCcgRad1ItN+A==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "es-define-property": "^1.0.0",
+-        "es-errors": "^1.3.0",
+-        "gopd": "^1.0.1"
++        "@babel/helper-annotate-as-pure": "^7.29.7",
++        "@babel/helper-module-imports": "^7.29.7",
++        "@babel/helper-plugin-utils": "^7.29.7",
++        "@babel/plugin-syntax-jsx": "^7.29.7",
++        "@babel/types": "^7.29.7"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.9.0"
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++      "peerDependencies": {
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/depd": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
++    "node_modules/@babel/register": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.29.7.tgz",
++      "integrity": "sha512-AMGJoWuES861riy6pcB0fphE1YXybtQnBYQMuIyPv6mKLiosfa79BKTnAOyx215c/3RJPJpdQwoHZ3earVH7AA==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "clone-deep": "^4.0.1",
++        "find-cache-dir": "^2.0.0",
++        "make-dir": "^2.1.0",
++        "pirates": "^4.0.6",
++        "source-map-support": "^0.5.16"
++      },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=6.9.0"
++      },
++      "peerDependencies": {
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/destroy": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
++    "node_modules/@babel/runtime": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz",
++      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
 -        "node": ">= 0.8",
 -        "npm": "1.2.8000 || >= 1.4.16"
 +        "node": ">=6.9.0"
@@ -1555,17 +1456,19 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "1.0.1",
 -      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
 -      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-+    "node_modules/@babel/helper-annotate-as-pure": {
-+      "version": "7.27.3",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
-+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
++    "node_modules/@babel/template": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
++      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
 -        "call-bind-apply-helpers": "^1.0.1",
 -        "es-errors": "^1.3.0",
 -        "gopd": "^1.2.0"
-+        "@babel/types": "^7.27.3"
++        "@babel/code-frame": "^7.29.7",
++        "@babel/parser": "^7.29.7",
++        "@babel/types": "^7.29.7"
        },
        "engines": {
 -        "node": ">= 0.4"
@@ -1594,18 +1497,20 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "2.0.0",
 -      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
 -      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-+    "node_modules/@babel/helper-compilation-targets": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
-+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
++    "node_modules/@babel/traverse": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
++      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
        "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "@babel/compat-data": "^7.28.6",
-+        "@babel/helper-validator-option": "^7.27.1",
-+        "browserslist": "^4.24.0",
-+        "lru-cache": "^5.1.1",
-+        "semver": "^6.3.1"
++        "@babel/code-frame": "^7.29.7",
++        "@babel/generator": "^7.29.7",
++        "@babel/helper-globals": "^7.29.7",
++        "@babel/parser": "^7.29.7",
++        "@babel/template": "^7.29.7",
++        "@babel/types": "^7.29.7",
++        "debug": "^4.3.1"
 +      },
        "engines": {
 -        "node": ">= 0.8"
@@ -1616,75 +1521,57 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "1.0.1",
 -      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
 -      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-+    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
-+      "version": "5.1.1",
-+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-+      "license": "ISC",
-+      "optional": true,
-+      "dependencies": {
-+        "yallist": "^3.0.2"
-+      }
-+    },
-+    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
-+      "version": "3.1.1",
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-+      "license": "ISC",
-+      "optional": true
-+    },
-+    "node_modules/@babel/helper-globals": {
-+      "version": "7.28.0",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
-+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
++    "node_modules/@babel/traverse/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
        "license": "MIT",
 +      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
        "engines": {
 -        "node": ">= 0.4"
-+        "node": ">=6.9.0"
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
        }
      },
 -    "node_modules/es-errors": {
 -      "version": "1.3.0",
 -      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
 -      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-+    "node_modules/@babel/helper-module-imports": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
-+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
++    "node_modules/@babel/traverse/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
        "license": "MIT",
-+      "optional": true,
-+      "dependencies": {
-+        "@babel/traverse": "^7.28.6",
-+        "@babel/types": "^7.28.6"
-+      },
-       "engines": {
+-      "engines": {
 -        "node": ">= 0.4"
-+        "node": ">=6.9.0"
-       }
+-      }
++      "optional": true
      },
 -    "node_modules/es-object-atoms": {
 -      "version": "1.1.1",
 -      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
 -      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-+    "node_modules/@babel/helper-module-transforms": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
-+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
++    "node_modules/@babel/types": {
++      "version": "7.29.7",
++      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
++      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
 -        "es-errors": "^1.3.0"
-+        "@babel/helper-module-imports": "^7.28.6",
-+        "@babel/helper-validator-identifier": "^7.28.5",
-+        "@babel/traverse": "^7.28.6"
++        "@babel/helper-string-parser": "^7.29.7",
++        "@babel/helper-validator-identifier": "^7.29.7"
        },
        "engines": {
 -        "node": ">= 0.4"
 +        "node": ">=6.9.0"
-+      },
-+      "peerDependencies": {
-+        "@babel/core": "^7.0.0"
        }
      },
 -    "node_modules/escape-html": {
@@ -1697,45 +1584,51 @@ index 2af3a0d1..5c5f4b73 100644
 -      "version": "1.8.1",
 -      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
 -      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-+    "node_modules/@babel/helper-plugin-utils": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
-+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
++    "node_modules/@buttercup/fetch": {
++      "version": "0.2.1",
++      "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz",
++      "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==",
        "license": "MIT",
-+      "optional": true,
-       "engines": {
+-      "engines": {
 -        "node": ">= 0.6"
-+        "node": ">=6.9.0"
++      "optional": true,
++      "optionalDependencies": {
++        "node-fetch": "^3.3.0"
        }
      },
 -    "node_modules/event-target-shim": {
 -      "version": "5.0.1",
 -      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
 -      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-+    "node_modules/@babel/helper-string-parser": {
-+      "version": "7.27.1",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
++    "node_modules/@colors/colors": {
++      "version": "1.6.0",
++      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
++      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
        "license": "MIT",
 +      "optional": true,
        "engines": {
 -        "node": ">=6"
-+        "node": ">=6.9.0"
++        "node": ">=0.1.90"
        }
      },
 -    "node_modules/events": {
 -      "version": "3.3.0",
 -      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
 -      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-+    "node_modules/@babel/helper-validator-identifier": {
-+      "version": "7.28.5",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
++    "node_modules/@crowdsec/express-bouncer": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/@crowdsec/express-bouncer/-/express-bouncer-0.1.0.tgz",
++      "integrity": "sha512-cS5ATNInb914yOubWznMB02lheDLImtIZ8A7n99sn7q2YI+P3Zt6G/Mttp+d1NL1PDUkFBMFlBreOslkcWwLFQ==",
        "license": "MIT",
-+      "optional": true,
-       "engines": {
+-      "engines": {
 -        "node": ">=0.8.x"
-+        "node": ">=6.9.0"
++      "optional": true,
++      "dependencies": {
++        "ip-address": "^7.1.0",
++        "isomorphic-fetch": "^3.0.0",
++        "lodash": "^4.17.21",
++        "svg-captcha": "^1.4.0",
++        "winston": "^3.3.3"
        }
      },
 -    "node_modules/events-universal": {
@@ -1743,40 +1636,36 @@ index 2af3a0d1..5c5f4b73 100644
 -      "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
 -      "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
 -      "license": "Apache-2.0",
-+    "node_modules/@babel/helper-validator-option": {
-+      "version": "7.27.1",
-+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
-+      "license": "MIT",
-+      "optional": true,
-+      "engines": {
-+        "node": ">=6.9.0"
-+      }
++    "node_modules/@cryptography/aes": {
++      "version": "0.1.1",
++      "resolved": "https://registry.npmjs.org/@cryptography/aes/-/aes-0.1.1.tgz",
++      "integrity": "sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==",
++      "license": "GPL-3.0-or-later",
++      "optional": true
 +    },
-+    "node_modules/@babel/helpers": {
-+      "version": "7.29.2",
-+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz",
-+      "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==",
++    "node_modules/@dabh/diagnostics": {
++      "version": "2.0.8",
++      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz",
++      "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==",
 +      "license": "MIT",
 +      "optional": true,
        "dependencies": {
 -        "bare-events": "^2.7.0"
-+        "@babel/template": "^7.28.6",
-+        "@babel/types": "^7.29.0"
-+      },
-+      "engines": {
-+        "node": ">=6.9.0"
++        "@so-ric/colorspace": "^1.1.6",
++        "enabled": "2.0.x",
++        "kuler": "^2.0.0"
        }
      },
 -    "node_modules/express": {
 -      "version": "4.22.1",
 -      "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
 -      "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
-+    "node_modules/@babel/node": {
-+      "version": "7.29.0",
-+      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.29.0.tgz",
-+      "integrity": "sha512-9UeU8F3rx2lOZXneEW2HTnTYdA8+fXP0kr54tk7d0fPomWNlZ6WJ2H9lunr5dSvr8FNY0CDnop3Km6jZ5NAUsQ==",
-       "license": "MIT",
+-      "license": "MIT",
++    "node_modules/@discordjs/builders": {
++      "version": "1.14.1",
++      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.14.1.tgz",
++      "integrity": "sha512-gSKkhXLqs96TCzk66VZuHHl8z2bQMJFGwrXC0f33ngK+FLNau4hU1PYny3DNJfNdSH+gVMzE85/d5FQ2BpcNwQ==",
++      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
 -        "accepts": "~1.3.8",
@@ -1810,352 +1699,6 @@ index 2af3a0d1..5c5f4b73 100644
 -        "type-is": "~1.6.18",
 -        "utils-merge": "1.0.1",
 -        "vary": "~1.1.2"
-+        "@babel/register": "^7.28.6",
-+        "commander": "^6.2.0",
-+        "core-js": "^3.48.0",
-+        "node-environment-flags": "^1.0.5",
-+        "regenerator-runtime": "^0.14.0",
-+        "v8flags": "^3.1.1"
-+      },
-+      "bin": {
-+        "babel-node": "bin/babel-node.js"
-       },
-       "engines": {
--        "node": ">= 0.10.0"
-+        "node": ">=6.9.0"
-       },
--      "funding": {
--        "type": "opencollective",
--        "url": "https://opencollective.com/express"
-+      "peerDependencies": {
-+        "@babel/core": "^7.0.0-0"
-       }
-     },
--    "node_modules/express-handlebars": {
--      "version": "7.1.3",
--      "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.3.tgz",
--      "integrity": "sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==",
--      "license": "BSD-3-Clause",
-+    "node_modules/@babel/parser": {
-+      "version": "7.29.2",
-+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
-+      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
-+      "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "glob": "^10.4.2",
--        "graceful-fs": "^4.2.11",
--        "handlebars": "^4.7.8"
-+        "@babel/types": "^7.29.0"
-+      },
-+      "bin": {
-+        "parser": "bin/babel-parser.js"
-       },
-       "engines": {
--        "node": ">=v16"
-+        "node": ">=6.0.0"
-       }
-     },
--    "node_modules/express-ws": {
--      "version": "5.0.2",
--      "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz",
--      "integrity": "sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==",
--      "license": "BSD-2-Clause",
-+    "node_modules/@babel/plugin-syntax-jsx": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
-+      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
-+      "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "ws": "^7.4.6"
-+        "@babel/helper-plugin-utils": "^7.28.6"
-       },
-       "engines": {
--        "node": ">=4.5.0"
-+        "node": ">=6.9.0"
-       },
-       "peerDependencies": {
--        "express": "^4.0.0 || ^5.0.0-alpha.1"
-+        "@babel/core": "^7.0.0-0"
-       }
-     },
--    "node_modules/express-ws/node_modules/ws": {
--      "version": "7.5.10",
--      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
--      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
-+    "node_modules/@babel/plugin-transform-react-jsx": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz",
-+      "integrity": "sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==",
-       "license": "MIT",
-+      "optional": true,
-+      "dependencies": {
-+        "@babel/helper-annotate-as-pure": "^7.27.3",
-+        "@babel/helper-module-imports": "^7.28.6",
-+        "@babel/helper-plugin-utils": "^7.28.6",
-+        "@babel/plugin-syntax-jsx": "^7.28.6",
-+        "@babel/types": "^7.28.6"
-+      },
-       "engines": {
--        "node": ">=8.3.0"
-+        "node": ">=6.9.0"
-       },
-       "peerDependencies": {
--        "bufferutil": "^4.0.1",
--        "utf-8-validate": "^5.0.2"
-+        "@babel/core": "^7.0.0-0"
-+      }
-+    },
-+    "node_modules/@babel/register": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.28.6.tgz",
-+      "integrity": "sha512-pgcbbEl/dWQYb6L6Yew6F94rdwygfuv+vJ/tXfwIOYAfPB6TNWpXUMEtEq3YuTeHRdvMIhvz13bkT9CNaS+wqA==",
-+      "license": "MIT",
-+      "optional": true,
-+      "dependencies": {
-+        "clone-deep": "^4.0.1",
-+        "find-cache-dir": "^2.0.0",
-+        "make-dir": "^2.1.0",
-+        "pirates": "^4.0.6",
-+        "source-map-support": "^0.5.16"
-       },
--      "peerDependenciesMeta": {
--        "bufferutil": {
--          "optional": true
--        },
--        "utf-8-validate": {
--          "optional": true
--        }
-+      "engines": {
-+        "node": ">=6.9.0"
-+      },
-+      "peerDependencies": {
-+        "@babel/core": "^7.0.0-0"
-       }
-     },
--    "node_modules/fast-fifo": {
--      "version": "1.3.2",
--      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
--      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
--      "license": "MIT"
-+    "node_modules/@babel/runtime": {
-+      "version": "7.29.2",
-+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
-+      "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
-+      "license": "MIT",
-+      "optional": true,
-+      "engines": {
-+        "node": ">=6.9.0"
-+      }
-     },
--    "node_modules/fd-slicer": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
--      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-+    "node_modules/@babel/template": {
-+      "version": "7.28.6",
-+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
-+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "pend": "~1.2.0"
-+        "@babel/code-frame": "^7.28.6",
-+        "@babel/parser": "^7.28.6",
-+        "@babel/types": "^7.28.6"
-+      },
-+      "engines": {
-+        "node": ">=6.9.0"
-       }
-     },
--    "node_modules/finalhandler": {
--      "version": "1.3.2",
--      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
--      "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
-+    "node_modules/@babel/traverse": {
-+      "version": "7.29.0",
-+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
-+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "debug": "2.6.9",
--        "encodeurl": "~2.0.0",
--        "escape-html": "~1.0.3",
--        "on-finished": "~2.4.1",
--        "parseurl": "~1.3.3",
--        "statuses": "~2.0.2",
--        "unpipe": "~1.0.0"
-+        "@babel/code-frame": "^7.29.0",
-+        "@babel/generator": "^7.29.0",
-+        "@babel/helper-globals": "^7.28.0",
-+        "@babel/parser": "^7.29.0",
-+        "@babel/template": "^7.28.6",
-+        "@babel/types": "^7.29.0",
-+        "debug": "^4.3.1"
-       },
-       "engines": {
--        "node": ">= 0.8"
-+        "node": ">=6.9.0"
-       }
-     },
--    "node_modules/for-each": {
--      "version": "0.3.5",
--      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
--      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
-+    "node_modules/@babel/traverse/node_modules/debug": {
-+      "version": "4.4.3",
-+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
-+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "is-callable": "^1.2.7"
-+        "ms": "^2.1.3"
-       },
-       "engines": {
--        "node": ">= 0.4"
-+        "node": ">=6.0"
-       },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+      "peerDependenciesMeta": {
-+        "supports-color": {
-+          "optional": true
-+        }
-       }
-     },
--    "node_modules/foreground-child": {
--      "version": "3.3.1",
--      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
--      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
--      "license": "ISC",
-+    "node_modules/@babel/traverse/node_modules/ms": {
-+      "version": "2.1.3",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-+      "license": "MIT",
-+      "optional": true
-+    },
-+    "node_modules/@babel/types": {
-+      "version": "7.29.0",
-+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
-+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
-+      "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "cross-spawn": "^7.0.6",
--        "signal-exit": "^4.0.1"
-+        "@babel/helper-string-parser": "^7.27.1",
-+        "@babel/helper-validator-identifier": "^7.28.5"
-       },
-       "engines": {
--        "node": ">=14"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/isaacs"
-+        "node": ">=6.9.0"
-       }
-     },
--    "node_modules/forwarded": {
--      "version": "0.2.0",
--      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
--      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-+    "node_modules/@buttercup/fetch": {
-+      "version": "0.2.1",
-+      "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz",
-+      "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==",
-       "license": "MIT",
--      "engines": {
--        "node": ">= 0.6"
-+      "optional": true,
-+      "optionalDependencies": {
-+        "node-fetch": "^3.3.0"
-       }
-     },
--    "node_modules/fresh": {
--      "version": "0.5.2",
--      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
--      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-+    "node_modules/@colors/colors": {
-+      "version": "1.6.0",
-+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
-+      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
-       "license": "MIT",
-+      "optional": true,
-       "engines": {
--        "node": ">= 0.6"
-+        "node": ">=0.1.90"
-       }
-     },
--    "node_modules/function-bind": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
--      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-+    "node_modules/@crowdsec/express-bouncer": {
-+      "version": "0.1.0",
-+      "resolved": "https://registry.npmjs.org/@crowdsec/express-bouncer/-/express-bouncer-0.1.0.tgz",
-+      "integrity": "sha512-cS5ATNInb914yOubWznMB02lheDLImtIZ8A7n99sn7q2YI+P3Zt6G/Mttp+d1NL1PDUkFBMFlBreOslkcWwLFQ==",
-       "license": "MIT",
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+      "optional": true,
-+      "dependencies": {
-+        "ip-address": "^7.1.0",
-+        "isomorphic-fetch": "^3.0.0",
-+        "lodash": "^4.17.21",
-+        "svg-captcha": "^1.4.0",
-+        "winston": "^3.3.3"
-       }
-     },
--    "node_modules/generator-function": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
--      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
-+    "node_modules/@cryptography/aes": {
-+      "version": "0.1.1",
-+      "resolved": "https://registry.npmjs.org/@cryptography/aes/-/aes-0.1.1.tgz",
-+      "integrity": "sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==",
-+      "license": "GPL-3.0-or-later",
-+      "optional": true
-+    },
-+    "node_modules/@dabh/diagnostics": {
-+      "version": "2.0.8",
-+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz",
-+      "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==",
-       "license": "MIT",
--      "engines": {
--        "node": ">= 0.4"
-+      "optional": true,
-+      "dependencies": {
-+        "@so-ric/colorspace": "^1.1.6",
-+        "enabled": "2.0.x",
-+        "kuler": "^2.0.0"
-       }
-     },
--    "node_modules/get-intrinsic": {
--      "version": "1.3.0",
--      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
--      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
--      "license": "MIT",
-+    "node_modules/@discordjs/builders": {
-+      "version": "1.14.1",
-+      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.14.1.tgz",
-+      "integrity": "sha512-gSKkhXLqs96TCzk66VZuHHl8z2bQMJFGwrXC0f33ngK+FLNau4hU1PYny3DNJfNdSH+gVMzE85/d5FQ2BpcNwQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "call-bind-apply-helpers": "^1.0.2",
--        "es-define-property": "^1.0.1",
--        "es-errors": "^1.3.0",
--        "es-object-atoms": "^1.1.1",
--        "function-bind": "^1.1.2",
--        "get-proto": "^1.0.1",
--        "gopd": "^1.2.0",
--        "has-symbols": "^1.1.0",
--        "hasown": "^2.0.2",
--        "math-intrinsics": "^1.1.0"
 +        "@discordjs/formatters": "^0.6.2",
 +        "@discordjs/util": "^1.2.0",
 +        "@sapphire/shapeshift": "^4.0.0",
@@ -2165,40 +1708,30 @@ index 2af3a0d1..5c5f4b73 100644
 +        "tslib": "^2.6.3"
        },
        "engines": {
--        "node": ">= 0.4"
+-        "node": ">= 0.10.0"
 +        "node": ">=16.11.0"
        },
        "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/express"
 +        "url": "https://github.com/discordjs/discord.js?sponsor"
        }
      },
--    "node_modules/get-proto": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
--      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
--      "license": "MIT",
--      "dependencies": {
--        "dunder-proto": "^1.0.1",
--        "es-object-atoms": "^1.0.0"
--      },
+-    "node_modules/express-handlebars": {
+-      "version": "7.1.3",
+-      "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.3.tgz",
+-      "integrity": "sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==",
+-      "license": "BSD-3-Clause",
 +    "node_modules/@discordjs/collection": {
 +      "version": "1.5.3",
 +      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.3.tgz",
 +      "integrity": "sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-       "engines": {
--        "node": ">= 0.4"
++      "engines": {
 +        "node": ">=16.11.0"
-       }
-     },
--    "node_modules/glob": {
--      "version": "10.5.0",
--      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
--      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
--      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
--      "license": "ISC",
++      }
++    },
 +    "node_modules/@discordjs/formatters": {
 +      "version": "0.6.2",
 +      "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.6.2.tgz",
@@ -2206,36 +1739,32 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
--        "foreground-child": "^3.1.0",
--        "jackspeak": "^3.1.2",
--        "minimatch": "^9.0.4",
--        "minipass": "^7.1.2",
--        "package-json-from-dist": "^1.0.0",
--        "path-scurry": "^1.11.1"
+-        "glob": "^10.4.2",
+-        "graceful-fs": "^4.2.11",
+-        "handlebars": "^4.7.8"
 +        "discord-api-types": "^0.38.33"
        },
--      "bin": {
--        "glob": "dist/esm/bin.mjs"
-+      "engines": {
+       "engines": {
+-        "node": ">=v16"
 +        "node": ">=16.11.0"
-       },
-       "funding": {
--        "url": "https://github.com/sponsors/isaacs"
++      },
++      "funding": {
 +        "url": "https://github.com/discordjs/discord.js?sponsor"
        }
      },
--    "node_modules/gopd": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
--      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
--      "license": "MIT",
+-    "node_modules/express-ws": {
+-      "version": "5.0.2",
+-      "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz",
+-      "integrity": "sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==",
+-      "license": "BSD-2-Clause",
 +    "node_modules/@discordjs/rest": {
 +      "version": "2.6.1",
 +      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.6.1.tgz",
 +      "integrity": "sha512-wwQdgjeaoYFiaG+atbqx6aJDpqW7JHAo0HrQkBTbYzM3/PJ3GweQIpgElNcGZ26DCUOXMyawYd0YF7vtr+fZXg==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "ws": "^7.4.6"
 +        "@discordjs/collection": "^2.1.1",
 +        "@discordjs/util": "^1.2.0",
 +        "@sapphire/async-queue": "^1.5.3",
@@ -2245,49 +1774,75 @@ index 2af3a0d1..5c5f4b73 100644
 +        "magic-bytes.js": "^1.13.0",
 +        "tslib": "^2.6.3",
 +        "undici": "6.24.1"
-+      },
+       },
        "engines": {
--        "node": ">= 0.4"
+-        "node": ">=4.5.0"
 +        "node": ">=18"
        },
-       "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-      "peerDependencies": {
+-        "express": "^4.0.0 || ^5.0.0-alpha.1"
++      "funding": {
 +        "url": "https://github.com/discordjs/discord.js?sponsor"
        }
      },
--    "node_modules/graceful-fs": {
--      "version": "4.2.11",
--      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
--      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
--      "license": "ISC"
+-    "node_modules/express-ws/node_modules/ws": {
+-      "version": "7.5.10",
+-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+-      "license": "MIT",
 +    "node_modules/@discordjs/rest/node_modules/@discordjs/collection": {
 +      "version": "2.1.1",
 +      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz",
 +      "integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-+      "engines": {
+       "engines": {
+-        "node": ">=8.3.0"
+-      },
+-      "peerDependencies": {
+-        "bufferutil": "^4.0.1",
+-        "utf-8-validate": "^5.0.2"
 +        "node": ">=18"
-+      },
+       },
+-      "peerDependenciesMeta": {
+-        "bufferutil": {
+-          "optional": true
+-        },
+-        "utf-8-validate": {
+-          "optional": true
+-        }
 +      "funding": {
 +        "url": "https://github.com/discordjs/discord.js?sponsor"
-+      }
+       }
      },
--    "node_modules/handlebars": {
--      "version": "4.7.8",
--      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
--      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+-    "node_modules/fast-fifo": {
+-      "version": "1.3.2",
+-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+-      "license": "MIT"
+-    },
+-    "node_modules/fd-slicer": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
 +    "node_modules/@discordjs/rest/node_modules/@sapphire/snowflake": {
 +      "version": "3.5.5",
 +      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz",
 +      "integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==",
        "license": "MIT",
+-      "dependencies": {
+-        "pend": "~1.2.0"
 +      "optional": true,
 +      "engines": {
 +        "node": ">=v14.0.0",
 +        "npm": ">=7.0.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/finalhandler": {
+-      "version": "1.3.2",
+-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
+-      "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
+-      "license": "MIT",
 +    "node_modules/@discordjs/util": {
 +      "version": "1.2.0",
 +      "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.2.0.tgz",
@@ -2295,29 +1850,27 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
--        "minimist": "^1.2.5",
--        "neo-async": "^2.6.2",
--        "source-map": "^0.6.1",
--        "wordwrap": "^1.0.0"
--      },
--      "bin": {
--        "handlebars": "bin/handlebars"
+-        "debug": "2.6.9",
+-        "encodeurl": "~2.0.0",
+-        "escape-html": "~1.0.3",
+-        "on-finished": "~2.4.1",
+-        "parseurl": "~1.3.3",
+-        "statuses": "~2.0.2",
+-        "unpipe": "~1.0.0"
 +        "discord-api-types": "^0.38.33"
        },
        "engines": {
--        "node": ">=0.4.7"
+-        "node": ">= 0.8"
 +        "node": ">=18"
-       },
--      "optionalDependencies": {
--        "uglify-js": "^3.1.4"
++      },
 +      "funding": {
 +        "url": "https://github.com/discordjs/discord.js?sponsor"
        }
      },
--    "node_modules/has-property-descriptors": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
--      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+-    "node_modules/for-each": {
+-      "version": "0.3.5",
+-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+-      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
 -      "license": "MIT",
 +    "node_modules/@discordjs/ws": {
 +      "version": "1.2.3",
@@ -2326,7 +1879,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
--        "es-define-property": "^1.0.0"
+-        "is-callable": "^1.2.7"
 +        "@discordjs/collection": "^2.1.0",
 +        "@discordjs/rest": "^2.5.1",
 +        "@discordjs/util": "^1.1.0",
@@ -2336,8 +1889,9 @@ index 2af3a0d1..5c5f4b73 100644
 +        "discord-api-types": "^0.38.1",
 +        "tslib": "^2.6.2",
 +        "ws": "^8.17.0"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.4"
 +        "node": ">=16.11.0"
        },
        "funding": {
@@ -2345,11 +1899,15 @@ index 2af3a0d1..5c5f4b73 100644
 +        "url": "https://github.com/discordjs/discord.js?sponsor"
        }
      },
--    "node_modules/has-symbols": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
--      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
--      "license": "MIT",
+-    "node_modules/foreground-child": {
+-      "version": "3.3.1",
+-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+-      "license": "ISC",
+-      "dependencies": {
+-        "cross-spawn": "^7.0.6",
+-        "signal-exit": "^4.0.1"
+-      },
 +    "node_modules/@discordjs/ws/node_modules/@discordjs/collection": {
 +      "version": "2.1.1",
 +      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz",
@@ -2357,46 +1915,44 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "Apache-2.0",
 +      "optional": true,
        "engines": {
--        "node": ">= 0.4"
+-        "node": ">=14"
 +        "node": ">=18"
        },
        "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-        "url": "https://github.com/sponsors/isaacs"
 +        "url": "https://github.com/discordjs/discord.js?sponsor"
        }
      },
--    "node_modules/has-tostringtag": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
--      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+-    "node_modules/forwarded": {
+-      "version": "0.2.0",
+-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
 +    "node_modules/@duosecurity/duo_universal": {
 +      "version": "2.1.0",
 +      "resolved": "https://registry.npmjs.org/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz",
 +      "integrity": "sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g==",
        "license": "MIT",
 +      "optional": true,
-       "dependencies": {
--        "has-symbols": "^1.0.3"
++      "dependencies": {
 +        "axios": "^1.2.2",
 +        "jsonwebtoken": "^9.0.0"
-       },
++      },
        "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-        "node": ">= 0.6"
 +        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
        }
      },
--    "node_modules/hasown": {
--      "version": "2.0.2",
--      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
--      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+-    "node_modules/fresh": {
+-      "version": "0.5.2",
+-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
 +    "node_modules/@fastify/busboy": {
 +      "version": "3.2.0",
 +      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.2.0.tgz",
 +      "integrity": "sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==",
        "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
 +      "optional": true
 +    },
 +    "node_modules/@firebase/app-check-interop-types": {
@@ -2426,39 +1982,25 @@ index 2af3a0d1..5c5f4b73 100644
 +      "integrity": "sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-       "dependencies": {
--        "function-bind": "^1.1.2"
--      },
--      "engines": {
--        "node": ">= 0.4"
++      "dependencies": {
 +        "@firebase/util": "1.10.0",
 +        "tslib": "^2.1.0"
        }
      },
--    "node_modules/http-errors": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
--      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
+-    "node_modules/function-bind": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
 -      "license": "MIT",
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +    "node_modules/@firebase/database": {
 +      "version": "1.0.8",
 +      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.8.tgz",
 +      "integrity": "sha512-dzXALZeBI1U5TXt6619cv0+tgEhJiwlUtQ55WNZY7vGAjv7Q1QioV969iYwt1AQQ0ovHnEW0YW9TiBfefLvErg==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-       "dependencies": {
--        "depd": "~2.0.0",
--        "inherits": "~2.0.4",
--        "setprototypeof": "~1.2.0",
--        "statuses": "~2.0.2",
--        "toidentifier": "~1.0.1"
--      },
--      "engines": {
--        "node": ">= 0.8"
--      },
--      "funding": {
--        "type": "opencollective",
--        "url": "https://opencollective.com/express"
++      "dependencies": {
 +        "@firebase/app-check-interop-types": "0.3.2",
 +        "@firebase/auth-interop-types": "0.2.3",
 +        "@firebase/component": "0.6.9",
@@ -2468,22 +2010,20 @@ index 2af3a0d1..5c5f4b73 100644
 +        "tslib": "^2.1.0"
        }
      },
--    "node_modules/iconv-lite": {
--      "version": "0.4.24",
--      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
--      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+-    "node_modules/generator-function": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+-      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
 -      "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.4"
 +    "node_modules/@firebase/database-compat": {
 +      "version": "1.0.8",
 +      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.8.tgz",
 +      "integrity": "sha512-OpeWZoPE3sGIRPBKYnW9wLad25RaWbGyk7fFQe4xnJQKRzlynWeFBSRRAoLE2Old01WXwskUiucNqUUVlFsceg==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-       "dependencies": {
--        "safer-buffer": ">= 2.1.2 < 3"
--      },
--      "engines": {
--        "node": ">=0.10.0"
++      "dependencies": {
 +        "@firebase/component": "0.6.9",
 +        "@firebase/database": "1.0.8",
 +        "@firebase/database-types": "1.0.5",
@@ -2492,6 +2032,538 @@ index 2af3a0d1..5c5f4b73 100644
 +        "tslib": "^2.1.0"
        }
      },
+-    "node_modules/get-intrinsic": {
+-      "version": "1.3.0",
+-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
++    "node_modules/@firebase/database-types": {
++      "version": "1.0.5",
++      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.5.tgz",
++      "integrity": "sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@firebase/app-types": "0.9.2",
++        "@firebase/util": "1.10.0"
++      }
++    },
++    "node_modules/@firebase/logger": {
++      "version": "0.4.2",
++      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz",
++      "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.1.0"
++      }
++    },
++    "node_modules/@firebase/util": {
++      "version": "1.10.0",
++      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz",
++      "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.1.0"
++      }
++    },
++    "node_modules/@gar/promisify": {
++      "version": "1.1.3",
++      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
++      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+       "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@google-cloud/firestore": {
++      "version": "7.11.6",
++      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.6.tgz",
++      "integrity": "sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "call-bind-apply-helpers": "^1.0.2",
+-        "es-define-property": "^1.0.1",
+-        "es-errors": "^1.3.0",
+-        "es-object-atoms": "^1.1.1",
+-        "function-bind": "^1.1.2",
+-        "get-proto": "^1.0.1",
+-        "gopd": "^1.2.0",
+-        "has-symbols": "^1.1.0",
+-        "hasown": "^2.0.2",
+-        "math-intrinsics": "^1.1.0"
++        "@opentelemetry/api": "^1.3.0",
++        "fast-deep-equal": "^3.1.1",
++        "functional-red-black-tree": "^1.0.1",
++        "google-gax": "^4.3.3",
++        "protobufjs": "^7.2.6"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/get-proto": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+-      "license": "MIT",
++    "node_modules/@google-cloud/paginator": {
++      "version": "5.0.2",
++      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz",
++      "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "dunder-proto": "^1.0.1",
+-        "es-object-atoms": "^1.0.0"
++        "arrify": "^2.0.0",
++        "extend": "^3.0.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/glob": {
+-      "version": "10.5.0",
+-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+-      "license": "ISC",
++    "node_modules/@google-cloud/projectify": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz",
++      "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=14.0.0"
++      }
++    },
++    "node_modules/@google-cloud/promisify": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz",
++      "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/@google-cloud/storage": {
++      "version": "7.21.0",
++      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.21.0.tgz",
++      "integrity": "sha512-l+IFTkd+6Y5LoAuXyYCKNAKtw/Ci+rAMqgdTB1jv4iZiLhw0rtq+0qjIRbBizXkNzEFmXiXUW0H7sZQQvk1ffA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "foreground-child": "^3.1.0",
+-        "jackspeak": "^3.1.2",
+-        "minimatch": "^9.0.4",
+-        "minipass": "^7.1.2",
+-        "package-json-from-dist": "^1.0.0",
+-        "path-scurry": "^1.11.1"
+-      },
+-      "bin": {
+-        "glob": "dist/esm/bin.mjs"
++        "@google-cloud/paginator": "^5.0.0",
++        "@google-cloud/projectify": "^4.0.0",
++        "@google-cloud/promisify": "<4.1.0",
++        "abort-controller": "^3.0.0",
++        "async-retry": "^1.3.3",
++        "duplexify": "^4.1.3",
++        "fast-xml-parser": "^5.3.4",
++        "gaxios": "^6.0.2",
++        "google-auth-library": "^9.6.3",
++        "html-entities": "^2.5.2",
++        "mime": "^3.0.0",
++        "p-limit": "^3.0.1",
++        "retry-request": "^7.0.0",
++        "teeny-request": "^9.0.0"
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
++      "engines": {
++        "node": ">=14"
+       }
+     },
+-    "node_modules/gopd": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
++    "node_modules/@google-cloud/storage/node_modules/mime": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
++      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+       "license": "MIT",
++      "optional": true,
++      "bin": {
++        "mime": "cli.js"
++      },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=10.0.0"
++      }
++    },
++    "node_modules/@grpc/grpc-js": {
++      "version": "1.14.4",
++      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.4.tgz",
++      "integrity": "sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@grpc/proto-loader": "^0.8.0",
++        "@js-sdsl/ordered-map": "^4.4.2"
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++      "engines": {
++        "node": ">=12.10.0"
+       }
+     },
+-    "node_modules/graceful-fs": {
+-      "version": "4.2.11",
+-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+-      "license": "ISC"
++    "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": {
++      "version": "0.8.1",
++      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.1.tgz",
++      "integrity": "sha512-wtF6h+DY6M3YaDBPAmvuuA6jV8Sif9MjtOI5euKFWRgCDl5PeDpPsHR9u2l6St5ceY8AZgoNDww5+HvEsXFsGg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "lodash.camelcase": "^4.3.0",
++        "long": "^5.0.0",
++        "protobufjs": "^7.5.5",
++        "yargs": "^17.7.2"
++      },
++      "bin": {
++        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
++      },
++      "engines": {
++        "node": ">=6"
++      }
+     },
+-    "node_modules/handlebars": {
+-      "version": "4.7.8",
+-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+-      "license": "MIT",
++    "node_modules/@grpc/proto-loader": {
++      "version": "0.7.15",
++      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz",
++      "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "minimist": "^1.2.5",
+-        "neo-async": "^2.6.2",
+-        "source-map": "^0.6.1",
+-        "wordwrap": "^1.0.0"
++        "lodash.camelcase": "^4.3.0",
++        "long": "^5.0.0",
++        "protobufjs": "^7.2.5",
++        "yargs": "^17.7.2"
+       },
+       "bin": {
+-        "handlebars": "bin/handlebars"
++        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+       },
+       "engines": {
+-        "node": ">=0.4.7"
++        "node": ">=6"
++      }
++    },
++    "node_modules/@hapi/hoek": {
++      "version": "9.3.0",
++      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
++      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@hapi/topo": {
++      "version": "5.1.0",
++      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
++      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "@hapi/hoek": "^9.0.0"
++      }
++    },
++    "node_modules/@isaacs/cliui": {
++      "version": "8.0.2",
++      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
++      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
++      "license": "ISC",
++      "dependencies": {
++        "string-width": "^5.1.2",
++        "string-width-cjs": "npm:string-width@^4.2.0",
++        "strip-ansi": "^7.0.1",
++        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
++        "wrap-ansi": "^8.1.0",
++        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+       },
+-      "optionalDependencies": {
+-        "uglify-js": "^3.1.4"
++      "engines": {
++        "node": ">=12"
+       }
+     },
+-    "node_modules/has-property-descriptors": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
++    "node_modules/@jridgewell/gen-mapping": {
++      "version": "0.3.13",
++      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
++      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "es-define-property": "^1.0.0"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "@jridgewell/sourcemap-codec": "^1.5.0",
++        "@jridgewell/trace-mapping": "^0.3.24"
+       }
+     },
+-    "node_modules/has-symbols": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
++    "node_modules/@jridgewell/remapping": {
++      "version": "2.3.5",
++      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
++      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@jridgewell/gen-mapping": "^0.3.5",
++        "@jridgewell/trace-mapping": "^0.3.24"
++      }
++    },
++    "node_modules/@jridgewell/resolve-uri": {
++      "version": "3.1.2",
++      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
++      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
+-      },
++        "node": ">=6.0.0"
++      }
++    },
++    "node_modules/@jridgewell/source-map": {
++      "version": "0.3.11",
++      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
++      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@jridgewell/gen-mapping": "^0.3.5",
++        "@jridgewell/trace-mapping": "^0.3.25"
++      }
++    },
++    "node_modules/@jridgewell/sourcemap-codec": {
++      "version": "1.5.5",
++      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
++      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@jridgewell/trace-mapping": {
++      "version": "0.3.31",
++      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
++      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@jridgewell/resolve-uri": "^3.1.0",
++        "@jridgewell/sourcemap-codec": "^1.4.14"
++      }
++    },
++    "node_modules/@js-sdsl/ordered-map": {
++      "version": "4.4.2",
++      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
++      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
++      "license": "MIT",
++      "optional": true,
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "type": "opencollective",
++        "url": "https://opencollective.com/js-sdsl"
+       }
+     },
+-    "node_modules/has-tostringtag": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
++    "node_modules/@mongodb-js/saslprep": {
++      "version": "1.4.11",
++      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.11.tgz",
++      "integrity": "sha512-o9rAHc0IpIjuPSxRutWpE1F62x7n+4mVS4rCNHkzhIUMQcc18bb6xEq5wd2NdN0WjepIyXIppRshYI2kQDOZVA==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "has-symbols": "^1.0.3"
++        "sparse-bitfield": "^3.0.3"
++      }
++    },
++    "node_modules/@mysql/xdevapi": {
++      "version": "8.0.35",
++      "resolved": "https://registry.npmjs.org/@mysql/xdevapi/-/xdevapi-8.0.35.tgz",
++      "integrity": "sha512-l7HoBt1l0GwdCBXBrqri4kPBbJrqsyvaa4eqXvq50aWWArOTc5XGV06FWF1epxT+RORBy7scZTWFANxpr4Sfuw==",
++      "license": "GPL-2.0",
++      "optional": true,
++      "dependencies": {
++        "google-protobuf": "3.19.4",
++        "lossless-json": "2.0.1",
++        "parsimmon": "1.18.1"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=14.0.0"
++      }
++    },
++    "node_modules/@nicolo-ribaudo/chokidar-2": {
++      "version": "2.1.8-no-fsevents.3",
++      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
++      "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@nodable/entities": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.2.0.tgz",
++      "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/nodable"
++        }
++      ],
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@npmcli/fs": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
++      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@gar/promisify": "^1.0.1",
++        "semver": "^7.3.5"
++      }
++    },
++    "node_modules/@npmcli/fs/node_modules/semver": {
++      "version": "7.8.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
++      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver.js"
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++      "engines": {
++        "node": ">=10"
+       }
+     },
+-    "node_modules/hasown": {
+-      "version": "2.0.2",
+-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
++    "node_modules/@npmcli/move-file": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
++      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
++      "deprecated": "This functionality has been moved to @npmcli/fs",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "function-bind": "^1.1.2"
++        "mkdirp": "^1.0.4",
++        "rimraf": "^3.0.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=10"
+       }
+     },
+-    "node_modules/http-errors": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
+-      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
++    "node_modules/@npmcli/move-file/node_modules/brace-expansion": {
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
++      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "depd": "~2.0.0",
+-        "inherits": "~2.0.4",
+-        "setprototypeof": "~1.2.0",
+-        "statuses": "~2.0.2",
+-        "toidentifier": "~1.0.1"
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
++      }
++    },
++    "node_modules/@npmcli/move-file/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
+       },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": "*"
+       },
+       "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/express"
++        "url": "https://github.com/sponsors/isaacs"
+       }
+     },
+-    "node_modules/iconv-lite": {
+-      "version": "0.4.24",
+-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+-      "license": "MIT",
++    "node_modules/@npmcli/move-file/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
+       "dependencies": {
+-        "safer-buffer": ">= 2.1.2 < 3"
++        "brace-expansion": "^1.1.7"
+       },
+       "engines": {
+-        "node": ">=0.10.0"
++        "node": "*"
+       }
+     },
 -    "node_modules/ieee754": {
 -      "version": "1.2.1",
 -      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -2511,675 +2583,6 @@ index 2af3a0d1..5c5f4b73 100644
 -        }
 -      ],
 -      "license": "BSD-3-Clause"
-+    "node_modules/@firebase/database-types": {
-+      "version": "1.0.5",
-+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.5.tgz",
-+      "integrity": "sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@firebase/app-types": "0.9.2",
-+        "@firebase/util": "1.10.0"
-+      }
-     },
--    "node_modules/immediate": {
--      "version": "3.0.6",
--      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
--      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
--      "license": "MIT"
-+    "node_modules/@firebase/logger": {
-+      "version": "0.4.2",
-+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz",
-+      "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.1.0"
-+      }
-     },
--    "node_modules/inherits": {
--      "version": "2.0.4",
--      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
--      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
--      "license": "ISC"
-+    "node_modules/@firebase/util": {
-+      "version": "1.10.0",
-+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz",
-+      "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.1.0"
-+      }
-     },
--    "node_modules/ipaddr.js": {
--      "version": "1.9.1",
--      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
--      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-+    "node_modules/@gar/promisify": {
-+      "version": "1.1.3",
-+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
-+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
-       "license": "MIT",
-+      "optional": true
-+    },
-+    "node_modules/@google-cloud/firestore": {
-+      "version": "7.11.6",
-+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.6.tgz",
-+      "integrity": "sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@opentelemetry/api": "^1.3.0",
-+        "fast-deep-equal": "^3.1.1",
-+        "functional-red-black-tree": "^1.0.1",
-+        "google-gax": "^4.3.3",
-+        "protobufjs": "^7.2.6"
-+      },
-       "engines": {
--        "node": ">= 0.10"
-+        "node": ">=14.0.0"
-       }
-     },
--    "node_modules/ipcheck": {
--      "version": "0.1.0",
--      "resolved": "https://registry.npmjs.org/ipcheck/-/ipcheck-0.1.0.tgz",
--      "integrity": "sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ==",
--      "license": "MIT"
--    },
--    "node_modules/is-arguments": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
--      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
--      "license": "MIT",
-+    "node_modules/@google-cloud/paginator": {
-+      "version": "5.0.2",
-+      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz",
-+      "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "call-bound": "^1.0.2",
--        "has-tostringtag": "^1.0.2"
-+        "arrify": "^2.0.0",
-+        "extend": "^3.0.2"
-       },
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">=14.0.0"
-       }
-     },
--    "node_modules/is-callable": {
--      "version": "1.2.7",
--      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
--      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
--      "license": "MIT",
-+    "node_modules/@google-cloud/projectify": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz",
-+      "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">=14.0.0"
-       }
-     },
--    "node_modules/is-fullwidth-code-point": {
--      "version": "3.0.0",
--      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
--      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
--      "license": "MIT",
-+    "node_modules/@google-cloud/promisify": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz",
-+      "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "engines": {
--        "node": ">=8"
-+        "node": ">=14"
-       }
-     },
--    "node_modules/is-generator-function": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
--      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
--      "license": "MIT",
-+    "node_modules/@google-cloud/storage": {
-+      "version": "7.19.0",
-+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.19.0.tgz",
-+      "integrity": "sha512-n2FjE7NAOYyshogdc7KQOl/VZb4sneqPjWouSyia9CMDdMhRX5+RIbqalNmC7LOLzuLAN89VlF2HvG8na9G+zQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "call-bound": "^1.0.4",
--        "generator-function": "^2.0.0",
--        "get-proto": "^1.0.1",
--        "has-tostringtag": "^1.0.2",
--        "safe-regex-test": "^1.1.0"
-+        "@google-cloud/paginator": "^5.0.0",
-+        "@google-cloud/projectify": "^4.0.0",
-+        "@google-cloud/promisify": "<4.1.0",
-+        "abort-controller": "^3.0.0",
-+        "async-retry": "^1.3.3",
-+        "duplexify": "^4.1.3",
-+        "fast-xml-parser": "^5.3.4",
-+        "gaxios": "^6.0.2",
-+        "google-auth-library": "^9.6.3",
-+        "html-entities": "^2.5.2",
-+        "mime": "^3.0.0",
-+        "p-limit": "^3.0.1",
-+        "retry-request": "^7.0.0",
-+        "teeny-request": "^9.0.0",
-+        "uuid": "^8.0.0"
-       },
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">=14"
-       }
-     },
--    "node_modules/is-regex": {
--      "version": "1.2.1",
--      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
--      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-+    "node_modules/@google-cloud/storage/node_modules/mime": {
-+      "version": "3.0.0",
-+      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
-+      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
-       "license": "MIT",
--      "dependencies": {
--        "call-bound": "^1.0.2",
--        "gopd": "^1.2.0",
--        "has-tostringtag": "^1.0.2",
--        "hasown": "^2.0.2"
-+      "optional": true,
-+      "bin": {
-+        "mime": "cli.js"
-       },
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">=10.0.0"
-       }
-     },
--    "node_modules/is-stream": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
--      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-+    "node_modules/@google-cloud/storage/node_modules/uuid": {
-+      "version": "8.3.2",
-+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-       "license": "MIT",
--      "engines": {
--        "node": ">=8"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/sindresorhus"
-+      "optional": true,
-+      "bin": {
-+        "uuid": "dist/bin/uuid"
-       }
-     },
--    "node_modules/is-typed-array": {
--      "version": "1.1.15",
--      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
--      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
--      "license": "MIT",
-+    "node_modules/@grpc/grpc-js": {
-+      "version": "1.14.3",
-+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz",
-+      "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "which-typed-array": "^1.1.16"
-+        "@grpc/proto-loader": "^0.8.0",
-+        "@js-sdsl/ordered-map": "^4.4.2"
-       },
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">=12.10.0"
-       }
-     },
--    "node_modules/isarray": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
--      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
--      "license": "MIT"
--    },
--    "node_modules/isexe": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
--      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
--      "license": "ISC"
--    },
--    "node_modules/jackspeak": {
--      "version": "3.4.3",
--      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
--      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
--      "license": "BlueOak-1.0.0",
-+    "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": {
-+      "version": "0.8.0",
-+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz",
-+      "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "@isaacs/cliui": "^8.0.2"
-+        "lodash.camelcase": "^4.3.0",
-+        "long": "^5.0.0",
-+        "protobufjs": "^7.5.3",
-+        "yargs": "^17.7.2"
-       },
--      "funding": {
--        "url": "https://github.com/sponsors/isaacs"
-+      "bin": {
-+        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
-       },
--      "optionalDependencies": {
--        "@pkgjs/parseargs": "^0.11.0"
-+      "engines": {
-+        "node": ">=6"
-       }
-     },
--    "node_modules/keygrip": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
--      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
--      "license": "MIT",
-+    "node_modules/@grpc/proto-loader": {
-+      "version": "0.7.15",
-+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz",
-+      "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "tsscmp": "1.0.6"
-+        "lodash.camelcase": "^4.3.0",
-+        "long": "^5.0.0",
-+        "protobufjs": "^7.2.5",
-+        "yargs": "^17.7.2"
-+      },
-+      "bin": {
-+        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
-       },
-       "engines": {
--        "node": ">= 0.6"
-+        "node": ">=6"
-       }
-     },
--    "node_modules/lazystream": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
--      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
--      "license": "MIT",
-+    "node_modules/@hapi/hoek": {
-+      "version": "9.3.0",
-+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
-+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
-+      "license": "BSD-3-Clause",
-+      "optional": true
-+    },
-+    "node_modules/@hapi/topo": {
-+      "version": "5.1.0",
-+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
-+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
-+      "license": "BSD-3-Clause",
-+      "optional": true,
-       "dependencies": {
--        "readable-stream": "^2.0.5"
-+        "@hapi/hoek": "^9.0.0"
-+      }
-+    },
-+    "node_modules/@isaacs/cliui": {
-+      "version": "8.0.2",
-+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-+      "license": "ISC",
-+      "dependencies": {
-+        "string-width": "^5.1.2",
-+        "string-width-cjs": "npm:string-width@^4.2.0",
-+        "strip-ansi": "^7.0.1",
-+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-+        "wrap-ansi": "^8.1.0",
-+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-       },
-       "engines": {
--        "node": ">= 0.6.3"
-+        "node": ">=12"
-       }
-     },
--    "node_modules/lazystream/node_modules/readable-stream": {
--      "version": "2.3.8",
--      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
--      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-+    "node_modules/@jridgewell/gen-mapping": {
-+      "version": "0.3.13",
-+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "core-util-is": "~1.0.0",
--        "inherits": "~2.0.3",
--        "isarray": "~1.0.0",
--        "process-nextick-args": "~2.0.0",
--        "safe-buffer": "~5.1.1",
--        "string_decoder": "~1.1.1",
--        "util-deprecate": "~1.0.1"
-+        "@jridgewell/sourcemap-codec": "^1.5.0",
-+        "@jridgewell/trace-mapping": "^0.3.24"
-       }
-     },
--    "node_modules/lazystream/node_modules/safe-buffer": {
--      "version": "5.1.2",
--      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
--      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
--      "license": "MIT"
--    },
--    "node_modules/lazystream/node_modules/string_decoder": {
--      "version": "1.1.1",
--      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
--      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-+    "node_modules/@jridgewell/remapping": {
-+      "version": "2.3.5",
-+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
-+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "safe-buffer": "~5.1.0"
-+        "@jridgewell/gen-mapping": "^0.3.5",
-+        "@jridgewell/trace-mapping": "^0.3.24"
-       }
-     },
--    "node_modules/lie": {
--      "version": "3.1.1",
--      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
--      "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
-+    "node_modules/@jridgewell/resolve-uri": {
-+      "version": "3.1.2",
-+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-       "license": "MIT",
--      "dependencies": {
--        "immediate": "~3.0.5"
-+      "optional": true,
-+      "engines": {
-+        "node": ">=6.0.0"
-       }
-     },
--    "node_modules/localforage": {
--      "version": "1.10.0",
--      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
--      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
--      "license": "Apache-2.0",
-+    "node_modules/@jridgewell/source-map": {
-+      "version": "0.3.11",
-+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
-+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
-+      "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "lie": "3.1.1"
-+        "@jridgewell/gen-mapping": "^0.3.5",
-+        "@jridgewell/trace-mapping": "^0.3.25"
-       }
-     },
--    "node_modules/lodash": {
--      "version": "4.17.23",
--      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
--      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
--      "license": "MIT"
--    },
--    "node_modules/lru-cache": {
--      "version": "10.4.3",
--      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
--      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
--      "license": "ISC"
--    },
--    "node_modules/math-intrinsics": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
--      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-+    "node_modules/@jridgewell/sourcemap-codec": {
-+      "version": "1.5.5",
-+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-       "license": "MIT",
--      "engines": {
--        "node": ">= 0.4"
--      }
-+      "optional": true
-     },
--    "node_modules/media-typer": {
--      "version": "0.3.0",
--      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
--      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-+    "node_modules/@jridgewell/trace-mapping": {
-+      "version": "0.3.31",
-+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
-       "license": "MIT",
--      "engines": {
--        "node": ">= 0.6"
-+      "optional": true,
-+      "dependencies": {
-+        "@jridgewell/resolve-uri": "^3.1.0",
-+        "@jridgewell/sourcemap-codec": "^1.4.14"
-       }
-     },
--    "node_modules/merge-descriptors": {
--      "version": "1.0.3",
--      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
--      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-+    "node_modules/@js-sdsl/ordered-map": {
-+      "version": "4.4.2",
-+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
-+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
-       "license": "MIT",
-+      "optional": true,
-       "funding": {
--        "url": "https://github.com/sponsors/sindresorhus"
-+        "type": "opencollective",
-+        "url": "https://opencollective.com/js-sdsl"
-       }
-     },
--    "node_modules/methods": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
--      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-+    "node_modules/@mongodb-js/saslprep": {
-+      "version": "1.4.9",
-+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.9.tgz",
-+      "integrity": "sha512-RXSxsokhAF/4nWys8An8npsqOI33Ex1Hlzqjw2pZOO+GKtMAR2noGnUdsFiGwsaO/xXI+56mtjTmDA3JXJsvmA==",
-       "license": "MIT",
--      "engines": {
--        "node": ">= 0.6"
-+      "optional": true,
-+      "dependencies": {
-+        "sparse-bitfield": "^3.0.3"
-       }
-     },
--    "node_modules/mime": {
--      "version": "1.6.0",
--      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
--      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
--      "license": "MIT",
--      "bin": {
--        "mime": "cli.js"
-+    "node_modules/@mysql/xdevapi": {
-+      "version": "8.0.35",
-+      "resolved": "https://registry.npmjs.org/@mysql/xdevapi/-/xdevapi-8.0.35.tgz",
-+      "integrity": "sha512-l7HoBt1l0GwdCBXBrqri4kPBbJrqsyvaa4eqXvq50aWWArOTc5XGV06FWF1epxT+RORBy7scZTWFANxpr4Sfuw==",
-+      "license": "GPL-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "google-protobuf": "3.19.4",
-+        "lossless-json": "2.0.1",
-+        "parsimmon": "1.18.1"
-       },
-       "engines": {
--        "node": ">=4"
-+        "node": ">=14.0.0"
-       }
-     },
--    "node_modules/mime-db": {
--      "version": "1.54.0",
--      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
--      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
-+    "node_modules/@nicolo-ribaudo/chokidar-2": {
-+      "version": "2.1.8-no-fsevents.3",
-+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
-+      "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
-+      "license": "MIT",
-+      "optional": true
-+    },
-+    "node_modules/@nodable/entities": {
-+      "version": "2.1.0",
-+      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
-+      "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
-+      "funding": [
-+        {
-+          "type": "github",
-+          "url": "https://github.com/sponsors/nodable"
-+        }
-+      ],
-       "license": "MIT",
-+      "optional": true
-+    },
-+    "node_modules/@npmcli/fs": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
-+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
-+      "license": "ISC",
-+      "optional": true,
-+      "dependencies": {
-+        "@gar/promisify": "^1.0.1",
-+        "semver": "^7.3.5"
-+      }
-+    },
-+    "node_modules/@npmcli/fs/node_modules/semver": {
-+      "version": "7.7.4",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
-+      "license": "ISC",
-+      "optional": true,
-+      "bin": {
-+        "semver": "bin/semver.js"
-+      },
-       "engines": {
--        "node": ">= 0.6"
-+        "node": ">=10"
-       }
-     },
--    "node_modules/mime-types": {
--      "version": "2.1.35",
--      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
--      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-+    "node_modules/@npmcli/move-file": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-+      "deprecated": "This functionality has been moved to @npmcli/fs",
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "mime-db": "1.52.0"
-+        "mkdirp": "^1.0.4",
-+        "rimraf": "^3.0.2"
-       },
-       "engines": {
--        "node": ">= 0.6"
-+        "node": ">=10"
-       }
-     },
--    "node_modules/mime-types/node_modules/mime-db": {
--      "version": "1.52.0",
--      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
--      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-+    "node_modules/@npmcli/move-file/node_modules/brace-expansion": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
-+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
-       "license": "MIT",
--      "engines": {
--        "node": ">= 0.6"
-+      "optional": true,
-+      "dependencies": {
-+        "balanced-match": "^1.0.0",
-+        "concat-map": "0.0.1"
-       }
-     },
--    "node_modules/minimatch": {
--      "version": "9.0.9",
--      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
--      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
-+    "node_modules/@npmcli/move-file/node_modules/glob": {
-+      "version": "7.2.3",
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
-       "license": "ISC",
-+      "optional": true,
-       "dependencies": {
--        "brace-expansion": "^2.0.2"
-+        "fs.realpath": "^1.0.0",
-+        "inflight": "^1.0.4",
-+        "inherits": "2",
-+        "minimatch": "^3.1.1",
-+        "once": "^1.3.0",
-+        "path-is-absolute": "^1.0.0"
-       },
-       "engines": {
--        "node": ">=16 || 14 >=14.17"
-+        "node": "*"
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/isaacs"
-       }
-     },
--    "node_modules/minimist": {
--      "version": "1.2.8",
--      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
--      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
--      "license": "MIT",
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+    "node_modules/@npmcli/move-file/node_modules/minimatch": {
-+      "version": "3.1.5",
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-+      "license": "ISC",
-+      "optional": true,
-+      "dependencies": {
-+        "brace-expansion": "^1.1.7"
-+      },
-+      "engines": {
-+        "node": "*"
-       }
-     },
--    "node_modules/minipass": {
--      "version": "7.1.3",
--      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
--      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
--      "license": "BlueOak-1.0.0",
 +    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
 +      "version": "1.0.4",
 +      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -3189,15 +2592,15 @@ index 2af3a0d1..5c5f4b73 100644
 +      "bin": {
 +        "mkdirp": "bin/cmd.js"
 +      },
-       "engines": {
--        "node": ">=16 || 14 >=14.17"
++      "engines": {
 +        "node": ">=10"
-       }
++      }
      },
--    "node_modules/ms": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
--      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+-    "node_modules/immediate": {
+-      "version": "3.0.6",
+-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+-      "license": "MIT"
 +    "node_modules/@npmcli/move-file/node_modules/rimraf": {
 +      "version": "3.0.2",
 +      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -3229,22 +2632,15 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "12.0.1",
 +      "resolved": "https://registry.npmjs.org/@otplib/core/-/core-12.0.1.tgz",
 +      "integrity": "sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==",
-       "license": "MIT"
-     },
--    "node_modules/multiparty": {
--      "version": "4.2.3",
--      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz",
--      "integrity": "sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==",
++      "license": "MIT"
++    },
 +    "node_modules/@otplib/plugin-crypto": {
 +      "version": "12.0.1",
 +      "resolved": "https://registry.npmjs.org/@otplib/plugin-crypto/-/plugin-crypto-12.0.1.tgz",
 +      "integrity": "sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==",
 +      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
-       "license": "MIT",
-       "dependencies": {
--        "http-errors": "~1.8.1",
--        "safe-buffer": "5.2.1",
--        "uid-safe": "2.1.5"
++      "license": "MIT",
++      "dependencies": {
 +        "@otplib/core": "^12.0.1"
 +      }
 +    },
@@ -3307,28 +2703,27 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/@protobufjs/codegen": {
-+      "version": "2.0.4",
-+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
++      "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.5.tgz",
++      "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
 +      "license": "BSD-3-Clause",
 +      "optional": true
 +    },
 +    "node_modules/@protobufjs/eventemitter": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
++      "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
 +      "license": "BSD-3-Clause",
 +      "optional": true
 +    },
 +    "node_modules/@protobufjs/fetch": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.1.tgz",
++      "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
 +      "license": "BSD-3-Clause",
 +      "optional": true,
 +      "dependencies": {
-+        "@protobufjs/aspromise": "^1.1.1",
-+        "@protobufjs/inquire": "^1.1.0"
++        "@protobufjs/aspromise": "^1.1.1"
 +      }
 +    },
 +    "node_modules/@protobufjs/float": {
@@ -3338,13 +2733,6 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "BSD-3-Clause",
 +      "optional": true
 +    },
-+    "node_modules/@protobufjs/inquire": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
-+      "license": "BSD-3-Clause",
-+      "optional": true
-+    },
 +    "node_modules/@protobufjs/path": {
 +      "version": "1.1.2",
 +      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
@@ -3360,9 +2748,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/@protobufjs/utf8": {
-+      "version": "1.1.0",
-+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.1.tgz",
++      "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
 +      "license": "BSD-3-Clause",
 +      "optional": true
 +    },
@@ -3483,40 +2871,15 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "BSD-3-Clause",
 +      "optional": true
 +    },
-+    "node_modules/@smithy/config-resolver": {
-+      "version": "4.4.17",
-+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.17.tgz",
-+      "integrity": "sha512-TzDZcAnhTyAHbXVxWZo7/tEcrIeFq20IBk8So3OLOetWpR8EwY/yEqBMBFaJMeyEiREDq4NfEl+qO3OAUD+vbQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-config-provider": "^4.2.2",
-+        "@smithy/util-endpoints": "^3.4.2",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
 +    "node_modules/@smithy/core": {
-+      "version": "3.23.17",
-+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.17.tgz",
-+      "integrity": "sha512-x7BlLbUFL8NWCGjMF9C+1N5cVCxcPa7g6Tv9B4A2luWx3be3oU8hQ96wIwxe/s7OhIzvoJH73HAUSg5JXVlEtQ==",
++      "version": "3.25.1",
++      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.25.1.tgz",
++      "integrity": "sha512-zpDbpXBCBsxfLtG2GEUyfgvHvSFrw5CwDZSNzL0v52gx/c3oPlPbm+7W7num8xs6vyiUBn+bvYPHcQDOXZynCQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/url-parser": "^4.2.14",
-+        "@smithy/util-base64": "^4.3.2",
-+        "@smithy/util-body-length-browser": "^4.2.2",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "@smithy/util-stream": "^4.5.25",
-+        "@smithy/util-utf8": "^4.2.2",
-+        "@smithy/uuid": "^1.1.2",
++        "@aws-crypto/crc32": "5.2.0",
++        "@smithy/types": "^4.15.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
@@ -3524,16 +2887,14 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@smithy/credential-provider-imds": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.14.tgz",
-+      "integrity": "sha512-Au28zBN48ZAoXdooGUHemuVBrkE+Ie6RPmGNIAJsFqj33Vhb6xAgRifUydZ2aY+M+KaMAETAlKk5NC5h1G7wpg==",
++      "version": "4.4.1",
++      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.4.1.tgz",
++      "integrity": "sha512-TSAF5NHgxEsllbErYWbK8aLnl5L601NGc5VYJlSPsKnf3YlkhdoBN+geGcaU00oiw2OK3QO5LA3QNXiiWhCidQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/url-parser": "^4.2.14",
++        "@smithy/core": "^3.25.1",
++        "@smithy/types": "^4.15.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
@@ -3541,46 +2902,14 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@smithy/fetch-http-handler": {
-+      "version": "5.3.17",
-+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.17.tgz",
-+      "integrity": "sha512-bXOvQzaSm6MnmLaWA1elgfQcAtN4UP3vXqV97bHuoOrHQOJiLT3ds6o9eo5bqd0TJfRFpzdGnDQdW3FACiAVdw==",
++      "version": "5.5.1",
++      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.5.1.tgz",
++      "integrity": "sha512-96JrD1q71anokymx9Iblb+zKmNQYNstlV/25A9ZYIJ2A0rp1r7/GZAIm0bDWSmVvz3DpNOCZuabzsiL+w0UHhw==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/querystring-builder": "^4.2.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-base64": "^4.3.2",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/hash-node": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.14.tgz",
-+      "integrity": "sha512-8ZBDY2DD4wr+GGjTpPtiglEsqr0lUP+KHqgZcWczFf6qeZ/YRjMIOoQWVQlmwu7EtxKTd8YXD8lblmYcpBIA1g==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-buffer-from": "^4.2.2",
-+        "@smithy/util-utf8": "^4.2.2",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/invalid-dependency": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.14.tgz",
-+      "integrity": "sha512-c21qJiTSb25xvvOp+H2TNZzPCngrvl5vIPqPB8zQ/DmJF4QWXO19x1dWfMJZ6wZuuWUPPm0gV8C0cU3+ifcWuw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
++        "@smithy/core": "^3.25.1",
++        "@smithy/types": "^4.15.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
@@ -3588,215 +2917,27 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@smithy/is-array-buffer": {
-+      "version": "4.2.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.2.2.tgz",
-+      "integrity": "sha512-n6rQ4N8Jj4YTQO3YFrlgZuwKodf4zUFs7EJIWH86pSCWBaAtAGBFfCM7Wx6D2bBJ2xqFNxGBSrUWswT3M0VJow==",
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
++      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/middleware-content-length": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.14.tgz",
-+      "integrity": "sha512-xhHq7fX4/3lv5NHxLUk3OeEvl0xZ+Ek3qIbWaCL4f9JwgDZEclPBElljaZCAItdGPQl/kSM4LPMOpy1MYgprpw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/middleware-endpoint": {
-+      "version": "4.4.32",
-+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.32.tgz",
-+      "integrity": "sha512-ZZkgyjnJppiZbIm6Qbx92pbXYi1uzenIvGhBSCDlc7NwuAkiqSgS75j1czAD25ZLs2FjMjYy1q7gyRVWG6JA0Q==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/middleware-serde": "^4.2.20",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/url-parser": "^4.2.14",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/middleware-retry": {
-+      "version": "4.5.5",
-+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.5.5.tgz",
-+      "integrity": "sha512-wnYOpB5vATFKWrY2Z9Alb0KhjZI6AbzU6Fbz3Hq2GnURdRYWB4q+qWivQtSTwXcmWUA3MZ6krfwL6Cq5MAbxsA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/service-error-classification": "^4.3.0",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "@smithy/util-retry": "^4.3.4",
-+        "@smithy/uuid": "^1.1.2",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/middleware-serde": {
-+      "version": "4.2.20",
-+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.20.tgz",
-+      "integrity": "sha512-Lx9JMO9vArPtiChE3wbEZ5akMIDQpWQtlu90lhACQmNOXcGXRbaDywMHDzuDZ2OkZzP+9wQfZi3YJT9F67zTQQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/middleware-stack": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.14.tgz",
-+      "integrity": "sha512-2dvkUKLuFdKsCRmOE4Mn63co0Djtsm+JMh0bYZQupN1pJwMeE8FmQmRLLzzEMN0dnNi7CDCYYH8F0EVwWiPBeA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/node-config-provider": {
-+      "version": "4.3.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.14.tgz",
-+      "integrity": "sha512-S+gFjyo/weSVL0P1b9Ts8C/CwIfNCgUPikk3sl6QVsfE/uUuO+QsF+NsE/JkpvWqqyz1wg7HFdiaZuj5CoBMRg==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/shared-ini-file-loader": "^4.4.9",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
++        "node": ">=14.0.0"
 +      }
 +    },
 +    "node_modules/@smithy/node-http-handler": {
-+      "version": "4.6.1",
-+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.6.1.tgz",
-+      "integrity": "sha512-iB+orM4x3xrr57X3YaXazfKnntl0LHlZB1kcXSGzMV1Tt0+YwEjGlbjk/44qEGtBzXAz6yFDzkYTKSV6Pj2HUg==",
++      "version": "4.8.1",
++      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.8.1.tgz",
++      "integrity": "sha512-emtXvoky671puri18ETf64AFIQUGIEA093F2drXpBgB0OGnBLjcwNR3CA2mYu62IAqNsS56xa5lnTxAgPq7cjw==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/querystring-builder": "^4.2.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/property-provider": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.14.tgz",
-+      "integrity": "sha512-WuM31CgfsnQ/10i7NYr0PyxqknD72Y5uMfUMVSniPjbEPceiTErb4eIqJQ+pdxNEAUEWrewrGjIRjVbVHsxZiQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/protocol-http": {
-+      "version": "5.3.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.14.tgz",
-+      "integrity": "sha512-dN5F8kHx8RNU0r+pCwNmFZyz6ChjMkzShy/zup6MtkRmmix4vZzJdW+di7x//b1LiynIev88FM18ie+wwPcQtQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/querystring-builder": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.14.tgz",
-+      "integrity": "sha512-XYA5Z0IqTeF+5XDdh4BBmSA0HvbgVZIyv4cmOoUheDNR57K1HgBp9ukUMx3Cr3XpDHHpLBnexPE3LAtDsZkj2A==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-uri-escape": "^4.2.2",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/querystring-parser": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.14.tgz",
-+      "integrity": "sha512-hr+YyqBD23GVvRxGGrcc/oOeNlK3PzT5Fu4dzrDXxzS1LpFiuL2PQQqKPs87M79aW7ziMs+nvB3qdw77SqE7Lw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/service-error-classification": {
-+      "version": "4.3.0",
-+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.3.0.tgz",
-+      "integrity": "sha512-9jKsBYQRPR0xBLgc2415RsA5PIcP2sis4oBdN9s0D13cg1B1284mNTjx9Yc+BEERXzuPm5ObktI96OxsKh8E9A==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/shared-ini-file-loader": {
-+      "version": "4.4.9",
-+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.9.tgz",
-+      "integrity": "sha512-495/V2I15SHgedSJoDPD23JuSfKAp726ZI1V0wtjB07Wh7q/0tri/0e0DLefZCHgxZonrGKt/OCTpAtP1wE1kQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
++        "@smithy/core": "^3.25.1",
++        "@smithy/types": "^4.15.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
@@ -3804,38 +2945,14 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@smithy/signature-v4": {
-+      "version": "5.3.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.14.tgz",
-+      "integrity": "sha512-1D9Y/nmlVjCeSivCbhZ7hgEpmHyY1h0GvpSZt3l0xcD9JjmjVC1CHOozS6+Gh+/ldMH8JuJ6cujObQqfayAVFA==",
++      "version": "5.5.1",
++      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.5.1.tgz",
++      "integrity": "sha512-X9rVls3En0z3NtrmguTmpRM0/NqtWUxBjal6fcAkwtsub+gOdLZ6kD+V7xhUgFMGdG14bHbZ7M5QjaRI1+DatQ==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@smithy/is-array-buffer": "^4.2.2",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-hex-encoding": "^4.2.2",
-+        "@smithy/util-middleware": "^4.2.14",
-+        "@smithy/util-uri-escape": "^4.2.2",
-+        "@smithy/util-utf8": "^4.2.2",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/smithy-client": {
-+      "version": "4.12.13",
-+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.12.13.tgz",
-+      "integrity": "sha512-y/Pcj1V9+qG98gyu1gvftHB7rDpdh+7kIBIggs55yGm3JdtBV8GT8IFF3a1qxZ79QnaJHX9GXzvBG6tAd+czJA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/core": "^3.23.17",
-+        "@smithy/middleware-endpoint": "^4.4.32",
-+        "@smithy/middleware-stack": "^4.2.14",
-+        "@smithy/protocol-http": "^5.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-stream": "^4.5.25",
++        "@smithy/core": "^3.25.1",
++        "@smithy/types": "^4.15.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
@@ -3843,65 +2960,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@smithy/types": {
-+      "version": "4.14.1",
-+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.14.1.tgz",
-+      "integrity": "sha512-59b5HtSVrVR/eYNei3BUj3DCPKD/G7EtDDe7OEJE7i7FtQFugYo6MxbotS8mVJkLNVf8gYaAlEBwwtJ9HzhWSg==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/url-parser": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.14.tgz",
-+      "integrity": "sha512-p06BiBigJ8bTA3MgnOfCtDUWnAMY0YfedO/GRpmc7p+wg3KW8vbXy1xwSu5ASy0wV7rRYtlfZOIKH4XqfhjSQQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/querystring-parser": "^4.2.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-base64": {
-+      "version": "4.3.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.3.2.tgz",
-+      "integrity": "sha512-XRH6b0H/5A3SgblmMa5ErXQ2XKhfbQB+Fm/oyLZ2O2kCUrwgg55bU0RekmzAhuwOjA9qdN5VU2BprOvGGUkOOQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/util-buffer-from": "^4.2.2",
-+        "@smithy/util-utf8": "^4.2.2",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-body-length-browser": {
-+      "version": "4.2.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.2.tgz",
-+      "integrity": "sha512-JKCrLNOup3OOgmzeaKQwi4ZCTWlYR5H4Gm1r2uTMVBXoemo1UEghk5vtMi1xSu2ymgKVGW631e2fp9/R610ZjQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-body-length-node": {
-+      "version": "4.2.3",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.2.3.tgz",
-+      "integrity": "sha512-ZkJGvqBzMHVHE7r/hcuCxlTY8pQr1kMtdsVPs7ex4mMU+EAbcXppfo5NmyxMYi2XU49eqaz56j2gsk4dHHPG/g==",
++      "version": "4.15.0",
++      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.15.0.tgz",
++      "integrity": "sha512-Z5TAOxygoFvybJV3igo5SloFflSokHx2hu1eFA+DxDTcn+FtKxUSui+rbTRG1pAafMA888Z3MVvCWUuvCrTXjg==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
@@ -3912,182 +2973,31 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@smithy/util-buffer-from": {
-+      "version": "4.2.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.2.2.tgz",
-+      "integrity": "sha512-FDXD7cvUoFWwN6vtQfEta540Y/YBe5JneK3SoZg9bThSoOAC/eGeYEua6RkBgKjGa/sz6Y+DuBZj3+YEY21y4Q==",
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
++      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@smithy/is-array-buffer": "^4.2.2",
++        "@smithy/is-array-buffer": "^2.2.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-config-provider": {
-+      "version": "4.2.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.2.2.tgz",
-+      "integrity": "sha512-dWU03V3XUprJwaUIFVv4iOnS1FC9HnMHDfUrlNDSh4315v0cWyaIErP8KiqGVbf5z+JupoVpNM7ZB3jFiTejvQ==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-defaults-mode-browser": {
-+      "version": "4.3.49",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.49.tgz",
-+      "integrity": "sha512-a5bNrdiONYB/qE2BuKegvUMd/+ZDwdg4vsNuuSzYE8qs2EYAdK9CynL+Rzn29PbPiUqoz/cbpRbcLzD5lEevHw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-defaults-mode-node": {
-+      "version": "4.2.54",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.54.tgz",
-+      "integrity": "sha512-g1cvrJvOnzeJgEdf7AE4luI7gp6L8weE0y9a9wQUSGtjb8QRHDbCJYuE4Sy0SD9N8RrnNPFsPltAz/OSoBR9Zw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/config-resolver": "^4.4.17",
-+        "@smithy/credential-provider-imds": "^4.2.14",
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/property-provider": "^4.2.14",
-+        "@smithy/smithy-client": "^4.12.13",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-endpoints": {
-+      "version": "3.4.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.4.2.tgz",
-+      "integrity": "sha512-a55Tr+3OKld4TTtnT+RhKOQHyPxm3j/xL4OR83WBUhLJaKDS9dnJ7arRMOp3t31dcLhApwG9bgvrRXBHlLdIkg==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/node-config-provider": "^4.3.14",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-hex-encoding": {
-+      "version": "4.2.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.2.tgz",
-+      "integrity": "sha512-Qcz3W5vuHK4sLQdyT93k/rfrUwdJ8/HZ+nMUOyGdpeGA1Wxt65zYwi3oEl9kOM+RswvYq90fzkNDahPS8K0OIg==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-middleware": {
-+      "version": "4.2.14",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.14.tgz",
-+      "integrity": "sha512-1Su2vj9RYNDEv/V+2E+jXkkwGsgR7dc4sfHn9Z7ruzQHJIEni9zzw5CauvRXlFJfmgcqYP8fWa0dkh2Q2YaQyw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-retry": {
-+      "version": "4.3.4",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.3.4.tgz",
-+      "integrity": "sha512-FY1UQQ1VFmMwiYp1GVS4MeaGD5O0blLNYK0xCRHU+mJgeoH/hSY8Ld8sJWKQ6uznkh14HveRGQJncgPyNl9J+A==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/service-error-classification": "^4.3.0",
-+        "@smithy/types": "^4.14.1",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-stream": {
-+      "version": "4.5.25",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.25.tgz",
-+      "integrity": "sha512-/PFpG4k8Ze8Ei+mMKj3oiPICYekthuzePZMgZbCqMiXIHHf4n2aZ4Ps0aSRShycFTGuj/J6XldmC0x0DwednIA==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "@smithy/fetch-http-handler": "^5.3.17",
-+        "@smithy/node-http-handler": "^4.6.1",
-+        "@smithy/types": "^4.14.1",
-+        "@smithy/util-base64": "^4.3.2",
-+        "@smithy/util-buffer-from": "^4.2.2",
-+        "@smithy/util-hex-encoding": "^4.2.2",
-+        "@smithy/util-utf8": "^4.2.2",
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/util-uri-escape": {
-+      "version": "4.2.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.2.2.tgz",
-+      "integrity": "sha512-2kAStBlvq+lTXHyAZYfJRb/DfS3rsinLiwb+69SstC9Vb0s9vNWkRwpnj918Pfi85mzi42sOqdV72OLxWAISnw==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
++        "node": ">=14.0.0"
 +      }
 +    },
 +    "node_modules/@smithy/util-utf8": {
-+      "version": "4.2.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.2.2.tgz",
-+      "integrity": "sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw==",
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
++      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
-+        "@smithy/util-buffer-from": "^4.2.2",
++        "@smithy/util-buffer-from": "^2.2.0",
 +        "tslib": "^2.6.2"
 +      },
 +      "engines": {
-+        "node": ">=18.0.0"
-+      }
-+    },
-+    "node_modules/@smithy/uuid": {
-+      "version": "1.1.2",
-+      "resolved": "https://registry.npmjs.org/@smithy/uuid/-/uuid-1.1.2.tgz",
-+      "integrity": "sha512-O/IEdcCUKkubz60tFbGA7ceITTAJsty+lBjNoorP4Z6XRqaFb/OjQjZODophEcuq68nKm6/0r+6/lLQ+XVpk8g==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.6.2"
-+      },
-+      "engines": {
-+        "node": ">=18.0.0"
++        "node": ">=14.0.0"
 +      }
 +    },
 +    "node_modules/@so-ric/colorspace": {
@@ -4102,9 +3012,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@tootallnate/once": {
-+      "version": "2.0.0",
-+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.1.tgz",
++      "integrity": "sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==",
 +      "license": "MIT",
 +      "optional": true,
 +      "engines": {
@@ -4161,13 +3071,13 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/@types/node": {
-+      "version": "25.6.0",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
-+      "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
++      "version": "26.0.0",
++      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.0.0.tgz",
++      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "undici-types": "~7.19.0"
++        "undici-types": "~8.3.0"
 +      }
 +    },
 +    "node_modules/@types/readable-stream": {
@@ -4194,16 +3104,16 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/@types/request/node_modules/form-data": {
-+      "version": "2.5.5",
-+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.5.tgz",
-+      "integrity": "sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==",
++      "version": "2.5.6",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.6.tgz",
++      "integrity": "sha512-Ogz/E85h9tlfJzpI6TuFpGcHZFhLrb9Gw8wq9v40CxSCPnv7ahKr6Xgtkn0KYCDQJ8DNn5VoMO8EXr9V5PadyA==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "asynckit": "^0.4.0",
 +        "combined-stream": "^1.0.8",
 +        "es-set-tostringtag": "^2.1.0",
-+        "hasown": "^2.0.2",
++        "hasown": "^2.0.4",
 +        "mime-types": "^2.1.35",
 +        "safe-buffer": "^5.2.1"
 +      },
@@ -4701,9 +3611,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/acebase": {
-+      "version": "1.29.10",
-+      "resolved": "https://registry.npmjs.org/acebase/-/acebase-1.29.10.tgz",
-+      "integrity": "sha512-IiwxMtuGq5xkRxIgsnvlUzFTr50F81DCILW8/rqIiP2I9Wj4YW4bJ3O4dSNeUyh+kpWJkYuFBGl6EOwij/rNUw==",
++      "version": "1.29.12",
++      "resolved": "https://registry.npmjs.org/acebase/-/acebase-1.29.12.tgz",
++      "integrity": "sha512-AKhvMvP1cAt+fiHyQ9XdujvcRNCuFO237CrclYv1qsWeaEBvm0j4126IELa2AxJdu/HLhH8zHiz5HUCVijz2rQ==",
 +      "funding": [
 +        {
 +          "type": "GitHub sponsoring",
@@ -4788,9 +3698,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/acorn": {
-+      "version": "8.16.0",
-+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
++      "version": "8.17.0",
++      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
++      "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
 +      "license": "MIT",
 +      "optional": true,
 +      "bin": {
@@ -5053,6 +3963,19 @@ index 2af3a0d1..5c5f4b73 100644
 +        "node": ">= 8"
 +      }
 +    },
++    "node_modules/anynum": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/anynum/-/anynum-1.0.1.tgz",
++      "integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
++      "license": "MIT",
++      "optional": true
++    },
 +    "node_modules/append-transform": {
 +      "version": "1.0.0",
 +      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
@@ -5388,17 +4311,70 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/axios": {
-+      "version": "1.15.2",
-+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
-+      "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
++      "version": "1.18.0",
++      "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.0.tgz",
++      "integrity": "sha512-E32NzpYKp++W7XRe52rHiXV2ehxmh3wbdgO7MHeFM+vqxLBYHzt0ElkiImtOBxtOmyp0yoC8C6uESVV84Y2/hw==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "follow-redirects": "^1.15.11",
++        "follow-redirects": "^1.16.0",
 +        "form-data": "^4.0.5",
++        "https-proxy-agent": "^5.0.1",
 +        "proxy-from-env": "^2.1.0"
 +      }
 +    },
++    "node_modules/axios/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/axios/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/axios/node_modules/https-proxy-agent": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
++      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "agent-base": "6",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/axios/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
 +    "node_modules/b4a": {
 +      "version": "1.8.0",
 +      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
@@ -5608,9 +4584,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/baseline-browser-mapping": {
-+      "version": "2.10.21",
-+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz",
-+      "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==",
++      "version": "2.10.38",
++      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz",
++      "integrity": "sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "bin": {
@@ -6015,9 +4991,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/cacache/node_modules/brace-expansion": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
-+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
++      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -6201,9 +5177,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/caniuse-lite": {
-+      "version": "1.0.30001790",
-+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz",
-+      "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==",
++      "version": "1.0.30001799",
++      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
++      "integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==",
 +      "funding": [
 +        {
 +          "type": "opencollective",
@@ -7020,9 +5996,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/dayjs": {
-+      "version": "1.11.20",
-+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
-+      "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==",
++      "version": "1.11.21",
++      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz",
++      "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==",
 +      "license": "MIT",
 +      "optional": true
 +    },
@@ -7203,9 +6179,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/discord-api-types": {
-+      "version": "0.38.47",
-+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.47.tgz",
-+      "integrity": "sha512-XgXQodHQBAE6kfD7kMvVo30863iHX1LHSqNq6MGUTDwIFCCvHva13+rwxyxVXDqudyApMNAd32PGjgVETi5rjA==",
++      "version": "0.38.49",
++      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.49.tgz",
++      "integrity": "sha512-XnqcWmnFZFAE8ZM8SHAw9DIV8D3Or00rMQ8iQLotrEA2PmXhl+ykaf6L6q4l474hrSUH1JaYcv+iOMRWp2p6Tg==",
 +      "license": "MIT",
 +      "optional": true,
 +      "workspaces": [
@@ -7213,9 +6189,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      ]
 +    },
 +    "node_modules/discord.js": {
-+      "version": "14.26.3",
-+      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.26.3.tgz",
-+      "integrity": "sha512-XEKtYn28YFsiJ5l4fLRyikdbo6RD5oFyqfVHQlvXz2104JhH/E8slN28dbky05w3DCrJcNVWvhVvcJCTSl/KIg==",
++      "version": "14.26.4",
++      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.26.4.tgz",
++      "integrity": "sha512-4oBp8tc6Kf8IDBwAHhbsMaAqx1b5fob9SNasZT7V6yyyUydoO5i5fGuX7TmvRtR+q/WgKRnRViRoAWnG7fNyvA==",
 +      "license": "Apache-2.0",
 +      "optional": true,
 +      "dependencies": {
@@ -7424,9 +6400,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "MIT"
 +    },
 +    "node_modules/electron-to-chromium": {
-+      "version": "1.5.344",
-+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.344.tgz",
-+      "integrity": "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg==",
++      "version": "1.5.376",
++      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.376.tgz",
++      "integrity": "sha512-cUVA7/RvbFTEuw/i3obUwDTRIXojaxkResf+ibByPFxjc6XK3VNtcQXV0NSbAlJ0FMjcJGgftVVB4Qo184EXvA==",
 +      "license": "ISC",
 +      "optional": true
 +    },
@@ -7594,6 +6570,25 @@ index 2af3a0d1..5c5f4b73 100644
 +        "url": "https://github.com/sponsors/ljharb"
 +      }
 +    },
++    "node_modules/es-abstract-get": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/es-abstract-get/-/es-abstract-get-1.0.0.tgz",
++      "integrity": "sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "es-object-atoms": "^1.1.2",
++        "is-callable": "^1.2.7",
++        "object-inspect": "^1.13.4"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
 +    "node_modules/es-array-method-boxes-properly": {
 +      "version": "1.0.0",
 +      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
@@ -7620,9 +6615,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/es-object-atoms": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz",
++      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
 +      "license": "MIT",
 +      "dependencies": {
 +        "es-errors": "^1.3.0"
@@ -7648,15 +6643,17 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/es-to-primitive": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
++      "version": "1.3.1",
++      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.1.tgz",
++      "integrity": "sha512-CxN9N56HYfd2m/acc/NOFrZQsN9kU4eh+2kk6A707Kz1krH8tKmfrs5RnftB8WNX80T0NS7vSQsDOlg23diR2g==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
++        "es-abstract-get": "^1.0.0",
++        "es-errors": "^1.3.0",
 +        "is-callable": "^1.2.7",
-+        "is-date-object": "^1.0.5",
-+        "is-symbol": "^1.0.4"
++        "is-date-object": "^1.1.0",
++        "is-symbol": "^1.1.1"
 +      },
 +      "engines": {
 +        "node": ">= 0.4"
@@ -8013,9 +7010,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/fast-xml-builder": {
-+      "version": "1.1.5",
-+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz",
-+      "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==",
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
++      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
 +      "funding": [
 +        {
 +          "type": "github",
@@ -8025,13 +7022,14 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "path-expression-matcher": "^1.1.3"
++        "path-expression-matcher": "^1.5.0",
++        "xml-naming": "^0.1.0"
 +      }
 +    },
 +    "node_modules/fast-xml-parser": {
-+      "version": "5.7.2",
-+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.2.tgz",
-+      "integrity": "sha512-P7oW7tLbYnhOLQk/Gv7cZgzgMPP/XN03K02/Jy6Y/NHzyIAIpxuZIM/YqAkfiXFPxA2CTm7NtCijK9EDu09u2w==",
++      "version": "5.9.3",
++      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz",
++      "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==",
 +      "funding": [
 +        {
 +          "type": "github",
@@ -8041,10 +7039,12 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "@nodable/entities": "^2.1.0",
-+        "fast-xml-builder": "^1.1.5",
++        "@nodable/entities": "^2.2.0",
++        "fast-xml-builder": "^1.2.0",
++        "is-unsafe": "^1.0.1",
 +        "path-expression-matcher": "^1.5.0",
-+        "strnum": "^2.2.3"
++        "strnum": "^2.4.1",
++        "xml-naming": "^0.1.0"
 +      },
 +      "bin": {
 +        "fxparser": "src/cli/cli.js"
@@ -8250,9 +7250,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/firebase-admin/node_modules/@types/node": {
-+      "version": "22.19.17",
-+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.17.tgz",
-+      "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==",
++      "version": "22.19.21",
++      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.21.tgz",
++      "integrity": "sha512-VMeFBSCKQKmm2swI2kW51SFusDqekC6q9trBCvJ/JliDchFSuoYYKN7yVNjPthP1HKZcx3U1gI/wTcEBjEFKTA==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -8336,17 +7336,17 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/form-data": {
-+      "version": "4.0.5",
-+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
++      "version": "4.0.6",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
++      "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "asynckit": "^0.4.0",
 +        "combined-stream": "^1.0.8",
 +        "es-set-tostringtag": "^2.1.0",
-+        "hasown": "^2.0.2",
-+        "mime-types": "^2.1.12"
++        "hasown": "^2.0.4",
++        "mime-types": "^2.1.35"
 +      },
 +      "engines": {
 +        "node": ">= 6"
@@ -8454,18 +7454,21 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/function.prototype.name": {
-+      "version": "1.1.8",
-+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.2.0.tgz",
++      "integrity": "sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "call-bind": "^1.0.8",
-+        "call-bound": "^1.0.3",
-+        "define-properties": "^1.2.1",
++        "call-bind": "^1.0.9",
++        "call-bound": "^1.0.4",
++        "es-define-property": "^1.0.1",
++        "es-errors": "^1.3.0",
 +        "functions-have-names": "^1.2.3",
-+        "hasown": "^2.0.2",
-+        "is-callable": "^1.2.7"
++        "has-property-descriptors": "^1.0.2",
++        "hasown": "^2.0.4",
++        "is-callable": "^1.2.7",
++        "is-document.all": "^1.0.0"
 +      },
 +      "engines": {
 +        "node": ">= 0.4"
@@ -8613,6 +7616,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "9.0.1",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
 +      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "funding": [
 +        "https://github.com/sponsors/broofa",
 +        "https://github.com/sponsors/ctavan"
@@ -8892,6 +7896,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "9.0.1",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
 +      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "funding": [
 +        "https://github.com/sponsors/broofa",
 +        "https://github.com/sponsors/ctavan"
@@ -8973,6 +7978,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "9.0.1",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
 +      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "funding": [
 +        "https://github.com/sponsors/broofa",
 +        "https://github.com/sponsors/ctavan"
@@ -9193,9 +8199,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/hasown": {
-+      "version": "2.0.2",
-+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
++      "version": "2.0.4",
++      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
++      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
 +      "license": "MIT",
 +      "dependencies": {
 +        "function-bind": "^1.1.2"
@@ -9583,6 +8589,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "8.3.2",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
 +      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "license": "MIT",
 +      "optional": true,
 +      "bin": {
@@ -9678,9 +8685,11 @@ index 2af3a0d1..5c5f4b73 100644
 +        "once": "^1.3.0",
 +        "wrappy": "1"
 +      }
-+    },
-+    "node_modules/inherits": {
-+      "version": "2.0.4",
+     },
+     "node_modules/inherits": {
+       "version": "2.0.4",
+-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
 +      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
 +      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
 +      "license": "ISC"
@@ -9952,13 +8961,13 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/is-core-module": {
-+      "version": "2.16.1",
-+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
++      "version": "2.16.2",
++      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz",
++      "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "hasown": "^2.0.2"
++        "hasown": "^2.0.3"
 +      },
 +      "engines": {
 +        "node": ">= 0.4"
@@ -10002,6 +9011,22 @@ index 2af3a0d1..5c5f4b73 100644
 +        "url": "https://github.com/sponsors/ljharb"
 +      }
 +    },
++    "node_modules/is-document.all": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/is-document.all/-/is-document.all-1.0.0.tgz",
++      "integrity": "sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.4"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
 +    "node_modules/is-extglob": {
 +      "version": "2.1.1",
 +      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -10272,6 +9297,19 @@ index 2af3a0d1..5c5f4b73 100644
 +      "license": "MIT",
 +      "optional": true
 +    },
++    "node_modules/is-unsafe": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-1.0.1.tgz",
++      "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
++      "license": "MIT",
++      "optional": true
++    },
 +    "node_modules/is-weakmap": {
 +      "version": "2.0.2",
 +      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
@@ -10545,9 +9583,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/joi": {
-+      "version": "17.13.3",
-+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
-+      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
++      "version": "17.13.4",
++      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.4.tgz",
++      "integrity": "sha512-1RuuER6kmt8K8I3nIWvPZKi5RQCb568ZPyY4Pwjlua+yo+63ZTmIwxLZH0heBmiKN4uxjvCiarDrjaeH84xicQ==",
 +      "license": "BSD-3-Clause",
 +      "optional": true,
 +      "dependencies": {
@@ -10786,9 +9824,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/jsonwebtoken/node_modules/semver": {
-+      "version": "7.7.4",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "version": "7.8.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
++      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
 +      "license": "ISC",
 +      "optional": true,
 +      "bin": {
@@ -11481,20 +10519,20 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/mariadb": {
-+      "version": "3.5.2",
-+      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.5.2.tgz",
-+      "integrity": "sha512-9rztrI4nouxAY/82a+RlzzZ5ie2vxu2eYclkBvTy1ATXH1B9cnvZ0O71Pzsy/mlfDb5P3HhOg0JzQKkDRhctyA==",
++      "version": "3.5.3",
++      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.5.3.tgz",
++      "integrity": "sha512-i053Kc0MgdUv/hu9mCyq67TYfPXFj3/MV8I7ZW5wvJNixIyXC0VztMPUjIVj/449nQo+BsxFD4Fdk/sA/uqKPQ==",
 +      "license": "LGPL-2.1-or-later",
 +      "optional": true,
 +      "dependencies": {
 +        "@types/geojson": "^7946.0.16",
-+        "@types/node": ">=18",
++        "@types/node": ">=20",
 +        "denque": "^2.1.0",
 +        "iconv-lite": "^0.7.2",
-+        "lru-cache": "^10.4.3"
++        "lru-cache": "^11.5.0"
 +      },
 +      "engines": {
-+        "node": ">= 18"
++        "node": ">= 20.0.0"
 +      }
 +    },
 +    "node_modules/mariadb/node_modules/iconv-lite": {
@@ -11514,6 +10552,16 @@ index 2af3a0d1..5c5f4b73 100644
 +        "url": "https://opencollective.com/express"
 +      }
 +    },
++    "node_modules/mariadb/node_modules/lru-cache": {
++      "version": "11.5.1",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz",
++      "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==",
++      "license": "BlueOak-1.0.0",
++      "optional": true,
++      "engines": {
++        "node": "20 || >=22"
++      }
++    },
 +    "node_modules/math-intrinsics": {
 +      "version": "1.1.0",
 +      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -11691,9 +10739,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/minio/node_modules/ipaddr.js": {
-+      "version": "2.3.0",
-+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.3.0.tgz",
-+      "integrity": "sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==",
++      "version": "2.4.0",
++      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.4.0.tgz",
++      "integrity": "sha512-9VGk3HGanVE6JoZXHiCpnGy5X0jYDnN4EA4lntFPj+1vIWlFhIylq2CrrCOJH9EAhc5CYhq18F2Av2tgoAPsYQ==",
 +      "license": "MIT",
 +      "optional": true,
 +      "engines": {
@@ -12231,9 +11279,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/mysql2": {
-+      "version": "3.22.2",
-+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.2.tgz",
-+      "integrity": "sha512-snC/L6YoCJPFpozZo3p3hiOlt9ItQ7sCnLSziFLlIttEzsPhrdcPT8g21BiQ7Oqif25W4Xq1IFuBzBvoFYDf0Q==",
++      "version": "3.22.5",
++      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.5.tgz",
++      "integrity": "sha512-95uZ2TrPWAZdwpB3vvvDbmEMcNG8yIeNCyu6GUcr/QnWEE/wXm7+mhOCsdQfWQDTV7qYT/PDUZ4U4UPP4AsXqQ==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -12284,9 +11332,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/nan": {
-+      "version": "2.26.2",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
-+      "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
++      "version": "2.27.0",
++      "resolved": "https://registry.npmjs.org/nan/-/nan-2.27.0.tgz",
++      "integrity": "sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ==",
 +      "license": "MIT",
 +      "optional": true
 +    },
@@ -12345,9 +11393,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/node-abi": {
-+      "version": "3.89.0",
-+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.89.0.tgz",
-+      "integrity": "sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==",
++      "version": "3.92.0",
++      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.92.0.tgz",
++      "integrity": "sha512-KdHvFWZjEKDf0cakgFjebl371GPsISX2oZHcuyKqM7DtogIsHrqKeLTo8wBHxaXRAQlY2PsPlZmfo+9ZCxEREQ==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -12358,9 +11406,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/node-abi/node_modules/semver": {
-+      "version": "7.7.4",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "version": "7.8.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
++      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
 +      "license": "ISC",
 +      "optional": true,
 +      "bin": {
@@ -12485,9 +11533,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/node-gyp/node_modules/brace-expansion": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
-+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
++      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -12548,9 +11596,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/node-gyp/node_modules/semver": {
-+      "version": "7.7.4",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "version": "7.8.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
++      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
 +      "license": "ISC",
 +      "optional": true,
 +      "bin": {
@@ -12595,11 +11643,14 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/node-releases": {
-+      "version": "2.0.38",
-+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz",
-+      "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==",
++      "version": "2.0.48",
++      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.48.tgz",
++      "integrity": "sha512-1uz8041X6LoI6ZSdZacM9lVY28vuzDlSKitnpbSNK0RfKoIJkX29NBPVEFXhnuSuEOA9Ww0xnPJ+ILWbGAv8DA==",
 +      "license": "MIT",
-+      "optional": true
++      "optional": true,
++      "engines": {
++        "node": ">=18"
++      }
 +    },
 +    "node_modules/node-sspi": {
 +      "version": "0.2.11",
@@ -12779,9 +11830,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/nwsapi": {
-+      "version": "2.2.23",
-+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz",
-+      "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
++      "version": "2.2.24",
++      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.24.tgz",
++      "integrity": "sha512-7YRhZ3jS45LwmSCT4b2sVFHt/WuovaktDU07QrtOBY2PXskss5a9jfmR9jptyumwXST+rFjrmppMY1KT/yn35A==",
 +      "license": "MIT",
 +      "optional": true
 +    },
@@ -12849,9 +11900,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/nyc/node_modules/brace-expansion": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
-+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
++      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -13019,7 +12070,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "3.4.0",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
 +      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "license": "MIT",
 +      "optional": true,
 +      "bin": {
@@ -13941,16 +12992,16 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/pg-cloudflare": {
-+      "version": "1.3.0",
-+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz",
-+      "integrity": "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==",
++      "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.4.0.tgz",
++      "integrity": "sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A==",
 +      "license": "MIT",
 +      "optional": true
 +    },
 +    "node_modules/pg-connection-string": {
-+      "version": "2.12.0",
-+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.12.0.tgz",
-+      "integrity": "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==",
++      "version": "2.14.0",
++      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.14.0.tgz",
++      "integrity": "sha512-XwWDGcLRGCXAR8F/AM5bG7Q+A3Wm2s6QeEjlOKZLlH3UYcguiqCWKyWXVag5TLTIjR7oOJUY8kcADaZgWPyLeg==",
 +      "license": "MIT",
 +      "optional": true
 +    },
@@ -13965,9 +13016,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/pg-pool": {
-+      "version": "3.13.0",
-+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.13.0.tgz",
-+      "integrity": "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==",
++      "version": "3.14.0",
++      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.14.0.tgz",
++      "integrity": "sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw==",
 +      "license": "MIT",
 +      "optional": true,
 +      "peerDependencies": {
@@ -13975,9 +13026,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/pg-protocol": {
-+      "version": "1.13.0",
-+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
-+      "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
++      "version": "1.15.0",
++      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.15.0.tgz",
++      "integrity": "sha512-cq9sECI5s0+uPUXjbz8ioyPJni6RzsRib0US67i5IoTZKw8fNeYlVE7u8F4dG7vEJJtc5wdD1K189lCCUwqWTQ==",
 +      "license": "MIT",
 +      "optional": true
 +    },
@@ -14062,9 +13113,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/plivo": {
-+      "version": "4.76.2",
-+      "resolved": "https://registry.npmjs.org/plivo/-/plivo-4.76.2.tgz",
-+      "integrity": "sha512-W8bfvPKng/krEUYi7Gh2Pib7soYZm6TkiHcbKm2hRQVRkvek/FYRek+7Nb2FJ/vT6p/S8F3BKbrHjnkeT5XEJg==",
++      "version": "4.78.0",
++      "resolved": "https://registry.npmjs.org/plivo/-/plivo-4.78.0.tgz",
++      "integrity": "sha512-Z74Yzcy/uNyfApTBIJunGI2PlgUSMgJ/LKSkHxEWKu8usZ8fmdre9cowaqzHerOBxaAbc1EPqGgNG5CcsUmwNw==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -14347,25 +13398,24 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/protobufjs": {
-+      "version": "7.5.5",
-+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.5.tgz",
-+      "integrity": "sha512-3wY1AxV+VBNW8Yypfd1yQY9pXnqTAN+KwQxL8iYm3/BjKYMNg4i0owhEe26PWDOMaIrzeeF98Lqd5NGz4omiIg==",
++      "version": "7.6.4",
++      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.4.tgz",
++      "integrity": "sha512-RJJPTTpvFfHcWLkIa2JFWK4XvtSzS0yEWDmunqHXli1h3JlkbcQZXDZdcWxv+JK3Xsl5/UFDPZ0iGm7DAengYw==",
 +      "hasInstallScript": true,
 +      "license": "BSD-3-Clause",
 +      "optional": true,
 +      "dependencies": {
 +        "@protobufjs/aspromise": "^1.1.2",
 +        "@protobufjs/base64": "^1.1.2",
-+        "@protobufjs/codegen": "^2.0.4",
-+        "@protobufjs/eventemitter": "^1.1.0",
-+        "@protobufjs/fetch": "^1.1.0",
++        "@protobufjs/codegen": "^2.0.5",
++        "@protobufjs/eventemitter": "^1.1.1",
++        "@protobufjs/fetch": "^1.1.1",
 +        "@protobufjs/float": "^1.0.2",
-+        "@protobufjs/inquire": "^1.1.0",
 +        "@protobufjs/path": "^1.1.2",
 +        "@protobufjs/pool": "^1.1.0",
-+        "@protobufjs/utf8": "^1.1.0",
++        "@protobufjs/utf8": "^1.1.1",
 +        "@types/node": ">=13.7.0",
-+        "long": "^5.0.0"
++        "long": "^5.3.2"
 +      },
 +      "engines": {
 +        "node": ">=12.0.0"
@@ -14807,7 +13857,7 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "3.4.0",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
 +      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "license": "MIT",
 +      "optional": true,
 +      "bin": {
@@ -14955,9 +14005,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/rimraf/node_modules/brace-expansion": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
-+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
++      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -15329,8 +14379,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "1.2.0",
 +      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
 +      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-+      "license": "ISC"
-+    },
+       "license": "ISC"
+     },
+-    "node_modules/ipaddr.js": {
 +    "node_modules/shallow-clone": {
 +      "version": "3.0.1",
 +      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -15541,13 +14592,13 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/socks": {
-+      "version": "2.8.7",
-+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
-+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
++      "version": "2.8.9",
++      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz",
++      "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "ip-address": "^10.0.1",
++        "ip-address": "^10.1.1",
 +        "smart-buffer": "^4.2.0"
 +      },
 +      "engines": {
@@ -15609,9 +14660,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/socks/node_modules/ip-address": {
-+      "version": "10.1.0",
-+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
-+      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
++      "version": "10.2.0",
++      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
++      "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
 +      "license": "MIT",
 +      "optional": true,
 +      "engines": {
@@ -15969,7 +15020,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/stream-json": {
-+      "version": "1.9.1",
+       "version": "1.9.1",
+-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
 +      "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz",
 +      "integrity": "sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==",
 +      "license": "BSD-3-Clause",
@@ -16019,43 +15072,72 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "5.1.2",
 +      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
 +      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "dependencies": {
 +        "eastasianwidth": "^0.2.0",
 +        "emoji-regex": "^9.2.2",
 +        "strip-ansi": "^7.0.1"
 +      },
-+      "engines": {
+       "engines": {
+-        "node": ">= 0.10"
 +        "node": ">=12"
 +      },
 +      "funding": {
 +        "url": "https://github.com/sponsors/sindresorhus"
-+      }
-+    },
+       }
+     },
+-    "node_modules/ipcheck": {
+-      "version": "0.1.0",
+-      "resolved": "https://registry.npmjs.org/ipcheck/-/ipcheck-0.1.0.tgz",
+-      "integrity": "sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ==",
+-      "license": "MIT"
+-    },
+-    "node_modules/is-arguments": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
+-      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
 +    "node_modules/string-width-cjs": {
 +      "name": "string-width",
 +      "version": "4.2.3",
 +      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 +      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-+      "license": "MIT",
-+      "dependencies": {
+       "license": "MIT",
+       "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "has-tostringtag": "^1.0.2"
 +        "emoji-regex": "^8.0.0",
 +        "is-fullwidth-code-point": "^3.0.0",
 +        "strip-ansi": "^6.0.1"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +        "node": ">=8"
-+      }
-+    },
+       }
+     },
+-    "node_modules/is-callable": {
+-      "version": "1.2.7",
+-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
 +    "node_modules/string-width-cjs/node_modules/ansi-regex": {
 +      "version": "5.0.1",
 +      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
 +      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-+      "license": "MIT",
-+      "engines": {
+       "license": "MIT",
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +        "node": ">=8"
-+      }
-+    },
+       }
+     },
+-    "node_modules/is-fullwidth-code-point": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 +    "node_modules/string-width-cjs/node_modules/emoji-regex": {
 +      "version": "8.0.0",
 +      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -16066,88 +15148,119 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "6.0.1",
 +      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 +      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "dependencies": {
 +        "ansi-regex": "^5.0.1"
 +      },
-+      "engines": {
-+        "node": ">=8"
-+      }
-+    },
+       "engines": {
+         "node": ">=8"
+       }
+     },
+-    "node_modules/is-generator-function": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+-      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
 +    "node_modules/string.prototype.trim": {
-+      "version": "1.2.10",
-+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
-+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
-+      "license": "MIT",
++      "version": "1.2.11",
++      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz",
++      "integrity": "sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
-+        "call-bind": "^1.0.8",
-+        "call-bound": "^1.0.2",
+       "dependencies": {
++        "call-bind": "^1.0.9",
+         "call-bound": "^1.0.4",
+-        "generator-function": "^2.0.0",
+-        "get-proto": "^1.0.1",
+-        "has-tostringtag": "^1.0.2",
 +        "define-data-property": "^1.1.4",
 +        "define-properties": "^1.2.1",
-+        "es-abstract": "^1.23.5",
-+        "es-object-atoms": "^1.0.0",
-+        "has-property-descriptors": "^1.0.2"
-+      },
-+      "engines": {
-+        "node": ">= 0.4"
-+      },
-+      "funding": {
-+        "url": "https://github.com/sponsors/ljharb"
-+      }
-+    },
++        "es-abstract": "^1.24.2",
++        "es-object-atoms": "^1.1.2",
++        "has-property-descriptors": "^1.0.2",
+         "safe-regex-test": "^1.1.0"
+       },
+       "engines": {
+@@ -1345,16 +14291,17 @@
+         "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/is-regex": {
+-      "version": "1.2.1",
+-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+-      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
 +    "node_modules/string.prototype.trimend": {
-+      "version": "1.0.9",
-+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
-+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
-+      "license": "MIT",
++      "version": "1.0.10",
++      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.10.tgz",
++      "integrity": "sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw==",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
-+        "call-bind": "^1.0.8",
-+        "call-bound": "^1.0.2",
+       "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "gopd": "^1.2.0",
+-        "has-tostringtag": "^1.0.2",
+-        "hasown": "^2.0.2"
++        "call-bind": "^1.0.9",
++        "call-bound": "^1.0.4",
 +        "define-properties": "^1.2.1",
-+        "es-object-atoms": "^1.0.0"
-+      },
-+      "engines": {
-+        "node": ">= 0.4"
-+      },
-+      "funding": {
-+        "url": "https://github.com/sponsors/ljharb"
-+      }
-+    },
++        "es-object-atoms": "^1.1.2"
+       },
+       "engines": {
+         "node": ">= 0.4"
+@@ -1363,712 +14310,977 @@
+         "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/is-stream": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
 +    "node_modules/string.prototype.trimstart": {
 +      "version": "1.0.8",
 +      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
 +      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "call-bind": "^1.0.7",
 +        "define-properties": "^1.2.1",
 +        "es-object-atoms": "^1.0.0"
 +      },
-+      "engines": {
+       "engines": {
+-        "node": ">=8"
 +        "node": ">= 0.4"
-+      },
-+      "funding": {
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
 +        "url": "https://github.com/sponsors/ljharb"
-+      }
-+    },
+       }
+     },
+-    "node_modules/is-typed-array": {
+-      "version": "1.1.15",
+-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+-      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
 +    "node_modules/strip-ansi": {
 +      "version": "7.2.0",
 +      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
 +      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
-+      "license": "MIT",
-+      "dependencies": {
+       "license": "MIT",
+       "dependencies": {
+-        "which-typed-array": "^1.1.16"
 +        "ansi-regex": "^6.2.2"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.4"
 +        "node": ">=12"
-+      },
-+      "funding": {
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-+      }
-+    },
+       }
+     },
+-    "node_modules/isarray": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+-      "license": "MIT"
 +    "node_modules/strip-ansi-cjs": {
 +      "name": "strip-ansi",
 +      "version": "6.0.1",
@@ -16160,7 +15273,12 @@ index 2af3a0d1..5c5f4b73 100644
 +      "engines": {
 +        "node": ">=8"
 +      }
-+    },
+     },
+-    "node_modules/isexe": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+-      "license": "ISC"
 +    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
 +      "version": "5.0.1",
 +      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -16169,7 +15287,12 @@ index 2af3a0d1..5c5f4b73 100644
 +      "engines": {
 +        "node": ">=8"
 +      }
-+    },
+     },
+-    "node_modules/jackspeak": {
+-      "version": "3.4.3",
+-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+-      "license": "BlueOak-1.0.0",
 +    "node_modules/strip-bom": {
 +      "version": "3.0.0",
 +      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -16191,9 +15314,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      }
 +    },
 +    "node_modules/strnum": {
-+      "version": "2.2.3",
-+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
-+      "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
++      "version": "2.4.1",
++      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.4.1.tgz",
++      "integrity": "sha512-M9eUSMT2dCB2cTNPG7UYj6KuK7RJR2SN2+yCV/fTW3xzTCS6EaGZ5pSMgDIjB7r8zSfTGk+dvvn9rTjpVS9Mwg==",
 +      "funding": [
 +        {
 +          "type": "github",
@@ -16201,7 +15324,11 @@ index 2af3a0d1..5c5f4b73 100644
 +        }
 +      ],
 +      "license": "MIT",
-+      "optional": true
++      "optional": true,
+       "dependencies": {
+-        "@isaacs/cliui": "^8.0.2"
++        "anynum": "^1.0.1"
++      }
 +    },
 +    "node_modules/stubs": {
 +      "version": "3.0.0",
@@ -16228,29 +15355,43 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true,
 +      "engines": {
 +        "node": ">= 0.4"
-+      },
-+      "funding": {
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
+-      },
+-      "optionalDependencies": {
+-        "@pkgjs/parseargs": "^0.11.0"
 +        "url": "https://github.com/sponsors/ljharb"
-+      }
-+    },
+       }
+     },
+-    "node_modules/keygrip": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+-      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
 +    "node_modules/svg-captcha": {
 +      "version": "1.4.0",
 +      "resolved": "https://registry.npmjs.org/svg-captcha/-/svg-captcha-1.4.0.tgz",
 +      "integrity": "sha512-/fkkhavXPE57zRRCjNqAP3txRCSncpMx3NnNZL7iEoyAtYwUjPhJxW6FQTQPG5UPEmCrbFoXS10C3YdJlW7PDg==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "tsscmp": "1.0.6"
 +        "opentype.js": "^0.7.3"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.6"
 +        "node": ">=4.x"
-+      }
-+    },
+       }
+     },
+-    "node_modules/lazystream": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+-      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
 +    "node_modules/symbol-tree": {
 +      "version": "3.2.4",
 +      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
 +      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true
 +    },
 +    "node_modules/syslog": {
@@ -16269,43 +15410,71 @@ index 2af3a0d1..5c5f4b73 100644
 +      "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
 +      "license": "ISC",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "readable-stream": "^2.0.5"
 +        "chownr": "^2.0.0",
 +        "fs-minipass": "^2.0.0",
 +        "minipass": "^5.0.0",
 +        "minizlib": "^2.1.1",
 +        "mkdirp": "^1.0.3",
 +        "yallist": "^4.0.0"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.6.3"
 +        "node": ">=10"
-+      }
-+    },
+       }
+     },
+-    "node_modules/lazystream/node_modules/readable-stream": {
+-      "version": "2.3.8",
+-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
 +    "node_modules/tar-fs": {
 +      "version": "2.1.4",
 +      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
 +      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "core-util-is": "~1.0.0",
+-        "inherits": "~2.0.3",
+-        "isarray": "~1.0.0",
+-        "process-nextick-args": "~2.0.0",
+-        "safe-buffer": "~5.1.1",
+-        "string_decoder": "~1.1.1",
+-        "util-deprecate": "~1.0.1"
 +        "chownr": "^1.1.1",
 +        "mkdirp-classic": "^0.5.2",
 +        "pump": "^3.0.0",
 +        "tar-stream": "^2.1.4"
-+      }
-+    },
+       }
+     },
+-    "node_modules/lazystream/node_modules/safe-buffer": {
+-      "version": "5.1.2",
+-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+-      "license": "MIT"
+-    },
+-    "node_modules/lazystream/node_modules/string_decoder": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 +    "node_modules/tar-fs/node_modules/bl": {
 +      "version": "4.1.0",
 +      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
 +      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "safe-buffer": "~5.1.0"
 +        "buffer": "^5.5.0",
 +        "inherits": "^2.0.4",
 +        "readable-stream": "^3.4.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/lie": {
+-      "version": "3.1.1",
+-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+-      "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
 +    "node_modules/tar-fs/node_modules/buffer": {
 +      "version": "5.7.1",
 +      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -16324,40 +15493,70 @@ index 2af3a0d1..5c5f4b73 100644
 +          "url": "https://feross.org/support"
 +        }
 +      ],
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "immediate": "~3.0.5"
+-      }
+-    },
+-    "node_modules/localforage": {
+-      "version": "1.10.0",
+-      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+-      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+-      "license": "Apache-2.0",
+-      "dependencies": {
+-        "lie": "3.1.1"
 +        "base64-js": "^1.3.1",
 +        "ieee754": "^1.1.13"
-+      }
-+    },
+       }
+     },
+-    "node_modules/lodash": {
+-      "version": "4.17.23",
+-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+-      "license": "MIT"
+-    },
+-    "node_modules/lru-cache": {
+-      "version": "10.4.3",
+-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+-      "license": "ISC"
 +    "node_modules/tar-fs/node_modules/chownr": {
 +      "version": "1.1.4",
 +      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
 +      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
 +      "license": "ISC",
 +      "optional": true
-+    },
+     },
+-    "node_modules/math-intrinsics": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
 +    "node_modules/tar-fs/node_modules/readable-stream": {
 +      "version": "3.6.2",
 +      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
 +      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "inherits": "^2.0.3",
 +        "string_decoder": "^1.1.1",
 +        "util-deprecate": "^1.0.1"
 +      },
-+      "engines": {
+       "engines": {
+-        "node": ">= 0.4"
 +        "node": ">= 6"
-+      }
-+    },
+       }
+     },
+-    "node_modules/media-typer": {
+-      "version": "0.3.0",
+-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
 +    "node_modules/tar-fs/node_modules/tar-stream": {
 +      "version": "2.2.0",
 +      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
 +      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "bl": "^4.0.3",
@@ -16366,134 +15565,229 @@ index 2af3a0d1..5c5f4b73 100644
 +        "inherits": "^2.0.3",
 +        "readable-stream": "^3.1.1"
 +      },
-+      "engines": {
+       "engines": {
+-        "node": ">= 0.6"
 +        "node": ">=6"
-+      }
-+    },
+       }
+     },
+-    "node_modules/merge-descriptors": {
+-      "version": "1.0.3",
+-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
 +    "node_modules/tar-stream": {
 +      "version": "3.1.8",
 +      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
 +      "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
 +      "dependencies": {
 +        "b4a": "^1.6.4",
 +        "bare-fs": "^4.5.5",
 +        "fast-fifo": "^1.2.0",
 +        "streamx": "^2.15.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/methods": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+-      "license": "MIT",
 +    "node_modules/tar/node_modules/minipass": {
 +      "version": "5.0.0",
 +      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
 +      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
 +      "license": "ISC",
 +      "optional": true,
-+      "engines": {
+       "engines": {
+-        "node": ">= 0.6"
 +        "node": ">=8"
-+      }
-+    },
+       }
+     },
+-    "node_modules/mime": {
+-      "version": "1.6.0",
+-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
 +    "node_modules/tar/node_modules/mkdirp": {
 +      "version": "1.0.4",
 +      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
 +      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "bin": {
+       "bin": {
+-        "mime": "cli.js"
 +        "mkdirp": "bin/cmd.js"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">=4"
 +        "node": ">=10"
-+      }
-+    },
+       }
+     },
+-    "node_modules/mime-db": {
+-      "version": "1.54.0",
+-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
 +    "node_modules/tdigest": {
 +      "version": "0.1.2",
 +      "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz",
 +      "integrity": "sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
 +      "optional": true,
 +      "dependencies": {
 +        "bintrees": "1.0.2"
-+      }
-+    },
+       }
+     },
+-    "node_modules/mime-types": {
+-      "version": "2.1.35",
+-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+-      "license": "MIT",
 +    "node_modules/teeny-request": {
 +      "version": "9.0.0",
 +      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
 +      "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==",
 +      "license": "Apache-2.0",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "mime-db": "1.52.0"
 +        "http-proxy-agent": "^5.0.0",
 +        "https-proxy-agent": "^5.0.0",
 +        "node-fetch": "^2.6.9",
 +        "stream-events": "^1.0.5",
 +        "uuid": "^9.0.0"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.6"
 +        "node": ">=14"
-+      }
-+    },
+       }
+     },
+-    "node_modules/mime-types/node_modules/mime-db": {
+-      "version": "1.52.0",
+-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
 +    "node_modules/teeny-request/node_modules/agent-base": {
 +      "version": "6.0.2",
 +      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
 +      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
+-      }
+-    },
+-    "node_modules/minimatch": {
+-      "version": "9.0.9",
+-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+-      "license": "ISC",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "brace-expansion": "^2.0.2"
 +        "debug": "4"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">=16 || 14 >=14.17"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
 +        "node": ">= 6.0.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/minimist": {
+-      "version": "1.2.8",
+-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
 +    "node_modules/teeny-request/node_modules/debug": {
 +      "version": "4.4.3",
 +      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
 +      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
+-      }
+-    },
+-    "node_modules/minipass": {
+-      "version": "7.1.3",
+-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+-      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+-      "license": "BlueOak-1.0.0",
 +      "optional": true,
 +      "dependencies": {
 +        "ms": "^2.1.3"
 +      },
-+      "engines": {
+       "engines": {
+-        "node": ">=16 || 14 >=14.17"
 +        "node": ">=6.0"
 +      },
 +      "peerDependenciesMeta": {
 +        "supports-color": {
 +          "optional": true
 +        }
-+      }
-+    },
+       }
+     },
+-    "node_modules/ms": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+-      "license": "MIT"
+-    },
+-    "node_modules/multiparty": {
+-      "version": "4.2.3",
+-      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz",
+-      "integrity": "sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==",
 +    "node_modules/teeny-request/node_modules/https-proxy-agent": {
 +      "version": "5.0.1",
 +      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
 +      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "http-errors": "~1.8.1",
+-        "safe-buffer": "5.2.1",
+-        "uid-safe": "2.1.5"
 +        "agent-base": "6",
 +        "debug": "4"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.10"
 +        "node": ">= 6"
-+      }
-+    },
+       }
+     },
+-    "node_modules/multiparty/node_modules/depd": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
 +    "node_modules/teeny-request/node_modules/ms": {
 +      "version": "2.1.3",
 +      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
 +      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
+-      }
 +      "optional": true
-+    },
+     },
+-    "node_modules/multiparty/node_modules/http-errors": {
+-      "version": "1.8.1",
+-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
 +    "node_modules/teeny-request/node_modules/node-fetch": {
 +      "version": "2.7.0",
 +      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
 +      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "depd": "~1.1.2",
+-        "inherits": "2.0.4",
+-        "setprototypeof": "1.2.0",
+-        "statuses": ">= 1.5.0 < 2",
+-        "toidentifier": "1.0.1"
 +        "whatwg-url": "^5.0.0"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.6"
 +        "node": "4.x || >=6.0.0"
 +      },
 +      "peerDependencies": {
@@ -16503,36 +15797,62 @@ index 2af3a0d1..5c5f4b73 100644
 +        "encoding": {
 +          "optional": true
 +        }
-+      }
-+    },
+       }
+     },
+-    "node_modules/multiparty/node_modules/statuses": {
+-      "version": "1.5.0",
+-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
 +    "node_modules/teeny-request/node_modules/tr46": {
 +      "version": "0.0.3",
 +      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
 +      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
+-      }
 +      "optional": true
-+    },
+     },
+-    "node_modules/negotiator": {
+-      "version": "0.6.4",
+-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
 +    "node_modules/teeny-request/node_modules/uuid": {
 +      "version": "9.0.1",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
 +      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "funding": [
 +        "https://github.com/sponsors/broofa",
 +        "https://github.com/sponsors/ctavan"
 +      ],
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
 +      "optional": true,
 +      "bin": {
 +        "uuid": "dist/bin/uuid"
-+      }
-+    },
+       }
+     },
+-    "node_modules/neo-async": {
+-      "version": "2.6.2",
+-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+-      "license": "MIT"
 +    "node_modules/teeny-request/node_modules/webidl-conversions": {
 +      "version": "3.0.1",
 +      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
 +      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
 +      "license": "BSD-2-Clause",
 +      "optional": true
-+    },
+     },
+-    "node_modules/node-forge": {
+-      "version": "1.4.0",
+-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
+-      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
+-      "license": "(BSD-3-Clause OR GPL-2.0)",
+-      "engines": {
+-        "node": ">= 6.13.0"
 +    "node_modules/teeny-request/node_modules/whatwg-url": {
 +      "version": "5.0.0",
 +      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
@@ -16542,22 +15862,34 @@ index 2af3a0d1..5c5f4b73 100644
 +      "dependencies": {
 +        "tr46": "~0.0.3",
 +        "webidl-conversions": "^3.0.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/nofilter": {
+-      "version": "1.0.4",
+-      "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-1.0.4.tgz",
+-      "integrity": "sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==",
 +    "node_modules/teex": {
 +      "version": "1.0.1",
 +      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
 +      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">=8"
 +      "dependencies": {
 +        "streamx": "^2.12.5"
-+      }
-+    },
+       }
+     },
+-    "node_modules/normalize-path": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 +    "node_modules/telegram": {
 +      "version": "2.26.22",
 +      "resolved": "https://registry.npmjs.org/telegram/-/telegram-2.26.22.tgz",
 +      "integrity": "sha512-EIj7Yrjiu0Yosa3FZ/7EyPg9s6UiTi/zDQrFmR/2Mg7pIUU+XjAit1n1u9OU9h2oRnRM5M+67/fxzQluZpaJJg==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">=0.10.0"
 +      "optional": true,
 +      "dependencies": {
 +        "@cryptography/aes": "^0.1.1",
@@ -16578,39 +15910,57 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optionalDependencies": {
 +        "bufferutil": "^4.0.3",
 +        "utf-8-validate": "^5.0.5"
-+      }
-+    },
+       }
+     },
+-    "node_modules/object-inspect": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
 +    "node_modules/telegram/node_modules/mime": {
 +      "version": "3.0.0",
 +      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
 +      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.4"
 +      "optional": true,
 +      "bin": {
 +        "mime": "cli.js"
-+      },
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +      "engines": {
 +        "node": ">=10.0.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/on-finished": {
+-      "version": "2.4.1",
+-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
 +    "node_modules/telnyx": {
 +      "version": "1.27.0",
 +      "resolved": "https://registry.npmjs.org/telnyx/-/telnyx-1.27.0.tgz",
 +      "integrity": "sha512-cVbP3jEW4TbmNL5U0UbZc3OkLg+6dHRnMYByYfJnrGw5ZRn0XKb17Hx3fLMWmGgRFow7eqVP4hlCogbIB6T3+w==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "ee-first": "1.1.1"
 +        "lodash.isplainobject": "^4.0.6",
 +        "qs": "^6.11.2",
 +        "safe-buffer": "^5.2.1",
 +        "telnyx": "^1.26.2",
 +        "tweetnacl": "^1.0.3",
 +        "uuid": "^9.0.1"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">= 0.8"
 +        "node": "^6 || >=8"
-+      }
-+    },
+       }
+     },
+-    "node_modules/on-headers": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+-      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
 +    "node_modules/telnyx/node_modules/tweetnacl": {
 +      "version": "1.0.3",
 +      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
@@ -16622,23 +15972,34 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "9.0.1",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
 +      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "funding": [
 +        "https://github.com/sponsors/broofa",
 +        "https://github.com/sponsors/ctavan"
 +      ],
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.8"
 +      "optional": true,
 +      "bin": {
 +        "uuid": "dist/bin/uuid"
-+      }
-+    },
+       }
+     },
+-    "node_modules/otplib": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/otplib/-/otplib-12.0.1.tgz",
+-      "integrity": "sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==",
+-      "license": "MIT",
 +    "node_modules/terser": {
-+      "version": "5.46.2",
-+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
-+      "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
++      "version": "5.48.0",
++      "resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz",
++      "integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==",
 +      "license": "BSD-2-Clause",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "@otplib/core": "^12.0.1",
+-        "@otplib/preset-default": "^12.0.1",
+-        "@otplib/preset-v11": "^12.0.1"
 +        "@jridgewell/source-map": "^0.3.3",
 +        "acorn": "^8.15.0",
 +        "commander": "^2.20.0",
@@ -16649,13 +16010,23 @@ index 2af3a0d1..5c5f4b73 100644
 +      },
 +      "engines": {
 +        "node": ">=10"
-+      }
-+    },
+       }
+     },
+-    "node_modules/package-json-from-dist": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+-      "license": "BlueOak-1.0.0"
+-    },
+-    "node_modules/parseurl": {
+-      "version": "1.3.3",
+-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
 +    "node_modules/terser/node_modules/commander": {
 +      "version": "2.20.3",
 +      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
 +      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true
 +    },
 +    "node_modules/test-exclude": {
@@ -16670,21 +16041,33 @@ index 2af3a0d1..5c5f4b73 100644
 +        "read-pkg-up": "^4.0.0",
 +        "require-main-filename": "^2.0.0"
 +      },
-+      "engines": {
+       "engines": {
+-        "node": ">= 0.8"
 +        "node": ">=6"
-+      }
-+    },
+       }
+     },
+-    "node_modules/path-key": {
+-      "version": "3.1.1",
+-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 +    "node_modules/test-exclude/node_modules/brace-expansion": {
-+      "version": "1.1.14",
-+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
-+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
-+      "license": "MIT",
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
++      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">=8"
 +      "optional": true,
 +      "dependencies": {
 +        "balanced-match": "^1.0.0",
 +        "concat-map": "0.0.1"
-+      }
-+    },
+       }
+     },
+-    "node_modules/path-scurry": {
+-      "version": "1.11.1",
+-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+-      "license": "BlueOak-1.0.0",
 +    "node_modules/test-exclude/node_modules/glob": {
 +      "version": "7.2.3",
 +      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -16692,21 +16075,29 @@ index 2af3a0d1..5c5f4b73 100644
 +      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
 +      "license": "ISC",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "lru-cache": "^10.2.0",
+-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
 +        "fs.realpath": "^1.0.0",
 +        "inflight": "^1.0.4",
 +        "inherits": "2",
 +        "minimatch": "^3.1.1",
 +        "once": "^1.3.0",
 +        "path-is-absolute": "^1.0.0"
-+      },
-+      "engines": {
+       },
+       "engines": {
+-        "node": ">=16 || 14 >=14.18"
 +        "node": "*"
-+      },
-+      "funding": {
-+        "url": "https://github.com/sponsors/isaacs"
-+      }
-+    },
+       },
+       "funding": {
+         "url": "https://github.com/sponsors/isaacs"
+       }
+     },
+-    "node_modules/path-to-regexp": {
+-      "version": "0.1.12",
+-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+-      "license": "MIT"
 +    "node_modules/test-exclude/node_modules/minimatch": {
 +      "version": "3.1.5",
 +      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
@@ -16719,7 +16110,12 @@ index 2af3a0d1..5c5f4b73 100644
 +      "engines": {
 +        "node": "*"
 +      }
-+    },
+     },
+-    "node_modules/pend": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+-      "license": "MIT"
 +    "node_modules/text-decoder": {
 +      "version": "1.2.7",
 +      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
@@ -16728,22 +16124,31 @@ index 2af3a0d1..5c5f4b73 100644
 +      "dependencies": {
 +        "b4a": "^1.6.4"
 +      }
-+    },
+     },
+-    "node_modules/possible-typed-array-names": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
 +    "node_modules/text-hex": {
 +      "version": "1.0.0",
 +      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
 +      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true
 +    },
 +    "node_modules/thirty-two": {
 +      "version": "1.0.2",
 +      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
 +      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==",
-+      "engines": {
+       "engines": {
+-        "node": ">= 0.4"
 +        "node": ">=0.2.6"
-+      }
-+    },
+       }
+     },
+-    "node_modules/process": {
+-      "version": "0.11.10",
+-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
 +    "node_modules/through": {
 +      "version": "2.3.8",
 +      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -16765,36 +16170,34 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "3.6.2",
 +      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
 +      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "inherits": "^2.0.3",
 +        "string_decoder": "^1.1.1",
 +        "util-deprecate": "^1.0.1"
-       },
++      },
        "engines": {
--        "node": ">= 0.10"
+-        "node": ">= 0.6.0"
 +        "node": ">= 6"
        }
      },
--    "node_modules/multiparty/node_modules/depd": {
--      "version": "1.1.2",
--      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
--      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+-    "node_modules/process-nextick-args": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+-      "license": "MIT"
 +    "node_modules/thunky": {
 +      "version": "1.1.0",
 +      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
 +      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-       "license": "MIT",
--      "engines": {
--        "node": ">= 0.6"
--      }
++      "license": "MIT",
 +      "optional": true
      },
--    "node_modules/multiparty/node_modules/http-errors": {
--      "version": "1.8.1",
--      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
--      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+-    "node_modules/proxy-addr": {
+-      "version": "2.0.7",
+-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
 +    "node_modules/tiny-inflate": {
 +      "version": "1.0.3",
 +      "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
@@ -16816,83 +16219,71 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "depd": "~1.1.2",
--        "inherits": "2.0.4",
--        "setprototypeof": "1.2.0",
--        "statuses": ">= 1.5.0 < 2",
--        "toidentifier": "1.0.1"
+-        "forwarded": "0.2.0",
+-        "ipaddr.js": "1.9.1"
 +        "is-number": "^7.0.0"
        },
        "engines": {
--        "node": ">= 0.6"
+-        "node": ">= 0.10"
 +        "node": ">=8.0"
        }
      },
--    "node_modules/multiparty/node_modules/statuses": {
--      "version": "1.5.0",
--      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
--      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+-    "node_modules/qs": {
+-      "version": "6.14.2",
+-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+-      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
 +    "node_modules/toidentifier": {
 +      "version": "1.0.1",
 +      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
 +      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-       "license": "MIT",
-       "engines": {
--        "node": ">= 0.6"
++      "license": "MIT",
++      "engines": {
 +        "node": ">=0.6"
-       }
-     },
--    "node_modules/negotiator": {
--      "version": "0.6.4",
--      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
--      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
--      "license": "MIT",
++      }
++    },
 +    "node_modules/tough-cookie": {
 +      "version": "4.1.4",
 +      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
 +      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
-+      "license": "BSD-3-Clause",
+       "license": "BSD-3-Clause",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "side-channel": "^1.1.0"
 +        "psl": "^1.1.33",
 +        "punycode": "^2.1.1",
 +        "universalify": "^0.2.0",
 +        "url-parse": "^1.5.3"
-+      },
+       },
        "engines": {
--        "node": ">= 0.6"
+-        "node": ">=0.6"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +        "node": ">=6"
        }
      },
--    "node_modules/neo-async": {
--      "version": "2.6.2",
--      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
--      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
--      "license": "MIT"
--    },
--    "node_modules/node-forge": {
--      "version": "1.4.0",
--      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
--      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
--      "license": "(BSD-3-Clause OR GPL-2.0)",
+-    "node_modules/random-bytes": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+-      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
 +    "node_modules/tr46": {
 +      "version": "4.1.1",
 +      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
 +      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "punycode": "^2.3.0"
 +      },
        "engines": {
--        "node": ">= 6.13.0"
+-        "node": ">= 0.8"
 +        "node": ">=14"
        }
      },
--    "node_modules/nofilter": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-1.0.4.tgz",
--      "integrity": "sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==",
+-    "node_modules/range-parser": {
+-      "version": "1.2.1",
+-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
 +    "node_modules/triple-beam": {
 +      "version": "1.4.1",
 +      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
@@ -16900,29 +16291,35 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "engines": {
--        "node": ">=8"
+-        "node": ">= 0.6"
 +        "node": ">= 14.0.0"
        }
      },
--    "node_modules/normalize-path": {
--      "version": "3.0.0",
--      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
--      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+-    "node_modules/raw-body": {
+-      "version": "2.5.3",
+-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
+-      "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
 +    "node_modules/ts-custom-error": {
 +      "version": "3.3.1",
 +      "resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.3.1.tgz",
 +      "integrity": "sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==",
        "license": "MIT",
+-      "dependencies": {
+-        "bytes": "~3.1.2",
+-        "http-errors": "~2.0.1",
+-        "iconv-lite": "~0.4.24",
+-        "unpipe": "~1.0.0"
+-      },
 +      "optional": true,
        "engines": {
--        "node": ">=0.10.0"
+-        "node": ">= 0.8"
 +        "node": ">=14.0.0"
        }
      },
--    "node_modules/object-inspect": {
--      "version": "1.13.4",
--      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
--      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+-    "node_modules/readable-stream": {
+-      "version": "4.7.0",
+-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+-      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
 +    "node_modules/ts-mixer": {
 +      "version": "6.0.4",
 +      "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz",
@@ -16942,63 +16339,79 @@ index 2af3a0d1..5c5f4b73 100644
 +      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
 +      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
        "license": "MIT",
-       "engines": {
--        "node": ">= 0.4"
+-      "dependencies": {
+-        "abort-controller": "^3.0.0",
+-        "buffer": "^6.0.3",
+-        "events": "^3.3.0",
+-        "process": "^0.11.10",
+-        "string_decoder": "^1.3.0"
 -      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+       "engines": {
+-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 +        "node": ">=0.6.x"
        }
      },
--    "node_modules/on-finished": {
--      "version": "2.4.1",
--      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
--      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
--      "license": "MIT",
+-    "node_modules/readdir-glob": {
+-      "version": "1.1.3",
+-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+-      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
 +    "node_modules/tunnel-agent": {
 +      "version": "0.6.0",
 +      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 +      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-+      "license": "Apache-2.0",
+       "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
--        "ee-first": "1.1.1"
+-        "minimatch": "^5.1.0"
+-      }
+-    },
+-    "node_modules/readdir-glob/node_modules/minimatch": {
+-      "version": "5.1.9",
+-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+-      "license": "ISC",
+-      "dependencies": {
+-        "brace-expansion": "^2.0.1"
 +        "safe-buffer": "^5.0.1"
        },
        "engines": {
--        "node": ">= 0.8"
+-        "node": ">=10"
 +        "node": "*"
        }
      },
--    "node_modules/on-headers": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
--      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
--      "license": "MIT",
+-    "node_modules/safe-buffer": {
+-      "version": "5.2.1",
+-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+-      "funding": [
+-        {
+-          "type": "github",
+-          "url": "https://github.com/sponsors/feross"
+-        },
 +    "node_modules/tv4": {
 +      "version": "1.3.0",
 +      "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
 +      "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==",
 +      "license": [
-+        {
+         {
+-          "type": "patreon",
+-          "url": "https://www.patreon.com/feross"
 +          "type": "Public Domain",
 +          "url": "http://geraintluff.github.io/tv4/LICENSE.txt"
-+        },
-+        {
+         },
+         {
+-          "type": "consulting",
+-          "url": "https://feross.org/support"
 +          "type": "MIT",
 +          "url": "http://jsonary.com/LICENSE.txt"
-+        }
-+      ],
+         }
+       ],
+-      "license": "MIT"
 +      "optional": true,
-       "engines": {
--        "node": ">= 0.8"
++      "engines": {
 +        "node": ">= 0.8.0"
-       }
-     },
--    "node_modules/otplib": {
--      "version": "12.0.1",
--      "resolved": "https://registry.npmjs.org/otplib/-/otplib-12.0.1.tgz",
--      "integrity": "sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==",
++      }
++    },
 +    "node_modules/tweetnacl": {
 +      "version": "0.14.5",
 +      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
@@ -17010,12 +16423,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "4.23.0",
 +      "resolved": "https://registry.npmjs.org/twilio/-/twilio-4.23.0.tgz",
 +      "integrity": "sha512-LdNBQfOe0dY2oJH2sAsrxazpgfFQo5yXGxe96QA8UWB5uu+433PrUbkv8gQ5RmrRCqUTPQ0aOrIyAdBr1aB03Q==",
-       "license": "MIT",
++      "license": "MIT",
 +      "optional": true,
-       "dependencies": {
--        "@otplib/core": "^12.0.1",
--        "@otplib/preset-default": "^12.0.1",
--        "@otplib/preset-v11": "^12.0.1"
++      "dependencies": {
 +        "axios": "^1.6.0",
 +        "dayjs": "^1.11.9",
 +        "https-proxy-agent": "^5.0.0",
@@ -17027,117 +16437,121 @@ index 2af3a0d1..5c5f4b73 100644
 +      },
 +      "engines": {
 +        "node": ">=14.0"
-       }
-     },
--    "node_modules/package-json-from-dist": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
--      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
--      "license": "BlueOak-1.0.0"
--    },
--    "node_modules/parseurl": {
--      "version": "1.3.3",
--      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
--      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
++      }
++    },
 +    "node_modules/twilio/node_modules/agent-base": {
 +      "version": "6.0.2",
 +      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
 +      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-       "license": "MIT",
++      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
 +        "debug": "4"
 +      },
-       "engines": {
--        "node": ">= 0.8"
++      "engines": {
 +        "node": ">= 6.0.0"
-       }
++      }
      },
--    "node_modules/path-key": {
--      "version": "3.1.1",
--      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
--      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+-    "node_modules/safe-regex-test": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+-      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
 +    "node_modules/twilio/node_modules/debug": {
 +      "version": "4.4.3",
 +      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
 +      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
        "license": "MIT",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "es-errors": "^1.3.0",
+-        "is-regex": "^1.2.1"
 +        "ms": "^2.1.3"
-+      },
+       },
        "engines": {
--        "node": ">=8"
+-        "node": ">= 0.4"
 +        "node": ">=6.0"
-+      },
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
 +      "peerDependenciesMeta": {
 +        "supports-color": {
 +          "optional": true
 +        }
        }
      },
--    "node_modules/path-scurry": {
--      "version": "1.11.1",
--      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
--      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
--      "license": "BlueOak-1.0.0",
+-    "node_modules/safer-buffer": {
+-      "version": "2.1.2",
+-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+-      "license": "MIT"
+-    },
+-    "node_modules/send": {
+-      "version": "0.19.2",
+-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
+-      "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
 +    "node_modules/twilio/node_modules/https-proxy-agent": {
 +      "version": "5.0.1",
 +      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
 +      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "lru-cache": "^10.2.0",
--        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+-        "debug": "2.6.9",
+-        "depd": "2.0.0",
+-        "destroy": "1.2.0",
+-        "encodeurl": "~2.0.0",
+-        "escape-html": "~1.0.3",
+-        "etag": "~1.8.1",
+-        "fresh": "~0.5.2",
+-        "http-errors": "~2.0.1",
+-        "mime": "1.6.0",
+-        "ms": "2.1.3",
+-        "on-finished": "~2.4.1",
+-        "range-parser": "~1.2.1",
+-        "statuses": "~2.0.2"
 +        "agent-base": "6",
 +        "debug": "4"
        },
        "engines": {
--        "node": ">=16 || 14 >=14.18"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/isaacs"
+-        "node": ">= 0.8.0"
 +        "node": ">= 6"
        }
      },
--    "node_modules/path-to-regexp": {
--      "version": "0.1.12",
--      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
--      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
--      "license": "MIT"
--    },
--    "node_modules/pend": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
--      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
--      "license": "MIT"
+-    "node_modules/send/node_modules/ms": {
 +    "node_modules/twilio/node_modules/ms": {
-+      "version": "2.1.3",
-+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+       "version": "2.1.3",
+       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+-      "license": "MIT"
 +      "license": "MIT",
 +      "optional": true
      },
--    "node_modules/possible-typed-array-names": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
--      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+-    "node_modules/serve-static": {
+-      "version": "1.16.3",
+-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
+-      "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
 +    "node_modules/twilio/node_modules/xmlbuilder": {
 +      "version": "13.0.2",
 +      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
 +      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
        "license": "MIT",
+-      "dependencies": {
+-        "encodeurl": "~2.0.0",
+-        "escape-html": "~1.0.3",
+-        "parseurl": "~1.3.3",
+-        "send": "~0.19.1"
+-      },
 +      "optional": true,
        "engines": {
--        "node": ">= 0.4"
+-        "node": ">= 0.8.0"
 +        "node": ">=6.0"
        }
      },
--    "node_modules/process": {
--      "version": "0.11.10",
--      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
--      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+-    "node_modules/set-function-length": {
+-      "version": "1.2.2",
+-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
 +    "node_modules/type": {
 +      "version": "2.7.3",
 +      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
@@ -17150,25 +16564,31 @@ index 2af3a0d1..5c5f4b73 100644
 +      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
 +      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
        "license": "MIT",
-+      "dependencies": {
+       "dependencies": {
+-        "define-data-property": "^1.1.4",
+-        "es-errors": "^1.3.0",
+-        "function-bind": "^1.1.2",
+-        "get-intrinsic": "^1.2.4",
+-        "gopd": "^1.0.1",
+-        "has-property-descriptors": "^1.0.2"
 +        "media-typer": "0.3.0",
 +        "mime-types": "~2.1.24"
-+      },
+       },
        "engines": {
--        "node": ">= 0.6.0"
+-        "node": ">= 0.4"
 +        "node": ">= 0.6"
        }
      },
--    "node_modules/process-nextick-args": {
--      "version": "2.0.1",
--      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
--      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
--      "license": "MIT"
+-    "node_modules/setprototypeof": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+-      "license": "ISC"
 -    },
--    "node_modules/proxy-addr": {
--      "version": "2.0.7",
--      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
--      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+-    "node_modules/shebang-command": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 +    "node_modules/typed-array-buffer": {
 +      "version": "1.0.3",
 +      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
@@ -17176,66 +16596,45 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "forwarded": "0.2.0",
--        "ipaddr.js": "1.9.1"
+-        "shebang-regex": "^3.0.0"
 +        "call-bound": "^1.0.3",
 +        "es-errors": "^1.3.0",
 +        "is-typed-array": "^1.1.14"
        },
        "engines": {
--        "node": ">= 0.10"
+-        "node": ">=8"
 +        "node": ">= 0.4"
        }
      },
--    "node_modules/qs": {
--      "version": "6.14.2",
--      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
--      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
--      "license": "BSD-3-Clause",
+-    "node_modules/shebang-regex": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 +    "node_modules/typed-array-byte-length": {
 +      "version": "1.0.3",
 +      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
 +      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
-       "dependencies": {
--        "side-channel": "^1.1.0"
++      "dependencies": {
 +        "call-bind": "^1.0.8",
 +        "for-each": "^0.3.3",
 +        "gopd": "^1.2.0",
 +        "has-proto": "^1.2.0",
 +        "is-typed-array": "^1.1.14"
-       },
++      },
        "engines": {
--        "node": ">=0.6"
+-        "node": ">=8"
 +        "node": ">= 0.4"
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/ljharb"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
        }
      },
--    "node_modules/random-bytes": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
--      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
--      "license": "MIT",
--      "engines": {
--        "node": ">= 0.8"
--      }
--    },
--    "node_modules/range-parser": {
--      "version": "1.2.1",
--      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
--      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
--      "license": "MIT",
--      "engines": {
--        "node": ">= 0.6"
--      }
--    },
--    "node_modules/raw-body": {
--      "version": "2.5.3",
--      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
--      "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
+-    "node_modules/side-channel": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
 +    "node_modules/typed-array-byte-offset": {
 +      "version": "1.0.4",
 +      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
@@ -17243,10 +16642,11 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "bytes": "~3.1.2",
--        "http-errors": "~2.0.1",
--        "iconv-lite": "~0.4.24",
--        "unpipe": "~1.0.0"
+-        "es-errors": "^1.3.0",
+-        "object-inspect": "^1.13.3",
+-        "side-channel-list": "^1.0.0",
+-        "side-channel-map": "^1.0.1",
+-        "side-channel-weakmap": "^1.0.2"
 +        "available-typed-arrays": "^1.0.7",
 +        "call-bind": "^1.0.8",
 +        "for-each": "^0.3.3",
@@ -17256,105 +16656,75 @@ index 2af3a0d1..5c5f4b73 100644
 +        "reflect.getprototypeof": "^1.0.9"
        },
        "engines": {
--        "node": ">= 0.8"
-+        "node": ">= 0.4"
-+      },
-+      "funding": {
-+        "url": "https://github.com/sponsors/ljharb"
+         "node": ">= 0.4"
+@@ -2077,14 +15289,19 @@
+         "url": "https://github.com/sponsors/ljharb"
        }
      },
--    "node_modules/readable-stream": {
--      "version": "4.7.0",
--      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
--      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+-    "node_modules/side-channel-list": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
 +    "node_modules/typed-array-length": {
-+      "version": "1.0.7",
-+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
++      "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.8.tgz",
++      "integrity": "sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==",
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "abort-controller": "^3.0.0",
--        "buffer": "^6.0.3",
--        "events": "^3.3.0",
--        "process": "^0.11.10",
--        "string_decoder": "^1.3.0"
-+        "call-bind": "^1.0.7",
-+        "for-each": "^0.3.3",
-+        "gopd": "^1.0.1",
-+        "is-typed-array": "^1.1.13",
-+        "possible-typed-array-names": "^1.0.0",
-+        "reflect.getprototypeof": "^1.0.6"
+-        "es-errors": "^1.3.0",
+-        "object-inspect": "^1.13.3"
++        "call-bind": "^1.0.9",
++        "for-each": "^0.3.5",
++        "gopd": "^1.2.0",
++        "is-typed-array": "^1.1.15",
++        "possible-typed-array-names": "^1.1.0",
++        "reflect.getprototypeof": "^1.0.10"
        },
        "engines": {
--        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
--      }
--    },
--    "node_modules/readdir-glob": {
--      "version": "1.1.3",
--      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
--      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
--      "license": "Apache-2.0",
--      "dependencies": {
--        "minimatch": "^5.1.0"
-+        "node": ">= 0.4"
-+      },
-+      "funding": {
-+        "url": "https://github.com/sponsors/ljharb"
+         "node": ">= 0.4"
+@@ -2093,35 +15310,105 @@
+         "url": "https://github.com/sponsors/ljharb"
        }
      },
--    "node_modules/readdir-glob/node_modules/minimatch": {
--      "version": "5.1.9",
--      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
--      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
--      "license": "ISC",
+-    "node_modules/side-channel-map": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+-      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
 +    "node_modules/typedarray-to-buffer": {
 +      "version": "3.1.5",
 +      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
 +      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-+      "license": "MIT",
+       "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "brace-expansion": "^2.0.1"
--      },
--      "engines": {
--        "node": ">=10"
+-        "call-bound": "^1.0.2",
+-        "es-errors": "^1.3.0",
+-        "get-intrinsic": "^1.2.5",
+-        "object-inspect": "^1.13.3"
 +        "is-typedarray": "^1.0.0"
-       }
-     },
--    "node_modules/safe-buffer": {
--      "version": "5.2.1",
--      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
--      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
++      }
++    },
 +    "node_modules/ua-client-hints-js": {
 +      "version": "0.1.2",
 +      "resolved": "https://registry.npmjs.org/ua-client-hints-js/-/ua-client-hints-js-0.1.2.tgz",
 +      "integrity": "sha512-cYqD5p9PPCsNYpBJRYcU7s5QuZS3pdWpskOJl+QE7elbOrFzctLs5H9ppH10v7Tk0Kholzo9VIyjoTlh0B8XXg==",
-       "funding": [
-         {
-           "type": "github",
--          "url": "https://github.com/sponsors/feross"
++      "funding": [
++        {
++          "type": "github",
 +          "url": "https://github.com/sponsors/faisalman"
-         },
-         {
--          "type": "patreon",
--          "url": "https://www.patreon.com/feross"
++        },
++        {
 +          "type": "opencollective",
 +          "url": "https://opencollective.com/ua-parser-js"
-         },
-         {
--          "type": "consulting",
--          "url": "https://feross.org/support"
++        },
++        {
 +          "type": "paypal",
 +          "url": "https://paypal.me/faisalman"
-         }
-       ],
-       "license": "MIT"
-     },
--    "node_modules/safe-regex-test": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
--      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
++        }
++      ],
++      "license": "MIT"
++    },
 +    "node_modules/ua-parser-js": {
 +      "version": "1.0.40",
 +      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.40.tgz",
@@ -17373,47 +16743,15 @@ index 2af3a0d1..5c5f4b73 100644
 +          "url": "https://github.com/sponsors/faisalman"
 +        }
 +      ],
-       "license": "MIT",
--      "dependencies": {
--        "call-bound": "^1.0.2",
--        "es-errors": "^1.3.0",
--        "is-regex": "^1.2.1"
++      "license": "MIT",
 +      "bin": {
 +        "ua-parser-js": "script/cli.js"
        },
        "engines": {
 -        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
 +        "node": "*"
-       }
-     },
--    "node_modules/safer-buffer": {
--      "version": "2.1.2",
--      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
--      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
--      "license": "MIT"
--    },
--    "node_modules/send": {
--      "version": "0.19.2",
--      "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
--      "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
--      "license": "MIT",
--      "dependencies": {
--        "debug": "2.6.9",
--        "depd": "2.0.0",
--        "destroy": "1.2.0",
--        "encodeurl": "~2.0.0",
--        "escape-html": "~1.0.3",
--        "etag": "~1.8.1",
--        "fresh": "~0.5.2",
--        "http-errors": "~2.0.1",
--        "mime": "1.6.0",
--        "ms": "2.1.3",
--        "on-finished": "~2.4.1",
--        "range-parser": "~1.2.1",
--        "statuses": "~2.0.2"
++      }
++    },
 +    "node_modules/uglify-js": {
 +      "version": "3.19.3",
 +      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
@@ -17423,42 +16761,33 @@ index 2af3a0d1..5c5f4b73 100644
 +      "bin": {
 +        "uglifyjs": "bin/uglifyjs"
        },
-       "engines": {
--        "node": ">= 0.8.0"
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++      "engines": {
 +        "node": ">=0.8.0"
        }
      },
--    "node_modules/send/node_modules/ms": {
--      "version": "2.1.3",
--      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
--      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
--      "license": "MIT"
--    },
--    "node_modules/serve-static": {
--      "version": "1.16.3",
--      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
--      "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
+-    "node_modules/side-channel-weakmap": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+-      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
 +    "node_modules/uid-safe": {
 +      "version": "2.1.5",
 +      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
 +      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
        "license": "MIT",
        "dependencies": {
--        "encodeurl": "~2.0.0",
--        "escape-html": "~1.0.3",
--        "parseurl": "~1.3.3",
--        "send": "~0.19.1"
+-        "call-bound": "^1.0.2",
+-        "es-errors": "^1.3.0",
+-        "get-intrinsic": "^1.2.5",
+-        "object-inspect": "^1.13.3",
+-        "side-channel-map": "^1.0.1"
 +        "random-bytes": "~1.0.0"
-       },
-       "engines": {
--        "node": ">= 0.8.0"
++      },
++      "engines": {
 +        "node": ">= 0.8"
-       }
-     },
--    "node_modules/set-function-length": {
--      "version": "1.2.2",
--      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
--      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
++      }
++    },
 +    "node_modules/uid2": {
 +      "version": "0.0.4",
 +      "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz",
@@ -17470,15 +16799,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "version": "1.1.0",
 +      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
 +      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
-       "license": "MIT",
++      "license": "MIT",
 +      "optional": true,
-       "dependencies": {
--        "define-data-property": "^1.1.4",
--        "es-errors": "^1.3.0",
--        "function-bind": "^1.1.2",
--        "get-intrinsic": "^1.2.4",
--        "gopd": "^1.0.1",
--        "has-property-descriptors": "^1.0.2"
++      "dependencies": {
 +        "call-bound": "^1.0.3",
 +        "has-bigints": "^1.0.2",
 +        "has-symbols": "^1.1.0",
@@ -17486,35 +16809,39 @@ index 2af3a0d1..5c5f4b73 100644
        },
        "engines": {
          "node": ">= 0.4"
-+      },
-+      "funding": {
-+        "url": "https://github.com/sponsors/ljharb"
+@@ -2130,336 +15417,511 @@
+         "url": "https://github.com/sponsors/ljharb"
        }
      },
--    "node_modules/setprototypeof": {
--      "version": "1.2.0",
--      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
--      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
--      "license": "ISC"
+-    "node_modules/signal-exit": {
+-      "version": "4.1.0",
+-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+-      "license": "ISC",
 +    "node_modules/undici": {
 +      "version": "6.24.1",
 +      "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.1.tgz",
 +      "integrity": "sha512-sC+b0tB1whOCzbtlx20fx3WgCXwkW627p4EA9uM+/tNNPkSS+eSEld6pAs9nDv7WbY1UUljBMYPtu9BCOrCWKA==",
 +      "license": "MIT",
 +      "optional": true,
-+      "engines": {
+       "engines": {
+-        "node": ">=14"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
 +        "node": ">=18.17"
-+      }
+       }
      },
--    "node_modules/shebang-command": {
--      "version": "2.0.0",
--      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
--      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+-    "node_modules/source-map": {
+-      "version": "0.6.1",
+-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+-      "license": "BSD-3-Clause",
 +    "node_modules/undici-types": {
-+      "version": "7.19.2",
-+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
-+      "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
-       "license": "MIT",
++      "version": "8.3.0",
++      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz",
++      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
++      "license": "MIT",
 +      "optional": true
 +    },
 +    "node_modules/unidecode": {
@@ -17522,7 +16849,8 @@ index 2af3a0d1..5c5f4b73 100644
 +      "resolved": "https://registry.npmjs.org/unidecode/-/unidecode-0.1.8.tgz",
 +      "integrity": "sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA==",
 +      "optional": true,
-+      "engines": {
+       "engines": {
+-        "node": ">=0.10.0"
 +        "node": ">= 0.4.12"
 +      }
 +    },
@@ -17532,51 +16860,63 @@ index 2af3a0d1..5c5f4b73 100644
 +      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
 +      "license": "ISC",
 +      "optional": true,
-       "dependencies": {
--        "shebang-regex": "^3.0.0"
--      },
++      "dependencies": {
 +        "unique-slug": "^2.0.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/statuses": {
 +    "node_modules/unique-slug": {
-+      "version": "2.0.2",
+       "version": "2.0.2",
+-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+-      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.8"
 +      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
 +      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
 +      "license": "ISC",
 +      "optional": true,
 +      "dependencies": {
 +        "imurmurhash": "^0.1.4"
-+      }
-+    },
+       }
+     },
+-    "node_modules/streamx": {
+-      "version": "2.23.0",
+-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
+-      "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
 +    "node_modules/universalify": {
 +      "version": "0.2.0",
 +      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
 +      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-+      "license": "MIT",
+       "license": "MIT",
+-      "dependencies": {
+-        "events-universal": "^1.0.0",
+-        "fast-fifo": "^1.3.2",
+-        "text-decoder": "^1.1.0"
 +      "optional": true,
-       "engines": {
--        "node": ">=8"
++      "engines": {
 +        "node": ">= 4.0.0"
        }
      },
--    "node_modules/shebang-regex": {
--      "version": "3.0.0",
--      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
--      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+-    "node_modules/string_decoder": {
+-      "version": "1.3.0",
+-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
 +    "node_modules/unpipe": {
 +      "version": "1.0.0",
 +      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
 +      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
        "license": "MIT",
-       "engines": {
--        "node": ">=8"
+-      "dependencies": {
+-        "safe-buffer": "~5.2.0"
++      "engines": {
 +        "node": ">= 0.8"
        }
      },
--    "node_modules/side-channel": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
--      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+-    "node_modules/string-width": {
+-      "version": "5.1.2",
+-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
 +    "node_modules/update-browserslist-db": {
 +      "version": "1.2.3",
 +      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
@@ -17598,28 +16938,40 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "es-errors": "^1.3.0",
--        "object-inspect": "^1.13.3",
--        "side-channel-list": "^1.0.0",
--        "side-channel-map": "^1.0.1",
--        "side-channel-weakmap": "^1.0.2"
+-        "eastasianwidth": "^0.2.0",
+-        "emoji-regex": "^9.2.2",
+-        "strip-ansi": "^7.0.1"
 +        "escalade": "^3.2.0",
 +        "picocolors": "^1.1.1"
-+      },
+       },
+-      "engines": {
+-        "node": ">=12"
 +      "bin": {
 +        "update-browserslist-db": "cli.js"
        },
+-      "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
 +      "peerDependencies": {
 +        "browserslist": ">= 4.21.0"
-+      }
-+    },
+       }
+     },
+-    "node_modules/string-width-cjs": {
+-      "name": "string-width",
+-      "version": "4.2.3",
+-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+-      "license": "MIT",
 +    "node_modules/uri-js": {
 +      "version": "4.4.1",
 +      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
 +      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 +      "license": "BSD-2-Clause",
 +      "optional": true,
-+      "dependencies": {
+       "dependencies": {
+-        "emoji-regex": "^8.0.0",
+-        "is-fullwidth-code-point": "^3.0.0",
+-        "strip-ansi": "^6.0.1"
+-      },
 +        "punycode": "^2.1.0"
 +      }
 +    },
@@ -17629,39 +16981,35 @@ index 2af3a0d1..5c5f4b73 100644
 +      "integrity": "sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g==",
 +      "optional": true,
        "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-        "node": ">=8"
 +        "node": "*"
        }
      },
--    "node_modules/side-channel-list": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
--      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+-    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+-      "version": "5.0.1",
+-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 +    "node_modules/url-join": {
 +      "version": "5.0.0",
 +      "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz",
 +      "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==",
        "license": "MIT",
--      "dependencies": {
--        "es-errors": "^1.3.0",
--        "object-inspect": "^1.13.3"
--      },
 +      "optional": true,
        "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-        "node": ">=8"
 +        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
        }
      },
--    "node_modules/side-channel-map": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
--      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+-    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+-      "version": "8.0.0",
+-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+-      "license": "MIT"
+-    },
+-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+-      "version": "6.0.1",
+-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 +    "node_modules/url-parse": {
 +      "version": "1.5.10",
 +      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -17669,24 +17017,18 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "call-bound": "^1.0.2",
--        "es-errors": "^1.3.0",
--        "get-intrinsic": "^1.2.5",
--        "object-inspect": "^1.13.3"
+-        "ansi-regex": "^5.0.1"
 -      },
 -      "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-        "node": ">=8"
 +        "querystringify": "^2.1.1",
 +        "requires-port": "^1.0.0"
        }
      },
--    "node_modules/side-channel-weakmap": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
--      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+-    "node_modules/strip-ansi": {
+-      "version": "7.2.0",
+-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+-      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
 +    "node_modules/url-template": {
 +      "version": "2.0.8",
 +      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
@@ -17702,52 +17044,39 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "call-bound": "^1.0.2",
--        "es-errors": "^1.3.0",
--        "get-intrinsic": "^1.2.5",
--        "object-inspect": "^1.13.3",
--        "side-channel-map": "^1.0.1"
+-        "ansi-regex": "^6.2.2"
 +        "node-gyp-build": "^4.3.0"
        },
        "engines": {
--        "node": ">= 0.4"
+-        "node": ">=12"
 -      },
 -      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
+-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
 +        "node": ">=6.14.2"
        }
      },
--    "node_modules/signal-exit": {
--      "version": "4.1.0",
--      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
--      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
--      "license": "ISC",
--      "engines": {
--        "node": ">=14"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/isaacs"
--      }
+-    "node_modules/strip-ansi-cjs": {
+-      "name": "strip-ansi",
+-      "version": "6.0.1",
+-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 +    "node_modules/utf8": {
 +      "version": "2.1.2",
 +      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz",
 +      "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==",
 +      "license": "MIT",
 +      "optional": true
-     },
--    "node_modules/source-map": {
--      "version": "0.6.1",
--      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
--      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
--      "license": "BSD-3-Clause",
--      "engines": {
--        "node": ">=0.10.0"
++    },
 +    "node_modules/util": {
 +      "version": "0.12.5",
 +      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
 +      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-+      "license": "MIT",
-+      "dependencies": {
+       "license": "MIT",
+       "dependencies": {
+-        "ansi-regex": "^5.0.1"
+-      },
+-      "engines": {
+-        "node": ">=8"
 +        "inherits": "^2.0.3",
 +        "is-arguments": "^1.0.4",
 +        "is-generator-function": "^1.0.7",
@@ -17755,10 +17084,10 @@ index 2af3a0d1..5c5f4b73 100644
 +        "which-typed-array": "^1.1.2"
        }
      },
--    "node_modules/statuses": {
--      "version": "2.0.2",
--      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
--      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+-    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+-      "version": "5.0.1",
+-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 +    "node_modules/util-deprecate": {
 +      "version": "1.0.2",
 +      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -17771,50 +17100,45 @@ index 2af3a0d1..5c5f4b73 100644
 +      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
        "license": "MIT",
        "engines": {
--        "node": ">= 0.8"
+-        "node": ">=8"
 +        "node": ">= 0.4.0"
        }
      },
--    "node_modules/streamx": {
--      "version": "2.23.0",
--      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
--      "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
+-    "node_modules/tar-stream": {
+-      "version": "3.1.8",
+-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
+-      "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==",
 +    "node_modules/uuid": {
 +      "version": "10.0.0",
 +      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
 +      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
++      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
 +      "funding": [
 +        "https://github.com/sponsors/broofa",
 +        "https://github.com/sponsors/ctavan"
 +      ],
        "license": "MIT",
 -      "dependencies": {
--        "events-universal": "^1.0.0",
--        "fast-fifo": "^1.3.2",
--        "text-decoder": "^1.1.0"
+-        "b4a": "^1.6.4",
+-        "bare-fs": "^4.5.5",
+-        "fast-fifo": "^1.2.0",
+-        "streamx": "^2.15.0"
 +      "optional": true,
 +      "bin": {
 +        "uuid": "dist/bin/uuid"
        }
      },
--    "node_modules/string_decoder": {
--      "version": "1.3.0",
--      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
--      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+-    "node_modules/teex": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
+-      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
 +    "node_modules/uuid-parse": {
 +      "version": "1.1.0",
 +      "resolved": "https://registry.npmjs.org/uuid-parse/-/uuid-parse-1.1.0.tgz",
 +      "integrity": "sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==",
-       "license": "MIT",
--      "dependencies": {
--        "safe-buffer": "~5.2.0"
--      }
++      "license": "MIT",
 +      "optional": true
-     },
--    "node_modules/string-width": {
--      "version": "5.1.2",
--      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
--      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
++    },
 +    "node_modules/v8flags": {
 +      "version": "3.2.0",
 +      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -17822,61 +17146,47 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "eastasianwidth": "^0.2.0",
--        "emoji-regex": "^9.2.2",
--        "strip-ansi": "^7.0.1"
+-        "streamx": "^2.12.5"
 +        "homedir-polyfill": "^1.0.1"
-       },
-       "engines": {
--        "node": ">=12"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/sindresorhus"
++      },
++      "engines": {
 +        "node": ">= 0.10"
        }
      },
--    "node_modules/string-width-cjs": {
--      "name": "string-width",
--      "version": "4.2.3",
--      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
--      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
--      "license": "MIT",
+-    "node_modules/text-decoder": {
+-      "version": "1.2.7",
+-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
+-      "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
 +    "node_modules/validate-npm-package-license": {
 +      "version": "3.0.4",
 +      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
 +      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-+      "license": "Apache-2.0",
+       "license": "Apache-2.0",
 +      "optional": true,
        "dependencies": {
--        "emoji-regex": "^8.0.0",
--        "is-fullwidth-code-point": "^3.0.0",
--        "strip-ansi": "^6.0.1"
--      },
--      "engines": {
--        "node": ">=8"
+-        "b4a": "^1.6.4"
 +        "spdx-correct": "^3.0.0",
 +        "spdx-expression-parse": "^3.0.0"
        }
      },
--    "node_modules/string-width-cjs/node_modules/ansi-regex": {
--      "version": "5.0.1",
--      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
--      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+-    "node_modules/thirty-two": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
+-      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==",
 +    "node_modules/vary": {
 +      "version": "1.1.2",
 +      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
 +      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-       "license": "MIT",
++      "license": "MIT",
        "engines": {
--        "node": ">=8"
+-        "node": ">=0.2.6"
 +        "node": ">= 0.8"
        }
      },
--    "node_modules/string-width-cjs/node_modules/emoji-regex": {
--      "version": "8.0.0",
--      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
--      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
--      "license": "MIT"
+-    "node_modules/toidentifier": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
 +    "node_modules/vasync": {
 +      "version": "2.2.1",
 +      "resolved": "https://registry.npmjs.org/vasync/-/vasync-2.2.1.tgz",
@@ -17884,21 +17194,25 @@ index 2af3a0d1..5c5f4b73 100644
 +      "engines": [
 +        "node >=0.6.0"
 +      ],
-+      "license": "MIT",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">=0.6"
 +      "optional": true,
 +      "dependencies": {
 +        "verror": "1.10.0"
-+      }
+       }
      },
--    "node_modules/string-width-cjs/node_modules/strip-ansi": {
--      "version": "6.0.1",
--      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
--      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+-    "node_modules/tsscmp": {
+-      "version": "1.0.6",
+-      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+-      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
 +    "node_modules/vasync/node_modules/core-util-is": {
 +      "version": "1.0.2",
 +      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 +      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
        "license": "MIT",
+-      "engines": {
+-        "node": ">=0.6.x"
 +      "optional": true
 +    },
 +    "node_modules/vasync/node_modules/verror": {
@@ -17910,20 +17224,16 @@ index 2af3a0d1..5c5f4b73 100644
 +      ],
 +      "license": "MIT",
 +      "optional": true,
-       "dependencies": {
--        "ansi-regex": "^5.0.1"
--      },
--      "engines": {
--        "node": ">=8"
++      "dependencies": {
 +        "assert-plus": "^1.0.0",
 +        "core-util-is": "1.0.2",
 +        "extsprintf": "^1.2.0"
        }
      },
--    "node_modules/strip-ansi": {
--      "version": "7.2.0",
--      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
--      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+-    "node_modules/type-is": {
+-      "version": "1.6.18",
+-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
 +    "node_modules/verror": {
 +      "version": "1.10.1",
 +      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
@@ -17931,204 +17241,15 @@ index 2af3a0d1..5c5f4b73 100644
        "license": "MIT",
 +      "optional": true,
        "dependencies": {
--        "ansi-regex": "^6.2.2"
+-        "media-typer": "0.3.0",
+-        "mime-types": "~2.1.24"
 +        "assert-plus": "^1.0.0",
 +        "core-util-is": "1.0.2",
 +        "extsprintf": "^1.2.0"
        },
        "engines": {
--        "node": ">=12"
--      },
--      "funding": {
--        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-+        "node": ">=0.6.0"
-       }
-     },
--    "node_modules/strip-ansi-cjs": {
--      "name": "strip-ansi",
--      "version": "6.0.1",
--      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
--      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-+    "node_modules/verror/node_modules/core-util-is": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-+      "license": "MIT",
-+      "optional": true
-+    },
-+    "node_modules/w3c-xmlserializer": {
-+      "version": "4.0.0",
-+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
-       "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "ansi-regex": "^5.0.1"
-+        "xml-name-validator": "^4.0.0"
-       },
-       "engines": {
--        "node": ">=8"
-+        "node": ">=14"
-       }
-     },
--    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
--      "version": "5.0.1",
--      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
--      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-+    "node_modules/weak-daemon": {
-+      "version": "1.0.3",
-+      "resolved": "https://registry.npmjs.org/weak-daemon/-/weak-daemon-1.0.3.tgz",
-+      "integrity": "sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ==",
-       "license": "MIT",
-+      "optional": true,
-       "engines": {
--        "node": ">=8"
-+        "node": ">=4.8.7"
-       }
-     },
--    "node_modules/tar-stream": {
--      "version": "3.1.8",
--      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
--      "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==",
--      "license": "MIT",
-+    "node_modules/web-push": {
-+      "version": "3.6.7",
-+      "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz",
-+      "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==",
-+      "license": "MPL-2.0",
-+      "optional": true,
-       "dependencies": {
--        "b4a": "^1.6.4",
--        "bare-fs": "^4.5.5",
--        "fast-fifo": "^1.2.0",
--        "streamx": "^2.15.0"
-+        "asn1.js": "^5.3.0",
-+        "http_ece": "1.2.0",
-+        "https-proxy-agent": "^7.0.0",
-+        "jws": "^4.0.0",
-+        "minimist": "^1.2.5"
-+      },
-+      "bin": {
-+        "web-push": "src/cli.js"
-+      },
-+      "engines": {
-+        "node": ">= 16"
-       }
-     },
--    "node_modules/teex": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
--      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
-+    "node_modules/web-streams-polyfill": {
-+      "version": "3.3.3",
-+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
-+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
-       "license": "MIT",
--      "dependencies": {
--        "streamx": "^2.12.5"
-+      "optional": true,
-+      "engines": {
-+        "node": ">= 8"
-       }
-     },
--    "node_modules/text-decoder": {
--      "version": "1.2.7",
--      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
--      "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
--      "license": "Apache-2.0",
-+    "node_modules/webdav": {
-+      "version": "5.9.0",
-+      "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.9.0.tgz",
-+      "integrity": "sha512-OMJ6wtK1WvCO++aOLoQgE96S8KT4e5aaClWHmHXfFU369r4eyELN569B7EqT4OOUb99mmO58GkyuiCv/Ag6J0Q==",
-+      "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "b4a": "^1.6.4"
--      }
--    },
--    "node_modules/thirty-two": {
--      "version": "1.0.2",
--      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
--      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==",
-+        "@buttercup/fetch": "^0.2.1",
-+        "base-64": "^1.0.0",
-+        "byte-length": "^1.0.2",
-+        "entities": "^6.0.1",
-+        "fast-xml-parser": "^5.3.4",
-+        "hot-patcher": "^2.0.1",
-+        "layerr": "^3.0.0",
-+        "md5": "^2.3.0",
-+        "minimatch": "^9.0.5",
-+        "nested-property": "^4.0.0",
-+        "node-fetch": "^3.3.2",
-+        "path-posix": "^1.0.0",
-+        "url-join": "^5.0.0",
-+        "url-parse": "^1.5.10"
-+      },
-       "engines": {
--        "node": ">=0.2.6"
-+        "node": ">=14"
-       }
-     },
--    "node_modules/toidentifier": {
--      "version": "1.0.1",
--      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
--      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
--      "license": "MIT",
-+    "node_modules/webdav/node_modules/entities": {
-+      "version": "6.0.1",
-+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
-+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
-+      "license": "BSD-2-Clause",
-+      "optional": true,
-       "engines": {
--        "node": ">=0.6"
-+        "node": ">=0.12"
-+      },
-+      "funding": {
-+        "url": "https://github.com/fb55/entities?sponsor=1"
-       }
-     },
--    "node_modules/tsscmp": {
--      "version": "1.0.6",
--      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
--      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
--      "license": "MIT",
-+    "node_modules/webidl-conversions": {
-+      "version": "7.0.0",
-+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-+      "license": "BSD-2-Clause",
-+      "optional": true,
-       "engines": {
--        "node": ">=0.6.x"
-+        "node": ">=12"
-       }
-     },
--    "node_modules/type-is": {
--      "version": "1.6.18",
--      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
--      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
--      "license": "MIT",
-+    "node_modules/websocket": {
-+      "version": "1.0.35",
-+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz",
-+      "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==",
-+      "license": "Apache-2.0",
-+      "optional": true,
-       "dependencies": {
--        "media-typer": "0.3.0",
--        "mime-types": "~2.1.24"
-+        "bufferutil": "^4.0.1",
-+        "debug": "^2.2.0",
-+        "es5-ext": "^0.10.63",
-+        "typedarray-to-buffer": "^3.1.5",
-+        "utf-8-validate": "^5.0.2",
-+        "yaeti": "^0.0.6"
-       },
-       "engines": {
 -        "node": ">= 0.6"
-+        "node": ">=4.0.0"
++        "node": ">=0.6.0"
        }
      },
 -    "node_modules/ua-client-hints-js": {
@@ -18150,7 +17271,13 @@ index 2af3a0d1..5c5f4b73 100644
 -        }
 -      ],
 -      "license": "MIT"
--    },
++    "node_modules/verror/node_modules/core-util-is": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
++      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
++      "license": "MIT",
++      "optional": true
+     },
 -    "node_modules/ua-parser-js": {
 -      "version": "1.0.40",
 -      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.40.tgz",
@@ -18169,103 +17296,218 @@ index 2af3a0d1..5c5f4b73 100644
 -          "url": "https://github.com/sponsors/faisalman"
 -        }
 -      ],
--      "license": "MIT",
--      "bin": {
--        "ua-parser-js": "script/cli.js"
-+    "node_modules/websocket-driver": {
-+      "version": "0.7.4",
-+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-+      "license": "Apache-2.0",
++    "node_modules/w3c-xmlserializer": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
++      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
++      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "http-parser-js": ">=0.5.1",
-+        "safe-buffer": ">=5.1.0",
-+        "websocket-extensions": ">=0.1.1"
++        "xml-name-validator": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/weak-daemon": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/weak-daemon/-/weak-daemon-1.0.3.tgz",
++      "integrity": "sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ==",
+       "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4.8.7"
++      }
++    },
++    "node_modules/web-push": {
++      "version": "3.6.7",
++      "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz",
++      "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==",
++      "license": "MPL-2.0",
++      "optional": true,
++      "dependencies": {
++        "asn1.js": "^5.3.0",
++        "http_ece": "1.2.0",
++        "https-proxy-agent": "^7.0.0",
++        "jws": "^4.0.0",
++        "minimist": "^1.2.5"
++      },
+       "bin": {
+-        "ua-parser-js": "script/cli.js"
++        "web-push": "src/cli.js"
        },
        "engines": {
 -        "node": "*"
-+        "node": ">=0.8.0"
++        "node": ">= 16"
        }
      },
 -    "node_modules/uglify-js": {
 -      "version": "3.19.3",
 -      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
 -      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
--      "license": "BSD-2-Clause",
-+    "node_modules/websocket-extensions": {
-+      "version": "0.1.4",
-+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-+      "license": "Apache-2.0",
++    "node_modules/web-streams-polyfill": {
++      "version": "3.3.3",
++      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
++      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/webdav": {
++      "version": "5.10.0",
++      "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.10.0.tgz",
++      "integrity": "sha512-fVPuRLtcduVGvSO7Tn/6TQCzIvI/g6BO/+xPRctCvi/GytYpjn4czxWbh4HsArsdom9qz9BI63k9/v2HBUui1A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@buttercup/fetch": "^0.2.1",
++        "base-64": "^1.0.0",
++        "byte-length": "^1.0.2",
++        "entities": "^6.0.1",
++        "fast-xml-parser": "^5.7.2",
++        "hot-patcher": "^2.0.1",
++        "layerr": "^3.0.0",
++        "md5": "^2.3.0",
++        "minimatch": "^9.0.9",
++        "nested-property": "^4.0.0",
++        "node-fetch": "^3.3.2",
++        "path-posix": "^1.0.0",
++        "url-join": "^5.0.0",
++        "url-parse": "^1.5.10"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/webdav/node_modules/entities": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
++      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+       "license": "BSD-2-Clause",
        "optional": true,
 -      "bin": {
 -        "uglifyjs": "bin/uglifyjs"
--      },
++      "engines": {
++        "node": ">=0.12"
+       },
++      "funding": {
++        "url": "https://github.com/fb55/entities?sponsor=1"
++      }
++    },
++    "node_modules/webidl-conversions": {
++      "version": "7.0.0",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
++      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
++      "license": "BSD-2-Clause",
++      "optional": true,
        "engines": {
-         "node": ">=0.8.0"
+-        "node": ">=0.8.0"
++        "node": ">=12"
        }
      },
 -    "node_modules/uid-safe": {
 -      "version": "2.1.5",
 -      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
 -      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+-      "license": "MIT",
++    "node_modules/websocket": {
++      "version": "1.0.35",
++      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz",
++      "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "random-bytes": "~1.0.0"
++        "bufferutil": "^4.0.1",
++        "debug": "^2.2.0",
++        "es5-ext": "^0.10.63",
++        "typedarray-to-buffer": "^3.1.5",
++        "utf-8-validate": "^5.0.2",
++        "yaeti": "^0.0.6"
+       },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=4.0.0"
+       }
+     },
+-    "node_modules/unpipe": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
++    "node_modules/websocket-driver": {
++      "version": "0.7.5",
++      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.5.tgz",
++      "integrity": "sha512-ZL2+3c7kMBdIRCMz6l8jQMHyGVxj+UL+xVk74Ombiciboca8rHa15L86B19E5oh1pL9Ii/uj54gtsIrZGMo6zA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "http-parser-js": ">=0.5.1",
++        "safe-buffer": ">=5.1.0",
++        "websocket-extensions": ">=0.1.1"
++      },
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/websocket-extensions": {
++      "version": "0.1.4",
++      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
++      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
 +    "node_modules/whatwg-encoding": {
 +      "version": "2.0.0",
 +      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
 +      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
 +      "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
        "license": "MIT",
-+      "optional": true,
-       "dependencies": {
--        "random-bytes": "~1.0.0"
-+        "iconv-lite": "0.6.3"
-       },
-       "engines": {
--        "node": ">= 0.8"
-+        "node": ">=12"
-       }
-     },
--    "node_modules/unpipe": {
--      "version": "1.0.0",
--      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
--      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-+      "version": "0.6.3",
-+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-       "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
-+        "safer-buffer": ">= 2.1.2 < 3.0.0"
++        "iconv-lite": "0.6.3"
 +      },
        "engines": {
 -        "node": ">= 0.8"
-+        "node": ">=0.10.0"
++        "node": ">=12"
        }
      },
 -    "node_modules/util": {
 -      "version": "0.12.5",
 -      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
 -      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-+    "node_modules/whatwg-fetch": {
-+      "version": "3.6.20",
-+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
-+      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
++    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
++      "version": "0.6.3",
++      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
++      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
        "license": "MIT",
--      "dependencies": {
++      "optional": true,
+       "dependencies": {
 -        "inherits": "^2.0.3",
 -        "is-arguments": "^1.0.4",
 -        "is-generator-function": "^1.0.7",
 -        "is-typed-array": "^1.1.3",
 -        "which-typed-array": "^1.1.2"
--      }
--    },
++        "safer-buffer": ">= 2.1.2 < 3.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
+       }
+     },
 -    "node_modules/util-deprecate": {
 -      "version": "1.0.2",
 -      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 -      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
 -      "license": "MIT"
++    "node_modules/whatwg-fetch": {
++      "version": "3.6.20",
++      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
++      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
++      "license": "MIT",
 +      "optional": true
      },
 -    "node_modules/utils-merge": {
@@ -18303,7 +17545,7 @@ index 2af3a0d1..5c5f4b73 100644
        }
      },
      "node_modules/which": {
-@@ -2477,6 +16618,87 @@
+@@ -2477,6 +15939,87 @@
          "node": ">= 8"
        }
      },
@@ -18391,20 +17633,15 @@ index 2af3a0d1..5c5f4b73 100644
      "node_modules/which-typed-array": {
        "version": "1.1.20",
        "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
-@@ -2492,10 +16714,143 @@
-         "has-tostringtag": "^1.0.2"
-       },
-       "engines": {
--        "node": ">= 0.4"
--      },
--      "funding": {
--        "url": "https://github.com/sponsors/ljharb"
-+        "node": ">= 0.4"
-+      },
-+      "funding": {
-+        "url": "https://github.com/sponsors/ljharb"
-+      }
-+    },
+@@ -2498,11 +16041,181 @@
+         "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/wordwrap": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+-      "license": "MIT"
 +    "node_modules/wide-align": {
 +      "version": "1.1.5",
 +      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
@@ -18536,13 +17773,14 @@ index 2af3a0d1..5c5f4b73 100644
 +      },
 +      "engines": {
 +        "node": ">= 6"
-       }
-     },
-     "node_modules/wordwrap": {
-@@ -2504,6 +16859,43 @@
-       "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-       "license": "MIT"
-     },
++      }
++    },
++    "node_modules/wordwrap": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
++      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
++      "license": "MIT"
++    },
 +    "node_modules/worker-timers": {
 +      "version": "7.1.8",
 +      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz",
@@ -18579,11 +17817,10 @@ index 2af3a0d1..5c5f4b73 100644
 +        "@babel/runtime": "^7.24.5",
 +        "tslib": "^2.6.2"
 +      }
-+    },
+     },
      "node_modules/wrap-ansi": {
        "version": "8.1.0",
-       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-@@ -2595,6 +16987,32 @@
+@@ -2595,6 +16308,32 @@
          "node": ">=8"
        }
      },
@@ -18616,7 +17853,7 @@ index 2af3a0d1..5c5f4b73 100644
      "node_modules/ws": {
        "version": "8.18.3",
        "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-@@ -2616,6 +17034,251 @@
+@@ -2616,6 +16355,267 @@
          }
        }
      },
@@ -18668,6 +17905,22 @@ index 2af3a0d1..5c5f4b73 100644
 +        "node": ">=12"
 +      }
 +    },
++    "node_modules/xml-naming": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.1.0.tgz",
++      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=16.0.0"
++      }
++    },
 +    "node_modules/xml2js": {
 +      "version": "0.6.2",
 +      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
@@ -18781,9 +18034,9 @@ index 2af3a0d1..5c5f4b73 100644
 +      "optional": true
 +    },
 +    "node_modules/yargs": {
-+      "version": "17.7.2",
-+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
++      "version": "17.7.3",
++      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz",
++      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
 +      "license": "MIT",
 +      "optional": true,
 +      "dependencies": {
@@ -18868,7 +18121,7 @@ index 2af3a0d1..5c5f4b73 100644
      "node_modules/yauzl": {
        "version": "2.10.0",
        "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-@@ -2635,6 +17298,26 @@
+@@ -2635,6 +16635,26 @@
          "node": "*"
        }
      },
@@ -18895,7 +18148,7 @@ index 2af3a0d1..5c5f4b73 100644
      "node_modules/zip-stream": {
        "version": "6.0.1",
        "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
-@@ -2648,6 +17331,158 @@
+@@ -2648,6 +16668,158 @@
        "engines": {
          "node": ">= 14"
        }
@@ -19055,7 +18308,7 @@ index 2af3a0d1..5c5f4b73 100644
    }
  }
 diff --git a/package.json b/package.json
-index df713ddb..4a0d3fae 100644
+index dac5821d..1c10d82c 100644
 --- a/package.json
 +++ b/package.json
 @@ -56,6 +56,65 @@
@@ -19122,8 +18375,8 @@ index df713ddb..4a0d3fae 100644
 +    "zulip": "^0.1.0"
 +  },
    "engines": {
-     "node": ">=16.0.0"
+     "node": ">=20.0.0"
    },
 -- 
-2.51.2
+2.54.0
 
diff --git a/pkgs/by-name/me/meshcentral/package.nix b/pkgs/by-name/me/meshcentral/package.nix
index b42126860b79..568b41107e93 100644
--- a/pkgs/by-name/me/meshcentral/package.nix
+++ b/pkgs/by-name/me/meshcentral/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "meshcentral";
-  version = "1.1.59";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "Ylianst";
     repo = "MeshCentral";
     tag = finalAttrs.version;
-    hash = "sha256-qfiIofwFOXHzxnqyJyXCgwMqBhONjBiU/5YLOE7u4n8=";
+    hash = "sha256-a+vqNjmKP866O2t+UsedpgYtWFbjeoYNtuCziAa436A=";
   };
 
-  npmDepsHash = "sha256-UYPx3OIeT1HUgyjY743F/DTwsfIRTlsQLJxK99LbA/k=";
+  npmDepsHash = "sha256-ZnSpqw4pn6OI8Gh9qLseTLH24jtj1zPGfHiMlUX+l/s=";
   # Using the npmDeps with a newer nodejs causes `npm ci` errors, also upstream
   # states they stick to the LTS version of nodejs:
   # https://meshcentral.com/docs/MeshCentral2InstallGuide.pdf
diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix
index d17699a902af..56c617c0768e 100644
--- a/pkgs/by-name/mi/miracle-wm/package.nix
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   gitUpdater,
   nixosTests,
   boost,
@@ -42,6 +43,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-7JtdSopKBHfFK0KsV0+9OxrOx3vrSydmZSmAiBvKQiI=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "0001-miracle-wm-mir2.28.patch";
+      url = "https://github.com/miracle-wm-org/miracle-wm/commit/0fcfb54c59327d0776f6e8074e885080731a95c4.patch";
+      excludes = [
+        ".github/workflows/test-deb-install.yml"
+      ];
+      hash = "sha256-HuXwPkM0whLFIy8HM6n9bG9I/DZOuzAajmDpJMZt9BQ=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'DESTINATION lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 9e8a465665d6..6cb63b4bba03 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -31,13 +31,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
-  version = "0.14.2";
+  version = "0.14.8";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j4HaBmWzCFAmkzeEWln+nSwNuvlv5zmwf89ClGqCvus=";
+    hash = "sha256-s34vmm0Apy20FrfSjESXtj+uggvr4ODpOrxfapAKtlc=";
   };
 
   patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '1.0.0-local' '${finalAttrs.version}'
   '';
 
-  cargoHash = "sha256-VKz06Z3bFuJrzNEeIF6O4N0Mju1RtuZVQfw2ONIBwmg=";
+  cargoHash = "sha256-JU8QhdDikqe9a/MXVe2jSsXATvwdgpyjWr7pV/75C9E=";
 
   mitmCache = gradle.fetchDeps {
     inherit (finalAttrs) pname;
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-bBXnRtFeMzBr3XvXqYsY2iGHD7q4qDrPhxW163N0MTo=";
+    hash = "sha256-pbEKD8xkO7+//m0PBcAL62q0LC5YEKR+wOPGnzXIRJk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mu/multicharge/package.nix b/pkgs/by-name/mu/multicharge/package.nix
index b4fcbe0cf512..4cf03bdfee7d 100644
--- a/pkgs/by-name/mu/multicharge/package.nix
+++ b/pkgs/by-name/mu/multicharge/package.nix
@@ -25,13 +25,13 @@ assert (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "multicharge";
-  version = "0.3.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "grimme-lab";
     repo = "multicharge";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8qwM3dpvFoL2WrMWNf14zYtRap0ijdfZ95XaTlkHhqQ=";
+    hash = "sha256-hswqC+fvC6tuxDpuUgowyqm72ubVikzpR4EzXtTM5cs=";
   };
 
   patches = [
@@ -69,6 +69,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs --build config/install-mod.py
+
+    # custom blas and lapack need to be explicitly found for transitive dependencies
+    # otherwise CMAKE builds can not proceed.
+    echo 'set(custom-blas_FOUND TRUE)' >> config/cmake/Findcustom-blas.cmake
+    echo 'set(custom-lapack_FOUND TRUE)' >> config/cmake/Findcustom-lapack.cmake
   '';
 
   preCheck = ''
diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix
index d78ff685fa3e..b99f3a9728e6 100644
--- a/pkgs/by-name/my/mymake/package.nix
+++ b/pkgs/by-name/my/mymake/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mymake";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "fstromback";
     repo = "mymake";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OjlcQ49jxMMmAhyl8c6lREOwBE63s+DIEf+rFElUsi0=";
+    hash = "sha256-H7uoTnFtRf0jaqQ+N2IK4I+edx+cK/5wXDG1Orc2XcY=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/ni/niks3/package.nix b/pkgs/by-name/ni/niks3/package.nix
index c085fd2fa609..cfe54c13d76f 100644
--- a/pkgs/by-name/ni/niks3/package.nix
+++ b/pkgs/by-name/ni/niks3/package.nix
@@ -21,6 +21,7 @@ buildGoModule (finalAttrs: {
 
   subPackages = [
     "cmd/niks3"
+    "cmd/niks3-hook"
     "cmd/niks3-server"
   ];
 
diff --git a/pkgs/by-name/nu/numberstation/package.nix b/pkgs/by-name/nu/numberstation/package.nix
index 0915783e742a..3756c27fb3d6 100644
--- a/pkgs/by-name/nu/numberstation/package.nix
+++ b/pkgs/by-name/nu/numberstation/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3,
   fetchFromSourcehut,
+  fetchurl,
   desktop-file-utils,
   glib,
   gobject-introspection,
@@ -16,17 +17,24 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "numberstation";
-  version = "1.4.0";
+  version = "1.5.0";
 
   pyproject = false;
 
   src = fetchFromSourcehut {
     owner = "~martijnbraam";
     repo = "numberstation";
-    rev = finalAttrs.version;
-    hash = "sha256-0T/Dc2i6auuZiWjcPR72JT8yOrzmdEmbW2PS5YhmEwI=";
+    tag = finalAttrs.version;
+    hash = "sha256-N8hTXlJcekg/+dCK/tp2EhbNBtj8n9K3LHURRI5ruQQ=";
   };
 
+  patches = [
+    (fetchurl {
+      url = "https://src.fedoraproject.org/rpms/numberstation/raw/05cb9e58d879cd9d224862bb72c373374de63943/f/0001-Fix-if-statement-after-b32decode-removal.patch";
+      hash = "sha256-grTSKdXl1WIK+n4rOe/g4lczc8eIuCU1ZqHI1VNkJ8w=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs build-aux/meson
   '';
diff --git a/pkgs/by-name/oc/ocenaudio/package.nix b/pkgs/by-name/oc/ocenaudio/package.nix
index a23717687f7f..dec0a40edcce 100644
--- a/pkgs/by-name/oc/ocenaudio/package.nix
+++ b/pkgs/by-name/oc/ocenaudio/package.nix
@@ -14,14 +14,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ocenaudio";
-  version = "3.15.3";
+  version = "3.17.1";
 
   src = fetchurl {
     name = "ocenaudio.deb";
     url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian12.deb?version=v${finalAttrs.version}";
-    hash = "sha256-Nc4G+p6KLlID59kVYmlU+UE7vIPYeTqQeCEv9hrJnh0=";
+    hash = "sha256-PkIMw8h0LenAM+zmOM30YpOlpaAMbpsH6djMLHgkZOA=";
   };
 
+  autoPatchelfIgnoreMissingDeps = [
+    "libqtocenai.so.3.15"
+    "libqtocencore.so.3.15"
+  ];
+
   nativeBuildInputs = [
     autoPatchelfHook
     qt6.wrapQtAppsHook
diff --git a/pkgs/by-name/og/oggvideotools/package.nix b/pkgs/by-name/og/oggvideotools/package.nix
index 33b4e50ee1f3..8b371823f096 100644
--- a/pkgs/by-name/og/oggvideotools/package.nix
+++ b/pkgs/by-name/og/oggvideotools/package.nix
@@ -3,6 +3,8 @@
   stdenv,
   fetchurl,
   fetchpatch,
+  fetchDebianPatch,
+  libresample,
   cmake,
   pkg-config,
   boost,
@@ -22,29 +24,71 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # Fix pending upstream inclusion for missing includes:
-    #  https://sourceforge.net/p/oggvideotools/bugs/12/
-    (fetchpatch {
-      name = "gcc-10.patch";
-      url = "https://sourceforge.net/p/oggvideotools/bugs/12/attachment/fix-compile.patch";
-      hash = "sha256-mJttoC3jCLM3vmPhlyqh+W0ryp2RjJGIBXd6sJfLJA4=";
+    # Avoid crashing in oggjoin on bogus input
+    (fetchDebianPatch {
+      inherit (finalAttrs) pname version;
+      debianRevision = "7";
+      patch = "mayhem-crash-oggjoin.patch";
+      hash = "sha256-0D22P+Qdf9Sfp6vptSnL4E33NVUL/XL72gNE36BF6QI=";
     })
-
-    # Fix pending upstream inclusion for build failure on gcc-12:
-    #  https://sourceforge.net/p/oggvideotools/bugs/13/
+    # Fix typos in manpages
+    (fetchDebianPatch {
+      inherit (finalAttrs) pname version;
+      debianRevision = "7";
+      patch = "manual-typos.patch";
+      hash = "sha256-yGzHGEADlSRnWZIN8x6xfg9ChAn8WKFQgZAJmbKtKq8=";
+    })
+    # Avoid crash on unknown command-line arguments
+    (fetchDebianPatch {
+      inherit (finalAttrs) pname version;
+      debianRevision = "7";
+      patch = "oggThumb-zero-getopt-long.patch";
+      hash = "sha256-LBgmpyyxmeAFE3zpeHRryuxboMBdBztUEGxbs0Ay+HU=";
+    })
+    # Prevent uninitialized read
+    (fetchDebianPatch {
+      inherit (finalAttrs) pname version;
+      debianRevision = "7";
+      patch = "init-for-valgrind.patch";
+      hash = "sha256-7BtdAGHHW860hFZYlRWDVfEw6CDkb18HfFROZHl+guY=";
+    })
+    # Fix compilation due to missing include
+    (fetchDebianPatch {
+      inherit (finalAttrs) pname version;
+      debianRevision = "7";
+      patch = "import-cstring.patch";
+      hash = "sha256-KMs4nyILveKY+ZmcSONmtS5+sAPPB+ypNUi9yzxBsXQ=";
+    })
+    # Fix out-of-bounds read
     (fetchpatch {
-      name = "gcc-12.patch";
-      url = "https://sourceforge.net/p/oggvideotools/bugs/13/attachment/fix-gcc-12.patch";
-      hash = "sha256-zuDXe86djWkR8SgYZHkuAJJ7Lf2VYsVRBrlEaODtMKE=";
-      # svn patch, rely on prefix added by fetchpatch:
-      extraPrefix = "";
+      url = "https://salsa.debian.org/multimedia-team/oggvideotools/-/raw/ed006e5d78f9509508dbc72277de8ab3c06d2362/debian/patches/1010-kate-header-buffer-read-past-end.patch";
+      hash = "sha256-CEkNG9tHZIggCvKRPj2pKI855pVWQUdudLfpda/ZVME=";
+    })
+    # Fix null pointer crash (CVE-2020-21723)
+    (fetchpatch {
+      url = "https://salsa.debian.org/multimedia-team/oggvideotools/-/raw/122047a7cf644e282906370f277ae83b4672e5e4/debian/patches/1020-CVE-2020-21723-null-pointer-crash.patch";
+      hash = "sha256-dUkMfEaB5Hn9I5+QbE/002X6ij+xIzzqjc8QTom1ITk=";
+    })
+    # Unbundle libresample
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/oggvideotools/raw/23f918f39278d87adb5a5ab2e57d5cc1816e1e8a/f/0005-unbundle-libresample.patch";
+      hash = "sha256-JSuH8ScYBi6zAgEhrFdPOGCSXzDk+lEnSHX9wuctAsg=";
+    })
+    # Fix buffer overflow (CVE-2020-21724)
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/oggvideotools/raw/2dd078ea81773a34cc0c4817ebbf3c4038b8098c/f/stream-serializer.diff";
+      hash = "sha256-3HkAuCBaNjKoTN8Q3oW89e3zXo13Ev5g7VJ/RPO3zRA=";
     })
   ];
 
   postPatch = ''
     # Don't disable optimisations
-    substituteInPlace CMakeLists.txt --replace " -O0 " ""
-  '';
+    substituteInPlace CMakeLists.txt --replace-fail " -O0 " ""
+  ''
+  # Fix "src/effect/pictureBlend.cpp:28:11: error: no matching conversion for functional-style cast from 'const char[39]' to 'OggException'"
+  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i '1i #include <string>' src/effect/pictureBlend.cpp
+  '');
 
   nativeBuildInputs = [
     cmake
@@ -55,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     gd
     libogg
+    libresample
     libtheora
     libvorbis
   ];
@@ -69,9 +114,5 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sourceforge.net/projects/oggvideotools/";
     license = lib.licenses.gpl2Only;
     maintainers = [ ];
-    # Compilation error on Darwin:
-    # error: invalid argument '--std=c++0x' not allowed with 'C'
-    # make[2]: *** [src/libresample/CMakeFiles/resample.dir/build.make:76: src/libresample/CMakeFiles/resample.dir/filterkit.c.o] Error 1
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 698b6d0e71c1..c75389c729dd 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2026.518.0";
+  version = "2026.620.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-T/uoriXCXfK+HnLqMZ3xQ79qmlT5rVaoeEi5Wgu1Oc4=";
+        hash = "sha256-SHqi+RFMwYkChmCc0i1X/bmMajVSLaWuNCx9+cDkg7E=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-G/l2WSgl7GcIMHmb86K4qzryMirebe5dmnMrsSlYNfY=";
+        hash = "sha256-WXMyeoTixCNPin+hIK+1v2bX26MWnsQ7ZQGwJQ7jbyc=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-4LLNjrKEBS77LIbq+O6Xpxj6CvufGDApNqs61HN2JmA=";
+        hash = "sha256-rLom/UwqVOXUk/ayLvekRQMD49p5MB9BA6RCohtuPfg=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 06226929f584..f3639cbf1561 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -306,73 +306,73 @@
   },
   {
     "pname": "MessagePack",
-    "version": "3.1.4",
-    "hash": "sha256-oju/hX+vwZFqSa9ORSa58ToM3cE7fF8x34i2oNLGNVo="
+    "version": "3.1.7",
+    "hash": "sha256-py3XIEui3oKewH1Mqs9LfC+2KU3QgfiAH5BF3kB34FI="
   },
   {
     "pname": "MessagePack.Annotations",
-    "version": "3.1.4",
-    "hash": "sha256-YZGKa20siabb4VIQri5dMuFwnDxX19Htf51nGrIPx28="
+    "version": "3.1.7",
+    "hash": "sha256-9J/VyKzBsEkxVoQ4JAwKVf76qeBOSYHXbq/9Ld8mzNw="
   },
   {
     "pname": "MessagePackAnalyzer",
-    "version": "3.1.4",
-    "hash": "sha256-qc+mzydfbZ/0O4j7pPDjp+x8aQ4KYqMeCDRIPhb1oe8="
+    "version": "3.1.7",
+    "hash": "sha256-JWbvORWWLK3bcGPPYGrgYCFlAoT2GRkvxEuaLwPw9O4="
   },
   {
     "pname": "Microsoft.AspNetCore.Connections.Abstractions",
-    "version": "10.0.5",
-    "hash": "sha256-ciMnBkc2qy6/I3qhYspbf/OHQGUBPaxHvA0+y1xCJYE="
+    "version": "10.0.9",
+    "hash": "sha256-HJCo8Awo3HV11ybVilXgPpTSDlbyDoC82CZgRcaL5F0="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections.Client",
-    "version": "10.0.5",
-    "hash": "sha256-gX/cRqxkee+v4RD0w17OdshRH0iVxx1zCyl7/G79WQs="
+    "version": "10.0.9",
+    "hash": "sha256-XHRobssPKBWW5yXnZz4MCqRGes2woFGErmDSGyGYguc="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections.Common",
-    "version": "10.0.5",
-    "hash": "sha256-pM90k96qeIWJHCn9LBTHQ6ODvrRdn0GShbiH/I/RYk8="
+    "version": "10.0.9",
+    "hash": "sha256-RQUuuzrCAckTG12w4pSanj2skwVa9uUiYzUTIJoTXyM="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Client",
-    "version": "10.0.5",
-    "hash": "sha256-avbFNCuSi4xFK8QHhQ2Bz3UfRqaEpbbl1x+LhqQvKv4="
+    "version": "10.0.9",
+    "hash": "sha256-6q1J47w83YmG/rHlfuqVWf90GhdwRm1AdtVN8WOoVcY="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Client.Core",
-    "version": "10.0.5",
-    "hash": "sha256-0kLjqwX7lvdDU2gjTAbHtS5KVA5uA9qeE8kh8zxDq1k="
+    "version": "10.0.9",
+    "hash": "sha256-zzV5Po6eXf3jgWXnSkn6zQLuqGTmEf5rIsh1+Zou0/k="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Common",
-    "version": "10.0.5",
-    "hash": "sha256-oVs3VUtFd8zRls5nHpX/y6SJiVcI7x+rD6xw3kJrl5M="
+    "version": "10.0.9",
+    "hash": "sha256-B4bEaTOTJOMKNtcw+yxKqZZqQ8NS2NMa7wf8sVATcPw="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
-    "version": "10.0.5",
-    "hash": "sha256-m3zjs4Pc9NERMkXnPaegB2ZMuLHcRRqtjmD83CXQ13g="
+    "version": "10.0.9",
+    "hash": "sha256-lMpbw7f4Im8BxD57s3s+mii5svedLbEifXGkUXrNe74="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.MessagePack",
-    "version": "10.0.5",
-    "hash": "sha256-9fiZVKUrsx+X9YU3l+RmUbtHucVSy32/vPwH3HDc0PU="
+    "version": "10.0.9",
+    "hash": "sha256-AfeFVE0qIi+8H5Sl+T/GnRV5nOw019g+Y6CW0EgJ0h0="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson",
-    "version": "10.0.5",
-    "hash": "sha256-pWyollxtDu+Cz/82c6THEJWTuti+fWcvygMbiPKvP8Q="
+    "version": "10.0.9",
+    "hash": "sha256-fX+3drOpOxdYVd2fNVG31/MhLCziPScTe57TpzCX25A="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "10.0.5",
-    "hash": "sha256-HLhS6ysB8lh2TRtFn1EiE2MOjd3og1uniEFFVaz96UU="
+    "version": "10.0.9",
+    "hash": "sha256-grzyENbFc7Ct0dgmUgSn1Tr3ndM1fdlQGiSBLzYtC9c="
   },
   {
     "pname": "Microsoft.Bcl.TimeProvider",
-    "version": "10.0.5",
-    "hash": "sha256-kkfOuLkIDFosDpC/ro4Pfh7fEHUyNwkx7GLZEftUn0Y="
+    "version": "10.0.9",
+    "hash": "sha256-ZU53Uxx7+a4ECqkzdkP6HpHLVbJbvAN8p3iTI9tcFsA="
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -386,8 +386,8 @@
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "10.0.5",
-    "hash": "sha256-A69tzaD9RjkxdHPj3Jm1WizdBM9QfLQyHuhs9TGrwqA="
+    "version": "10.0.9",
+    "hash": "sha256-qecYi4Zv3k1rMG66B5NUGv0GfUZwJ/CuFOZx/McApYk="
   },
   {
     "pname": "Microsoft.Diagnostics.NETCore.Client",
@@ -401,8 +401,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "10.0.5",
-    "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+    "version": "10.0.9",
+    "hash": "sha256-pliaksEAQdxyPURUVSlXpfF3LzJB93zHaeEDsaF5QJE="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -411,8 +411,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "10.0.5",
-    "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
+    "version": "10.0.9",
+    "hash": "sha256-YIqgDknwTq48X88Imdrfav3tmQ6tZwIOYsLt6dT40M8="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -421,8 +421,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.5",
-    "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+    "version": "10.0.9",
+    "hash": "sha256-YzQpGAsrjLU18s016LmM7DMJKml0MzKl1bPPYJ/erEk="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -431,18 +431,18 @@
   },
   {
     "pname": "Microsoft.Extensions.Features",
-    "version": "10.0.5",
-    "hash": "sha256-OazAQa1XfjiLGxEbmovB8UeXYHXpdxlA/58qFQmBFl8="
+    "version": "10.0.9",
+    "hash": "sha256-WjjD+W+IyQKy0/WWcAHmr+Ob3VQ3yKRnTf2qDQIxcsg="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "10.0.5",
-    "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
+    "version": "10.0.9",
+    "hash": "sha256-644xYxPB+PtwGUTAKJV9wByXHWFkR5Ol0p08wFQwMm4="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.5",
-    "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
+    "version": "10.0.9",
+    "hash": "sha256-su2q/OZuG7nB3wnUTVcimy3oHSdetFh4hhmjI3f/ym8="
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
@@ -451,8 +451,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "10.0.5",
-    "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
+    "version": "10.0.9",
+    "hash": "sha256-/fc1g1SDJI81nOZRS7W4LZIAC0ssmasqaWhgJK+9rRs="
   },
   {
     "pname": "Microsoft.Extensions.Options",
@@ -461,8 +461,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "10.0.5",
-    "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+    "version": "10.0.9",
+    "hash": "sha256-WEPtmlEexm6QSFR4ITlBHuUD5/bqMfecOxFe5hkbAPU="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -581,8 +581,8 @@
   },
   {
     "pname": "ppy.LocalisationAnalyser",
-    "version": "2025.1208.0",
-    "hash": "sha256-klogAaNxpEVJKd1NcySgTUwv5WwrvaUXBRypj5wKX5Y="
+    "version": "2026.611.0",
+    "hash": "sha256-qcqIMQum8hCgZrvwbP5KjwJTLUyRwogTXhNFrhDP2+4="
   },
   {
     "pname": "ppy.LocalisationAnalyser.Tools",
@@ -616,8 +616,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2026.513.0",
-    "hash": "sha256-9mrCn7mBxDYUAhD4cJSDRanPD1fghDlmJEu3rqExJbY="
+    "version": "2026.616.0",
+    "hash": "sha256-Q9pyMPIpyiAp63VYiWEM8Zbiek0aXdsNBZY2ECaaZ/U="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -631,8 +631,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2026.516.0",
-    "hash": "sha256-jMm4uJBhaqfi8QKayMWlN4IDn8mR+gtHDGRZgzbYFtI="
+    "version": "2026.523.0",
+    "hash": "sha256-BLSFNtPU9d+Qv/sGY6d1c7rnKyJkKu66zRZGsw1oS4M="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -646,8 +646,8 @@
   },
   {
     "pname": "ppy.SDL3-CS",
-    "version": "2026.512.0",
-    "hash": "sha256-JWa1njiqY0Cz1bME5uQ4jSxfY9VCThNcmMttMXKGH5Y="
+    "version": "2026.520.0",
+    "hash": "sha256-Owz9gClqs1Dnb+EHk4Xpl/tdbXSOwqrL67tTatj+HRU="
   },
   {
     "pname": "ppy.Veldrid",
@@ -951,13 +951,13 @@
   },
   {
     "pname": "Sentry",
-    "version": "6.2.0",
-    "hash": "sha256-mGCqvgqXvCxXZcreXHDzyZqSnIkHFSwNWGaPzX5AQFY="
+    "version": "6.6.0",
+    "hash": "sha256-IDDBHUcJkxliwRtn+xjh6Dy4vpmfvyBdXF1VMeUh2pw="
   },
   {
     "pname": "SharpCompress",
-    "version": "0.48.0",
-    "hash": "sha256-2MXainbTJeuBwRA6eJU+AlUT8ireNrWxHYNCMkFG8Lc="
+    "version": "0.49.1",
+    "hash": "sha256-o2IpO605TKJ2mJLKnxWBHtCFnFJPnRj6zMQJBCGgNGw="
   },
   {
     "pname": "SharpFNT",
@@ -981,18 +981,18 @@
   },
   {
     "pname": "SourceGear.sqlite3",
-    "version": "3.50.4.2",
-    "hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
+    "version": "3.50.4.5",
+    "hash": "sha256-yPOyLiK4QoTfE3IED0hFl1JJYjmt8RBB3fp1a1CwvqE="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
-    "version": "3.0.2",
-    "hash": "sha256-l3LqZUP4iVNyMJuBxr1VYDJr28VqoCPUPmXX6JC2ldU="
+    "version": "3.0.3",
+    "hash": "sha256-TPRW+2PX4EPVC79or+ZxxD1cJtzf1CRckvEuGq2rY0o="
   },
   {
     "pname": "SQLitePCLRaw.config.e_sqlite3",
-    "version": "3.0.2",
-    "hash": "sha256-Q8wi2rEqnE1n53DZ1wnaM8Dr5h/Bic1/EiytK3XQzrU="
+    "version": "3.0.3",
+    "hash": "sha256-Hwzxtx+/KLkZNWSs1btOMJMkgt23P0p98t7hUhbKShw="
   },
   {
     "pname": "SQLitePCLRaw.core",
@@ -1001,13 +1001,13 @@
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "3.0.2",
-    "hash": "sha256-AK1Yc78ykY3H0Jq1INq3O1x278CtcWH7dF9heKhWvno="
+    "version": "3.0.3",
+    "hash": "sha256-MLuN7KzfhWyVX3i4pi55KQp9J8JR83sCCveeUusDKqw="
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "3.0.2",
-    "hash": "sha256-LOD39Pqx58tMjP4uc4j8BvzhnsIRFocX9e5a8I1ZgPg="
+    "version": "3.0.3",
+    "hash": "sha256-brVPu6YEBbKtfKrf5PV8sDZZsmlZFgL5Kse6FP01uF0="
   },
   {
     "pname": "StbiSharp",
@@ -1071,8 +1071,8 @@
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "10.0.5",
-    "hash": "sha256-yVXEbpbQRF+B4oYUJEWUgMUmOvZTFZzK3CWrr9pynVY="
+    "version": "10.0.9",
+    "hash": "sha256-atVKtt+sHv0bAcJwchFYYT5PO/dcDnaeidrN42GqgSg="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
@@ -1146,13 +1146,13 @@
   },
   {
     "pname": "System.IO.Packaging",
-    "version": "10.0.5",
-    "hash": "sha256-nR3shhnchCqZq//ypgn+/l2QDiiSbNKpSswqZ43rxoM="
+    "version": "10.0.9",
+    "hash": "sha256-uVRTp58+SM5CsYG3ya4i6v7kJ2jpSao9YkOgmU5FCk0="
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "10.0.5",
-    "hash": "sha256-zV+G9x2d3ugEaq7ClmZbMhQe0901hxj0WtleEEglpcE="
+    "version": "10.0.9",
+    "hash": "sha256-mOoa73lPXvGGA56igef9alNU/nc+nQEOHPJu44dHepc="
   },
   {
     "pname": "System.Linq",
@@ -1194,11 +1194,6 @@
     "version": "4.5.5",
     "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
   },
-  {
-    "pname": "System.Memory",
-    "version": "4.6.3",
-    "hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU="
-  },
   {
     "pname": "System.Net.Http",
     "version": "4.3.0",
@@ -1221,8 +1216,8 @@
   },
   {
     "pname": "System.Net.ServerSentEvents",
-    "version": "10.0.5",
-    "hash": "sha256-kIFzD6o58dtrWohy2lZFAkPPJvTwAcKVDBGryke5mtM="
+    "version": "10.0.9",
+    "hash": "sha256-wwBwbcl48xHSvZ5UBMRVMlPTVuwe64pV9kZgB1QlRXI="
   },
   {
     "pname": "System.Net.Sockets",
@@ -1486,13 +1481,13 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "10.0.5",
-    "hash": "sha256-8dXorb9rjnaqD8EpGlyHkvKrwgcxZblQdzeLYDdk6lw="
+    "version": "10.0.9",
+    "hash": "sha256-YBpgyDvUYB44J84TtkIJkDh4c42grtn9fmxgV073FxQ="
   },
   {
     "pname": "System.Text.Json",
-    "version": "10.0.5",
-    "hash": "sha256-Phy+3UAOvqk8U0yeCSpr4n6H7JjKMTHdrHlV2bZfiUU="
+    "version": "10.0.9",
+    "hash": "sha256-7LNfBJ5Q/yxOuFa6d0mEIBNJEfO/UN5J13qbIFIo/5A="
   },
   {
     "pname": "System.Text.RegularExpressions",
@@ -1511,8 +1506,8 @@
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "10.0.5",
-    "hash": "sha256-mk27zxVvlbgOSOsKl0NqV6aHbdyJkMMM8CGh5MZdTqI="
+    "version": "10.0.9",
+    "hash": "sha256-S5yngTQadsNpAO/BMISwF1metuXXzq0A6vUUR4nqaZ0="
   },
   {
     "pname": "System.Threading.Channels",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index ea37c897ea5c..0589b96c6ed2 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2026.518.0";
+  version = "2026.620.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-ELtK5itKM7QIdVWzy3bHurp76AJvXA1a15OkYJgFcvU=";
+    hash = "sha256-I2cziF/XRZhMRZCyjoec7G03IxldDMNQ//A7CmFW6/Y=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";
diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix
index 81636f9e52ed..bcdb75397a71 100644
--- a/pkgs/by-name/pa/par-lang/package.nix
+++ b/pkgs/by-name/pa/par-lang/package.nix
@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "par-lang";
-  version = "0-unstable-2026-06-08";
+  version = "0-unstable-2026-06-11";
 
   src = fetchFromGitHub {
     owner = "par-team";
     repo = "par-lang";
-    rev = "00bc7dc279ec622c68dac81ff226dbb189f42cc4";
-    hash = "sha256-a5uqmtTj+zS1C6ARu/y3aYykeBVINKSlh7p9fmAlsIs=";
+    rev = "0d763e90deb6bdd7888686a944efa8e1f813ded6";
+    hash = "sha256-7UJwbusV+F/KI8Xvau/thRY60xRDfBc6xUdo5QhVayE=";
   };
 
-  cargoHash = "sha256-IoZbNvCzeuOMVjfbTUGr+qs73IvFmPTK9rn6x40SYBQ=";
+  cargoHash = "sha256-8lG+cKN3/W+LYWhmOfDwGiq6u3nlLJaD5uNABaY0zRY=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/pl/plezy/git-hashes.json b/pkgs/by-name/pl/plezy/git-hashes.json
index 295d1be3f70e..af3ee856e9f5 100644
--- a/pkgs/by-name/pl/plezy/git-hashes.json
+++ b/pkgs/by-name/pl/plezy/git-hashes.json
@@ -3,8 +3,9 @@
   "auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
   "auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
   "auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
-  "background_downloader": "sha256-hW3fD7X1l6dPITPchE9lzpFwsIZ597JsgsBeAyQPjI0=",
+  "background_downloader": "sha256-VHi4g/S/kCxxaeHnDTc64oS6lMHMFiU31VqFqBmdmo8=",
+  "connectivity_plus": "sha256-PGt4eEp32+w4XMDVwB0Kjla1OSole4l/++Zs5PHXs/U=",
   "material_symbols_icons": "sha256-XRB6AZ4Q33sQKVZFA8lgdXCW/bx55h/RpmuItmFYVJM=",
-  "os_media_controls": "sha256-0Bghn1s28+xlcfSLyVA7B60atJkkdqcFKseSubPtzkQ=",
+  "os_media_controls": "sha256-Xd1RdtmZbuWaljNXZ/rSInQF5/F06aPtr1uVrxIdhP8=",
   "wakelock_plus": "sha256-89xs0sLNuoCqApFqwEY+SEk2DUqjHf8JsSd7dfxX3P0="
 }
diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix
index b4003022c43e..ea0434432b95 100644
--- a/pkgs/by-name/pl/plezy/package.nix
+++ b/pkgs/by-name/pl/plezy/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   stdenvNoCC,
-  flutter338,
+  flutter344,
   fetchFromGitHub,
   fetchurl,
   pkg-config,
@@ -27,13 +27,13 @@
 
 let
   pname = "plezy";
-  version = "2.1.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "edde746";
     repo = "plezy";
     tag = version;
-    hash = "sha256-l09xiSTyV8MNE9ZI69nM+DTpumQ0ZOaRjhLlq4rXX0w=";
+    hash = "sha256-lzq0a7zxKpRwLM6T2VeD4A+qbW55bkwmtBN0bc6Lq4g=";
   };
 
   simdutf = fetchurl {
@@ -65,7 +65,7 @@ let
     );
   };
 
-  linux = flutter338.buildFlutterApplication rec {
+  linux = flutter344.buildFlutterApplication rec {
     inherit pname version src;
 
     pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -152,7 +152,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg";
-      hash = "sha256-khmDHKsW8zs7ehIj86EgqortRKKDUoOfPsX7VpvnfNY=";
+      hash = "sha256-tkkZWwMK3SHzkB2r/JDj+JPggXHFGSinMn8ZtKyRUMU=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json
index 6aeb83514798..55fe06f92542 100644
--- a/pkgs/by-name/pl/plezy/pubspec.lock.json
+++ b/pkgs/by-name/pl/plezy/pubspec.lock.json
@@ -108,8 +108,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "4c965996210e408465e3c8b66e63ab4a659a62f9",
-        "resolved-ref": "4c965996210e408465e3c8b66e63ab4a659a62f9",
+        "ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859",
+        "resolved-ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859",
         "url": "https://github.com/edde746/background_downloader"
       },
       "source": "git",
@@ -219,11 +219,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
     },
     "charcode": {
       "dependency": "transitive",
@@ -298,22 +298,23 @@
     "connectivity_plus": {
       "dependency": "direct main",
       "description": {
-        "name": "connectivity_plus",
-        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
-        "url": "https://pub.dev"
+        "path": "packages/connectivity_plus/connectivity_plus",
+        "ref": "2b614414ce95d920880765d07cbb9759699a4563",
+        "resolved-ref": "2b614414ce95d920880765d07cbb9759699a4563",
+        "url": "https://github.com/edde746/plus_plugins"
       },
-      "source": "hosted",
-      "version": "7.0.0"
+      "source": "git",
+      "version": "7.1.1"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "connectivity_plus_platform_interface",
-        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.0"
     },
     "convert": {
       "dependency": "transitive",
@@ -476,7 +477,7 @@
       "version": "4.0.3"
     },
     "fake_async": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "fake_async",
         "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
@@ -853,21 +854,21 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
       "description": {
         "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.1"
+      "version": "0.13.0"
     },
     "material_symbols_icons": {
       "dependency": "direct main",
@@ -884,11 +885,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.17.0"
+      "version": "1.18.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -954,12 +955,12 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "5ddd27c",
-        "resolved-ref": "5ddd27c2acacca31060d288db1371a870602cf46",
-        "url": "https://github.com/edde746/os-media-controls"
+        "ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e",
+        "resolved-ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e",
+        "url": "https://github.com/edde746/media_controls"
       },
       "source": "git",
-      "version": "0.2.1"
+      "version": "0.2.4"
     },
     "package_config": {
       "dependency": "transitive",
@@ -1581,11 +1582,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.7"
+      "version": "0.7.11"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1601,11 +1602,11 @@
       "dependency": "direct main",
       "description": {
         "name": "universal_gamepad",
-        "sha256": "3ada9b26e3b3471adc414fd50b8a27d2f890301d9d4cfd7a46732988a9f143d0",
+        "sha256": "eec9726c9e03b4ce54c0c613628ee3998c33f6d5e98ef4a99af3d5d7a79d341b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.5"
+      "version": "1.5.7"
     },
     "url_launcher": {
       "dependency": "direct main",
@@ -1832,11 +1833,11 @@
       "dependency": "direct main",
       "description": {
         "name": "win_http",
-        "sha256": "efbfec044d43665e271b2c51d40864275d055b28eda1e9feddb42d884ae982df",
+        "sha256": "a50a14f1bf32bc5c9b39add9baa01658b97146b21de25237810ca6b850a6704e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "window_manager": {
       "dependency": "direct main",
@@ -1880,7 +1881,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.10.7 <4.0.0",
-    "flutter": ">=3.38.4"
+    "dart": ">=3.12.0 <4.0.0",
+    "flutter": ">=3.44.0"
   }
 }
diff --git a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch
index 36931c997186..f2ad98d1f153 100644
--- a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch
+++ b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch
@@ -1,9 +1,9 @@
 --- a/pubspec.yaml
 +++ b/pubspec.yaml
-@@ -56,11 +56,7 @@
+@@ -60,11 +60,7 @@
      git:
        url: https://github.com/edde746/background_downloader
-       ref: 4c965996210e408465e3c8b66e63ab4a659a62f9
+       ref: b4d36f88bb365faaf308ff26be7ade49bbaec859
 -  sentry_flutter:
 -    git:
 -      url: https://github.com/edde746/sentry-dart
@@ -13,7 +13,7 @@
    auto_updater:
      git:
        url: https://github.com/edde746/auto_updater
-@@ -102,16 +98,6 @@
+@@ -110,16 +106,6 @@
        url: https://github.com/edde746/auto_updater
        ref: 9e150f7
        path: packages/auto_updater_windows
diff --git a/pkgs/by-name/pl/plezy/update.sh b/pkgs/by-name/pl/plezy/update.sh
index 4b9cb35c7572..3791bc122fa0 100755
--- a/pkgs/by-name/pl/plezy/update.sh
+++ b/pkgs/by-name/pl/plezy/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go flutter338 git
+#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go flutter344 git
 
 set -eou pipefail
 
@@ -19,11 +19,11 @@ echo "updating plezy: $currentVersion -> $latestVersion"
 sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/package.nix"
 
 GIT_SRC_URL="https://github.com/edde746/plezy/archive/refs/tags/${latestVersion}.tar.gz"
-GIT_SRC_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(nix-prefetch-url --unpack "$GIT_SRC_URL")")
+GIT_SRC_SHA=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url --unpack "$GIT_SRC_URL")")
 sed -i "/fetchFromGitHub/,/hash/{s|hash = \".*\"|hash = \"${GIT_SRC_SHA}\"|}" "$ROOT/package.nix"
 
 DMG_URL="https://github.com/edde746/plezy/releases/download/${latestVersion}/plezy-macos.dmg"
-DMG_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(nix-prefetch-url "$DMG_URL")")
+DMG_SHA=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "$DMG_URL")")
 sed -i "/plezy-macos.dmg/,/hash/{s|hash = \".*\"|hash = \"${DMG_SHA}\"|}" "$ROOT/package.nix"
 
 # Only here to handle the patched pubsec.yaml
diff --git a/pkgs/by-name/pr/principia/package.nix b/pkgs/by-name/pr/principia/package.nix
index 86e4ef2a55d0..6256a94789ca 100644
--- a/pkgs/by-name/pr/principia/package.nix
+++ b/pkgs/by-name/pr/principia/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "principia";
-  version = "2026.06.06";
+  version = "2026.06.19";
 
   src = fetchFromGitHub {
     owner = "Bithack";
     repo = "principia";
     rev = finalAttrs.version;
-    hash = "sha256-FLMEOpgESsGYvVejea59xbBcVWGUp7qgZLCDugolMXk=";
+    hash = "sha256-LYU8ctsEndBS3AGuQ9BtFaWR6RgTyoG4WAd91+B4zwY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/proxelar/package.nix b/pkgs/by-name/pr/proxelar/package.nix
index d5a1a31e4055..2ad9bb67d3e5 100644
--- a/pkgs/by-name/pr/proxelar/package.nix
+++ b/pkgs/by-name/pr/proxelar/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proxelar";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "emanuele-em";
     repo = "proxelar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HkUQXnx3gX6b16dXIdwAjR/3e2lkkOHjFevr3vj4Pe0=";
+    hash = "sha256-Mr7jdUK/5XMhcu6DgJHUKkdGbqNptf83I3663y/MhMo=";
   };
 
-  cargoHash = "sha256-BQkWSilaQenfLO8BQMX9YPoknuCkZXWMNn76W/v8WrY=";
+  cargoHash = "sha256-8iCB6Vs3W6HcAjyL29WfciXT/OU56moPX13RYzGSLl0=";
 
   __structuredAttrs = true;
 
diff --git a/pkgs/by-name/pr/proxyauth/package.nix b/pkgs/by-name/pr/proxyauth/package.nix
index a624eb2f30df..d1706a6b94b3 100644
--- a/pkgs/by-name/pr/proxyauth/package.nix
+++ b/pkgs/by-name/pr/proxyauth/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchFromForgejo,
   rustPlatform,
   pkg-config,
   openssl,
@@ -13,10 +13,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proxyauth";
   version = "0.8.0";
 
-  src = fetchFromGitHub {
+  src = fetchFromForgejo {
+    domain = "git.proxyauth.app";
     owner = "ProxyAuth";
     repo = "ProxyAuth";
-    tag = finalAttrs.version;
+    rev = "13b353e4a8b34fc1736c834cfcaa9afe06e8abf8";
+    # Tags were not replicated from GitHub to git.proxyauth.app
     hash = "sha256-cVjD91tBCGyslLsYUSP1Gy7KuMQZDVxQXU7fQkWeWyM=";
   };
 
@@ -31,6 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     nettle
   ];
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
@@ -42,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Proxy Authentication Token - Fast authentication gateway for backend APIs";
-    homepage = "https://github.com/ProxyAuth/ProxyAuth";
+    homepage = "https://git.proxyauth.app/ProxyAuth/ProxyAuth";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ liberodark ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/qm/qman/package.nix b/pkgs/by-name/qm/qman/package.nix
new file mode 100644
index 000000000000..dc3c90618df1
--- /dev/null
+++ b/pkgs/by-name/qm/qman/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  runtimeShell,
+  man-db,
+  groff,
+  xdg-utils,
+  meson,
+  ninja,
+  pkg-config,
+  cmake,
+  python3Packages,
+  ncurses,
+  zlib,
+  bzip2,
+  xz,
+  cunit,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qman";
+  version = "1.5.1";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "plp13";
+    repo = "qman";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-z3ILbbwcCYZT8qabVaGnMCyZRag8djEI32i6G7cLL2A=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/qman_tests_list.sh \
+      --replace-fail "/usr/bin/env bash" ${runtimeShell}
+    substituteInPlace src/config_def.py \
+      --replace-fail "/usr/bin/man" ${man-db}/bin/man \
+      --replace-fail "/usr/bin/groff" ${groff}/bin/groff \
+      --replace-fail "/usr/bin/whatis" ${man-db}/bin/whatis \
+      --replace-fail "/usr/bin/apropos" ${man-db}/bin/apropos \
+      --replace-fail "/usr/bin/xdg-open" ${xdg-utils}/bin/xdg-open \
+      --replace-fail "/usr/bin/xdg-email" ${xdg-utils}/bin/xdg-email
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    cmake
+    python3Packages.cogapp
+  ];
+
+  buildInputs = [
+    ncurses
+    zlib
+    bzip2
+    xz
+    cunit
+  ];
+
+  mesonFlags = [
+    "-Dconfigdir=${placeholder "out"}/etc/xdg/qman"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A more modern man page viewer for our terminals";
+    homepage = "https://github.com/plp13/qman";
+    changelog = "https://github.com/plp13/qman/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ pborzenkov ];
+    mainProgram = "qman";
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index c20608d23d3d..98057ad86d3a 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.all;
     changelog = "https://github.com/redis/redis/releases/tag/${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ hythera ];
     mainProgram = "redis-cli";
+    teams = [ lib.teams.redis ];
   };
 })
diff --git a/pkgs/by-name/re/redisTestHook/package.nix b/pkgs/by-name/re/redisTestHook/package.nix
index f9209bf9d080..4462fc78aff0 100644
--- a/pkgs/by-name/re/redisTestHook/package.nix
+++ b/pkgs/by-name/re/redisTestHook/package.nix
@@ -16,5 +16,8 @@ makeSetupHook {
     simple = callPackage ./test.nix { };
     python3-valkey = python3Packages.valkey;
   };
-  meta.license = lib.licenses.mit;
+  meta = {
+    license = lib.licenses.mit;
+    teams = [ lib.teams.redis ];
+  };
 } ./redis-test-hook.sh
diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix
index 68167e401eb8..4e98d8b8f85b 100644
--- a/pkgs/by-name/re/redisinsight/package.nix
+++ b/pkgs/by-name/re/redisinsight/package.nix
@@ -177,5 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
       tomasajt
     ];
     platforms = lib.platforms.linux;
+    teams = [ lib.teams.redis ];
   };
 })
diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index 171a5703c48a..ef2a83f0a359 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "15.12.3";
+  version = "15.14.2";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-2mT8n1FOACavkT83b95il1k8P2c8uJx9DBw+ZPGtY7A=";
+    hash = "sha256-OSOnMt9kk0wc1uGAxzp7Fa8OLNs89feKTqKZj4iu/1Y=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/ri/riot-redis/package.nix b/pkgs/by-name/ri/riot-redis/package.nix
index 3a5c3dbfdc4f..221237b60d78 100644
--- a/pkgs/by-name/ri/riot-redis/package.nix
+++ b/pkgs/by-name/ri/riot-redis/package.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     maintainers = with lib.maintainers; [ wesnel ];
+    teams = [ lib.teams.redis ];
   };
 })
diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index d0e8ecefd297..f231b367b081 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -29,12 +29,24 @@
     "hash": "sha256-WnXjX2pGroKn+KukCgPeUUZAkz2S6CdMrCc9P2VcBDQ=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.198/messagepack.annotations.2.5.198.nupkg"
   },
+  {
+    "pname": "MessagePackAnalyzer",
+    "version": "2.5.124",
+    "hash": "sha256-443+eq8oiDDCpa5vSjP/WLO6eE97qWcLMjhwREU8EHk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepackanalyzer/2.5.124/messagepackanalyzer.2.5.124.nupkg"
+  },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
     "version": "10.0.1",
     "hash": "sha256-aHoslRGmAot/z1GCCqSzjAxT/hltxOOIZ1/oti4WbGY=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/10.0.1/microsoft.bcl.asyncinterfaces.10.0.1.nupkg"
   },
+  {
+    "pname": "Microsoft.Bcl.HashCode",
+    "version": "6.0.0",
+    "hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.hashcode/6.0.0/microsoft.bcl.hashcode.6.0.0.nupkg"
+  },
   {
     "pname": "Microsoft.Build",
     "version": "17.11.48",
@@ -73,15 +85,15 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "5.6.0-2.26172.2",
-    "hash": "sha256-CJcnDRGIt7//SJLOSXLHoOnGs3QtLGqgpDyNPbjELm8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.6.0-2.26172.2/microsoft.codeanalysis.analyzers.5.6.0-2.26172.2.nupkg"
+    "version": "5.9.0-1.26306.2",
+    "hash": "sha256-GdxMDFLl+/+UaJHVKzchPi6Dy23WBPvvZW6Ez+XJc2w=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.9.0-1.26306.2/microsoft.codeanalysis.analyzers.5.9.0-1.26306.2.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "5.7.0-1.26227.104",
-    "hash": "sha256-AKe8YV9hIgC8SSQ43ve3cdYGjJJOFU3H5I8psUlPZ94=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.7.0-1.26227.104/microsoft.codeanalysis.bannedapianalyzers.5.7.0-1.26227.104.nupkg"
+    "version": "5.9.0-1.26312.114",
+    "hash": "sha256-vCAz49NzwPMKTrwF93rEyiLrtHyWvImhB/Upqeh3mBQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.9.0-1.26312.114/microsoft.codeanalysis.bannedapianalyzers.5.9.0-1.26312.114.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
@@ -103,9 +115,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-    "version": "5.7.0-1.26227.104",
-    "hash": "sha256-xsfLYDo5tdRJNjyRvvr5TA/yM2qicxwZ9m7DYZfd4Rg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.7.0-1.26227.104/microsoft.codeanalysis.publicapianalyzers.5.7.0-1.26227.104.nupkg"
+    "version": "5.9.0-1.26312.114",
+    "hash": "sha256-Eke4nmBnkDrCRILYpXoMzj/6wffm5twnbwkjX00JMsU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.9.0-1.26312.114/microsoft.codeanalysis.publicapianalyzers.5.9.0-1.26312.114.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -121,15 +133,15 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "10.0.0-beta.26257.4",
-    "hash": "sha256-SMGV9wBaog3i0bHH0OCNw9s+t418+xhqVvRSBFugHJI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26257.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26257.4.nupkg"
+    "version": "10.0.0-beta.26304.4",
+    "hash": "sha256-wJPOHJU1/GQYiWr99unWy1BADFdwcguGWYebshDrcR4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26304.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26304.4.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "10.0.0-beta.26257.4",
-    "hash": "sha256-0SyzThHnzmWcY7hiiw4LgrjV67YxerOvT+pZkRyehe4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26257.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26257.4.nupkg"
+    "version": "10.0.0-beta.26304.4",
+    "hash": "sha256-5w2I62C8+bw6WZSeTzgICUm2Mu3rhhLuNvq7XJcDJVI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26304.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26304.4.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -221,6 +233,12 @@
     "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.6.3/microsoft.net.stringtools.17.6.3.nupkg"
   },
+  {
+    "pname": "Microsoft.NET.StringTools",
+    "version": "18.0.2",
+    "hash": "sha256-W8K0uyVtSlL21XXTUmBk9z+ECIlBhgBZUZtm0W5C2wc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/18.0.2/microsoft.net.stringtools.18.0.2.nupkg"
+  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
@@ -271,15 +289,21 @@
   },
   {
     "pname": "Microsoft.VisualStudio.Composition",
-    "version": "17.13.50",
-    "hash": "sha256-1o5CEOSOGqWaBBzUEQWKCVIE1VYWIvJD7zh2+XHhC1Q=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/17.13.50/microsoft.visualstudio.composition.17.13.50.nupkg"
+    "version": "18.3.36",
+    "hash": "sha256-GTOsRNmN80IgT21AZUDn6ZpsdHoHyTcrDjiTibits6I=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/18.3.36/microsoft.visualstudio.composition.18.3.36.nupkg"
   },
   {
     "pname": "Microsoft.VisualStudio.Composition.Analyzers",
-    "version": "17.13.50",
-    "hash": "sha256-0fxXjTykGG8NU8BExsk0qwQQ5chDwmRVKFFVG+yWs2Y=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.13.50/microsoft.visualstudio.composition.analyzers.17.13.50.nupkg"
+    "version": "18.3.36",
+    "hash": "sha256-hOW5zrcfyVbCZmzsVNq3r6cfY1FBcxklXzzrpkM3PeA=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/18.3.36/microsoft.visualstudio.composition.analyzers.18.3.36.nupkg"
+  },
+  {
+    "pname": "Microsoft.VisualStudio.Debugger.Contracts",
+    "version": "18.3.0-beta.26277.4",
+    "hash": "sha256-DxWZ1B8XRiPffsi2Uuwu+0XjmuJM807dUYFsegsyJqo=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/3c18fd2c-cc7c-4cef-8ed7-20227ab3275b/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/18.3.0-beta.26277.4/microsoft.visualstudio.debugger.contracts.18.3.0-beta.26277.4.nupkg"
   },
   {
     "pname": "Microsoft.VisualStudio.RemoteControl",
@@ -287,6 +311,12 @@
     "hash": "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"
   },
+  {
+    "pname": "Microsoft.VisualStudio.RpcContracts",
+    "version": "17.15.25-pre",
+    "hash": "sha256-Ii7X1gRprfJPwRuWbp8+2KNp9B3qLttJErh7KuVaUgo=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.rpccontracts/17.15.25-pre/microsoft.visualstudio.rpccontracts.17.15.25-pre.nupkg"
+  },
   {
     "pname": "Microsoft.VisualStudio.SolutionPersistence",
     "version": "1.0.52",
@@ -335,6 +365,12 @@
     "hash": "sha256-3OkOduGmMmenv73Yidzz6dvbRISyjo+hGRYhWOFmV4s=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.90/microsoft.visualstudio.utilities.internal.16.3.90.nupkg"
   },
+  {
+    "pname": "Microsoft.VisualStudio.Validation",
+    "version": "17.13.22",
+    "hash": "sha256-ArINoBy7Q8bTCVPM9/y8MH0pe8TkhaYrH9PjrZijnY0=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.13.22/microsoft.visualstudio.validation.17.13.22.nupkg"
+  },
   {
     "pname": "Microsoft.VisualStudio.Validation",
     "version": "17.8.8",
@@ -347,6 +383,12 @@
     "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/5.0.0/microsoft.win32.registry.5.0.0.nupkg"
   },
+  {
+    "pname": "Nerdbank.MessagePack",
+    "version": "1.0.2",
+    "hash": "sha256-p0z9y7YxEN57Zl/iZvTE/+CfuWjIXPhyan/1IAK4G8o=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nerdbank.messagepack/1.0.2/nerdbank.messagepack.1.0.2.nupkg"
+  },
   {
     "pname": "Nerdbank.Streams",
     "version": "2.12.87",
@@ -425,6 +467,12 @@
     "hash": "sha256-BzAWS5wpGnNj0gU33sfWao7BELGjrQBT4xj3EC7qRRE=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.112/nuget.versioning.6.8.0-rc.112.nupkg"
   },
+  {
+    "pname": "PolyType",
+    "version": "1.0.0",
+    "hash": "sha256-1/6tVCqzz7sG2knjO+HOTfr0tfnVi+xCTUvCcf7s4Hs=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/polytype/1.0.0/polytype.1.0.0.nupkg"
+  },
   {
     "pname": "PowerShell",
     "version": "7.6.0",
@@ -433,9 +481,9 @@
   },
   {
     "pname": "Roslyn.Diagnostics.Analyzers",
-    "version": "5.7.0-1.26227.104",
-    "hash": "sha256-b5++ZAtq5ZsKDuSPkH7P8lWlQn38lSIXhLThiS5/R/A=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.7.0-1.26227.104/roslyn.diagnostics.analyzers.5.7.0-1.26227.104.nupkg"
+    "version": "5.9.0-1.26312.114",
+    "hash": "sha256-aUngqGTjpzYR2uPNHPfvhUApEqx3Sea50vpMU0yCVZ0=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.9.0-1.26312.114/roslyn.diagnostics.analyzers.5.9.0-1.26312.114.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.bundle_green",
@@ -499,9 +547,9 @@
   },
   {
     "pname": "System.CommandLine",
-    "version": "3.0.0-preview.5.26227.104",
-    "hash": "sha256-J8JFd0mMtcCi1L6u6mpFrnu0I/4iLuaPPdwlxHqrqjc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.5.26227.104/system.commandline.3.0.0-preview.5.26227.104.nupkg"
+    "version": "3.0.0-preview.6.26312.114",
+    "hash": "sha256-0/D51nnC0jWdrqEUMIVj557NST8zSDwquxrVIRtyyN4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.6.26312.114/system.commandline.3.0.0-preview.6.26312.114.nupkg"
   },
   {
     "pname": "System.ComponentModel.Composition",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 15c2f7232bfd..c84bc8ad1068 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -38,18 +38,18 @@ in
 buildDotnetModule (finalAttrs: {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.142.16-prerelease";
+  vsVersion = "2.144.9-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${finalAttrs.vsVersion}";
-    hash = "sha256-aErsCXA8SiR41QVz2ePcn85qAyCcoAKV4vog6L7x+8E=";
+    hash = "sha256-Cq1ynxtNaguLhVSSR04wUkqrn4/0YmwGxHfBZC4zMS8=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.8.0-1.26262.9";
+  version = "5.9.0-1.26314.1";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;
diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix
index bfa37c96186a..f2966a8c8913 100644
--- a/pkgs/by-name/rt/rtk/package.nix
+++ b/pkgs/by-name/rt/rtk/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rtk";
-  version = "0.42.3";
+  version = "0.42.4";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rtk-ai";
     repo = "rtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UWiu6y3Ci5F5OYQZIB0QuFmgv+tRUTouD9RZfX+PcsA=";
+    hash = "sha256-8nLJ5PVefXmoXQyw6HERfCP06C+l4I+7XLwKFNVNpew=";
   };
 
-  cargoHash = "sha256-ryOxbRwtkmeVnV/oF33eAZu/WileUd18ucgdsOvb5QU=";
+  cargoHash = "sha256-YsKOyEZ281ojqiitnvCFGy/MzHMyr4hlxqMnvrQwguQ=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/sd/SDL2_Pango/package.nix b/pkgs/by-name/sd/SDL2_Pango/package.nix
index f04bf88ecb9b..f3ab9dca5fc9 100644
--- a/pkgs/by-name/sd/SDL2_Pango/package.nix
+++ b/pkgs/by-name/sd/SDL2_Pango/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/markuskimius/SDL2_Pango";
     description = "Library for graphically rendering internationalized and tagged text in SDL2 using TrueType fonts";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ rardiol ];
+    maintainers = [ ];
     teams = [ lib.teams.sdl ];
     inherit (SDL2.meta) platforms;
   };
diff --git a/pkgs/by-name/sd/sdl3-shadercross/package.nix b/pkgs/by-name/sd/sdl3-shadercross/package.nix
index f21c10be4aac..0f7cd5219f88 100644
--- a/pkgs/by-name/sd/sdl3-shadercross/package.nix
+++ b/pkgs/by-name/sd/sdl3-shadercross/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3-shadercross";
-  version = "0-unstable-2026-06-02";
+  version = "0-unstable-2026-06-15";
 
   outputs = [
     "out"
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL_shadercross";
-    rev = "1d8b0556eefb11a77bc9c28249d16f7a3e0459e9";
-    hash = "sha256-+UcNgW9+1oQ4whv/5QI99M1IZSXgKedxAPH7RxZrgX0=";
+    rev = "9a461644308366b50f0c364069d762be8e3b3443";
+    hash = "sha256-oKetmnMb+SeRlscWmzGln6nR1M7fBkgybFlB1bh1Cos=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/sh/sherpa-onnx/package.nix b/pkgs/by-name/sh/sherpa-onnx/package.nix
index ddeb820734f8..52f89e8b90b6 100644
--- a/pkgs/by-name/sh/sherpa-onnx/package.nix
+++ b/pkgs/by-name/sh/sherpa-onnx/package.nix
@@ -111,13 +111,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sherpa-onnx";
-  version = "1.13.2";
+  version = "1.13.3";
 
   src = fetchFromGitHub {
     owner = "k2-fsa";
     repo = "sherpa-onnx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3SbJd9PHOjy5km6uxFqVZljn39cs/o7RLxxUivqx5VM=";
+    hash = "sha256-xwu45dJOT1yUdU0P6Vjr8XexSeGOOfQ/zt1lhcASm/8=";
   };
 
   outputs = [ "out" ] ++ lib.optionals pythonSupport [ "python" ];
diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix
index 5f89ef9d5ba5..5781bb7a2700 100644
--- a/pkgs/by-name/si/siril/package.nix
+++ b/pkgs/by-name/si/siril/package.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "siril";
-  version = "1.4.2";
+  version = "1.4.4";
 
   src = fetchFromGitLab {
     owner = "free-astro";
     repo = "siril";
     tag = finalAttrs.version;
-    hash = "sha256-4arzjGhWr5avQKVUvF6HYmQMdbKGh75vNIahNOgsLxU=";
+    hash = "sha256-UgG/efOMVeQJ1r219YOPkgkPqEdaXJquqXyWZW0oWgI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index fc1a76af1245..05c21505ab71 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slurm";
-  version = "26.05.0.1";
+  version = "26.05.1.1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "SchedMD";
     repo = "slurm";
     # The release tags use - instead of .
-    rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-pEgSPaLGqPeNsw0DkxnZP4n6jx5fy+wTgAu0LZmxmW0=";
+    tag = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
+    hash = "sha256-ZH80Ws/9+7pjDe7aZyyDHXFbNvmw8C7OJXiw5+/3jkA=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix
index 692f3b8a7fcf..55695e729a49 100644
--- a/pkgs/by-name/sp/spotify/linux.nix
+++ b/pkgs/by-name/sp/spotify/linux.nix
@@ -240,7 +240,7 @@ stdenv.mkDerivation (finalAttrs: {
       } \
       --prefix LD_LIBRARY_PATH : "$librarypath" \
       --prefix PATH : "${zenity}/bin" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime=true}}"
+      --run 'if [[ "''${NIXOS_OZONE_WL:-default}" == "1" ]]; then unset DISPLAY; fi'
 
     runHook postFixup
   '';
diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix
index 07744e43c5e4..10ae33e4cf52 100644
--- a/pkgs/by-name/st/step-cli/package.nix
+++ b/pkgs/by-name/st/step-cli/package.nix
@@ -8,7 +8,7 @@
   unixtools,
 }:
 let
-  version = "0.30.4";
+  version = "0.30.6";
 in
 buildGoModule {
   pname = "step-cli";
@@ -18,7 +18,7 @@ buildGoModule {
     owner = "smallstep";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-ToM+RzpioI+TlljlptYY0jnKGNdITzJ/xeWf4azhT/4=";
+    hash = "sha256-fMHvv14ToKq73h3aLJBebzhIJQghfBOX6C0hvDODHN8=";
     # this file change depending on git branch status (via .gitattributes)
     # https://github.com/NixOS/nixpkgs/issues/84312
     postFetch = ''
diff --git a/pkgs/by-name/st/stoat-desktop/package.nix b/pkgs/by-name/st/stoat-desktop/package.nix
index 471ab1348038..7dc357f4e479 100644
--- a/pkgs/by-name/st/stoat-desktop/package.nix
+++ b/pkgs/by-name/st/stoat-desktop/package.nix
@@ -13,6 +13,7 @@
   nodejs,
   electron_38,
   zip,
+  nix-update-script,
 }:
 let
   electron = electron_38;
@@ -139,6 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Open source user-first chat platform";
     homepage = "https://stoat.chat/";
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
index 20c80a50baa5..1bc5810d3fd3 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
@@ -1073,14 +1073,17 @@ fn login1_proxy(conn: &LocalConnection) -> Proxy<'_, &LocalConnection> {
 fn block_on_jobs(
     conn: &LocalConnection,
     submitted_jobs: &Rc<RefCell<HashMap<dbus::Path<'static>, Job>>>,
-) {
+) -> anyhow::Result<()> {
     while !submitted_jobs.borrow().is_empty() {
         log::debug!(
             "waiting for submitted jobs to finish, still have {} job(s)",
             submitted_jobs.borrow().len()
         );
-        _ = conn.process(DBUS_PROCESS_TIME);
+        _ = conn
+            .process(DBUS_PROCESS_TIME)
+            .context("Failed to process dbus messages while waiting for jobs")?;
     }
+    Ok(())
 }
 
 fn remove_file_if_exists(p: impl AsRef<Path>) -> std::io::Result<()> {
@@ -1521,7 +1524,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
             submitted_jobs.borrow_mut().insert(job_path, Job::Stop);
         }
     }
-    block_on_jobs(&dbus_conn, &submitted_jobs);
+    block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
     if !units_to_skip.is_empty() {
         print_units("NOT restarting", &units_to_skip);
@@ -1547,7 +1550,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
             }
         }
     }
-    block_on_jobs(&dbus_conn, &submitted_jobs);
+    block_on_jobs(&dbus_conn, &submitted_jobs)?;
     remove_file_if_exists(&reload_list)
         .with_context(|| format!("Failed to remove {}", reload_list.display()))?;
 
@@ -1563,7 +1566,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
             }
         }
     }
-    block_on_jobs(&dbus_conn, &submitted_jobs);
+    block_on_jobs(&dbus_conn, &submitted_jobs)?;
     remove_file_if_exists(&restart_list)
         .with_context(|| format!("Failed to remove {}", restart_list.display()))?;
 
@@ -1580,7 +1583,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
             }
         }
     }
-    block_on_jobs(&dbus_conn, &submitted_jobs);
+    block_on_jobs(&dbus_conn, &submitted_jobs)?;
     remove_file_if_exists(&start_list)
         .with_context(|| format!("Failed to remove {}", start_list.display()))?;
 
@@ -1677,7 +1680,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
                 }
             }
         }
-        block_on_jobs(&dbus_conn, &submitted_jobs);
+        block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
         print_units("restarting (post-activation)", &to_restart);
         for unit in to_restart.keys() {
@@ -1691,7 +1694,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
                 }
             }
         }
-        block_on_jobs(&dbus_conn, &submitted_jobs);
+        block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
         let to_start_filtered = filter_units(&units_to_filter, &to_start);
         print_units("starting (post-activation)", &to_start_filtered);
@@ -1706,7 +1709,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
                 }
             }
         }
-        block_on_jobs(&dbus_conn, &submitted_jobs);
+        block_on_jobs(&dbus_conn, &submitted_jobs)?;
     }
 
     let finished = finished_jobs.borrow();
@@ -2198,7 +2201,7 @@ won't take effect until you reboot the system.
             };
         }
 
-        block_on_jobs(&dbus_conn, &submitted_jobs);
+        block_on_jobs(&dbus_conn, &submitted_jobs)?;
     }
 
     if !units_to_skip.is_empty() {
@@ -2214,7 +2217,7 @@ won't take effect until you reboot the system.
     }
 
     // Wait for all stop jobs to finish
-    block_on_jobs(&dbus_conn, &submitted_jobs);
+    block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
     let mut exit_code = 0;
 
@@ -2437,7 +2440,7 @@ won't take effect until you reboot the system.
     }
 
     // Wait for the restart job of sysinit-reactivation.service to finish
-    block_on_jobs(&dbus_conn, &submitted_jobs);
+    block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
     // Before reloading we need to ensure that the units are still active. They may have been
     // deactivated because one of their requirements got stopped. If they are inactive but should
@@ -2492,7 +2495,7 @@ won't take effect until you reboot the system.
             }
         }
 
-        block_on_jobs(&dbus_conn, &submitted_jobs);
+        block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
         remove_file_if_exists(RELOAD_LIST_FILE)
             .with_context(|| format!("Failed to remove {RELOAD_LIST_FILE}"))?;
@@ -2520,7 +2523,7 @@ won't take effect until you reboot the system.
             }
         }
 
-        block_on_jobs(&dbus_conn, &submitted_jobs);
+        block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
         remove_file_if_exists(RESTART_LIST_FILE)
             .with_context(|| format!("Failed to remove {RESTART_LIST_FILE}"))?;
@@ -2553,7 +2556,7 @@ won't take effect until you reboot the system.
         }
     }
 
-    block_on_jobs(&dbus_conn, &submitted_jobs);
+    block_on_jobs(&dbus_conn, &submitted_jobs)?;
 
     remove_file_if_exists(START_LIST_FILE)
         .with_context(|| format!("Failed to remove {START_LIST_FILE}"))?;
diff --git a/pkgs/by-name/ta/tango-cpp/package.nix b/pkgs/by-name/ta/tango-cpp/package.nix
index 3b6ff008a33a..841e93798e5d 100644
--- a/pkgs/by-name/ta/tango-cpp/package.nix
+++ b/pkgs/by-name/ta/tango-cpp/package.nix
@@ -16,14 +16,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tango-cpp";
-  version = "10.3.0";
+  version = "10.3.2";
 
   src = fetchFromGitLab {
     owner = "tango-controls";
     repo = "cppTango";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-X4r2nMdW61TAqDLcVZ0tibJnn/ffXHt8RWSBDRqA0/8=";
+    hash = "sha256-hs8SvcTsO0tmGwBmtyzmqQEFIDwvFGOiQpzOMwJHWfM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index 58a3c3959ad0..d3016a2632eb 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.17.4";
+  version = "1.18.0";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-WSnWrxxaQNgW8nyQzClWPitYY9i2p+bCglwFvUlBKys=";
+        hash = "sha256-sm5xITxGSbcWiI4hhxkHKFleTQBeZZBTH823KQz3M5U=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-FMOhA7b5xSOlJqqzhewJYnt4FY8Vp/VBOd6D9MvG74g=";
+        hash = "sha256-WxaJx/vkg139zm0xOzT+9FZRAk4v/YJcVHTXwDVcALE=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-2g3787X5xle0feQ/Zi3NJgbga2DC7IwN854heAZ6FR4=";
+        hash = "sha256-RcNG7jPt+bYiP4hzV6vaxVgSstDM2oWjOmo9TmpKcWM=";
       };
     };
     updateScript = "${
diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index df647c886ed5..5fa657b75a44 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topgrade";
-  version = "17.6.1";
+  version = "17.6.2";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JXLLPglpf8X6PlbT55jgQa/XZbbAJlB/HhSxGiS1w0I=";
+    hash = "sha256-6WdHfIMuwlJ4QWAfIjX3XmZuFVCeGC2/VsV9lz2dgRY=";
   };
 
-  cargoHash = "sha256-FRBxo5x0imxh3F0ZBsScdQTirfaGcQ+y5RSy7DmDSmk=";
+  cargoHash = "sha256-2lj6hAFA41BT5xWG3/i3iMLzbM+zam7/ZMrmE4uvDCg=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index e158a71c9de2..f88f17919e8c 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-WSK0SKgT7CZ+7ibTCpMw6LUVvis7/Iqfyzi8sWclYDM=";
+    hash = "sha256-SHCfg8DVhhGwWR0qHzm3zKxsXPycRSJg5LDPTNKMiOY=";
   };
 
-  npmDepsHash = "sha256-jnWsxMxMTA+tsPSRJIQa/iJWWrLTWlWsVfAz8okRDhk=";
+  npmDepsHash = "sha256-IE8P7RblF6tpjQX4PrH2p4OnVq2MLwi+/7JzAcI9NvY=";
   makeCacheWritable = true;
 
   env = {
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 5898430b732d..81a40f68bf21 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -117,9 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "High-performance data structure server that primarily serves key/value workloads";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [
-      debtquity
-    ];
+    teams = [ lib.teams.redis ];
     changelog = "https://github.com/valkey-io/valkey/releases/tag/${finalAttrs.version}";
     mainProgram = "valkey-cli";
   };
diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index e45d33f266a8..0e97a3c882c5 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "versatiles";
-  version = "4.2.0";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BKRLOZpGe/Oewz8Nmsra1PVOUq63uKtF7ywCJDJR9RU=";
+    hash = "sha256-PeZChWX+M/3th5vS7NWOvx/8vwKdS+Qf2yfd5pX7G54=";
   };
 
-  cargoHash = "sha256-WUpn9RIMCyoOEI7tuCX7CiH4VVdc4QxnFxAKbjf7f/I=";
+  cargoHash = "sha256-N/AHaQP0IymMO6IMbjx5xOxjG9L9ROg6iQYwJYDCbvY=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index 9609e32b76fa..d90d2b4f3b8f 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.21.6";
+  version = "0.21.7";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4Dj7joNwTKX/e6TWIt9hCK0ojW6oVcrLFqhniHKtwpc=";
+    hash = "sha256-r4BuhKyW4sxin0YG3/EJjed/MiP5NwN7QGiM1ySozjE=";
   };
 
   apiDeps = fetchNpmDeps {
diff --git a/pkgs/by-name/vi/victoriatraces/package.nix b/pkgs/by-name/vi/victoriatraces/package.nix
index 50185f9150de..2c0f2bdc6a35 100644
--- a/pkgs/by-name/vi/victoriatraces/package.nix
+++ b/pkgs/by-name/vi/victoriatraces/package.nix
@@ -13,13 +13,13 @@
 
 buildGo126Module (finalAttrs: {
   pname = "VictoriaTraces";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaTraces";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SOPC9CqGNwJb80l9kP3jZtcdz3RS3LYNQjYC70Hg9fQ=";
+    hash = "sha256-jyVHqdnnvLEYFFVUwXNf/B9vSwKwPrE5iJzlRccOhTg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/vs/vscode-runner/package.nix b/pkgs/by-name/vs/vscode-runner/package.nix
index fe6ee9ee1b3c..942ade85af68 100644
--- a/pkgs/by-name/vs/vscode-runner/package.nix
+++ b/pkgs/by-name/vs/vscode-runner/package.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "Merrit";
     repo = "vscode-runner";
     rev = "v${version}";
-    hash = "sha256-oUjh0+u+tk4CgNlLL1P7lCC6kEsoTZd97i9luODxKu8=";
+    hash = "sha256-y9mexT02z6rw0uAbkHxOsPZQw5kgsm4v9qHHlyumcmo=";
   };
 in
 buildDartApplication {
diff --git a/pkgs/by-name/wa/waywall/package.nix b/pkgs/by-name/wa/waywall/package.nix
index 6aea66a874b5..c96f7a9a6a5b 100644
--- a/pkgs/by-name/wa/waywall/package.nix
+++ b/pkgs/by-name/wa/waywall/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "waywall";
-  version = "0.2026.02.06";
+  version = "0.2026.06.13";
 
   src = fetchFromGitHub {
     owner = "tesselslate";
     repo = "waywall";
     tag = finalAttrs.version;
-    hash = "sha256-SlT7B01sAKE3n9HVnE+t9hcbQnr5qcCBsBAy4btN0mw=";
+    hash = "sha256-y4haKw4Z8wqtOT5eTEt/tUqbr4FoYf5EbH63uyTGDow=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wh/whichllm/package.nix b/pkgs/by-name/wh/whichllm/package.nix
index f2adf453b9cd..221bf6313553 100644
--- a/pkgs/by-name/wh/whichllm/package.nix
+++ b/pkgs/by-name/wh/whichllm/package.nix
@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "whichllm";
-  version = "0.5.9";
+  version = "0.5.12";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "Andyyyy64";
     repo = "whichllm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TWDAg/AM0fg8oQj4To+Ht/DVIi9SieNMyYfQMsbKRtI=";
+    hash = "sha256-B/pJyRMJBkxs9ANGVDN+ub8yKCOxtNQ+uHsy7i71BOE=";
   };
 
   build-system = with python3Packages; [ hatchling ];
diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix
index ed899d4d149e..ff631444d357 100644
--- a/pkgs/by-name/xa/xaos/package.nix
+++ b/pkgs/by-name/xa/xaos/package.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "xaos";
-  version = "4.3.4";
+  version = "4.3.5";
   outputs = [
     "out"
     "man"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "xaos-project";
     repo = "XaoS";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-vOFwZbdbcrcJLHUa1QzxzadPcx5GF5uNPg+MZ7NbAPc=";
+    hash = "sha256-dGfmX55bm2BCFl7mRit88ULAcJ0VP15yVGI7nhRH0Ig=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xa/xapp-thumbnailers/package.nix b/pkgs/by-name/xa/xapp-thumbnailers/package.nix
index 3865d9ed5680..4df32d86ac33 100644
--- a/pkgs/by-name/xa/xapp-thumbnailers/package.nix
+++ b/pkgs/by-name/xa/xapp-thumbnailers/package.nix
@@ -32,14 +32,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "xapp-thumbnailers";
-  version = "1.2.9";
+  version = "1.2.10";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xapp-thumbnailers";
     tag = finalAttrs.version;
-    hash = "sha256-XlmWenp3BmGnmLGt9jauys9P92icsezjieHuyGVMisw=";
+    hash = "sha256-6ipO1l+K9um8ShIFEHsza5G/yYQxlkBAnYtdgqFC0bI=";
   };
 
   patches = [ ./meson.patch ];
diff --git a/pkgs/by-name/ya/yazi/plugins/piper/default.nix b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
index f4e77204ab07..46bfeb9da643 100644
--- a/pkgs/by-name/ya/yazi/plugins/piper/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "piper.yazi";
-  version = "0-unstable-2026-05-26";
+  version = "0-unstable-2026-06-19";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "c2c16c83dd6c754c38893030848a162bb2422ca2";
-    hash = "sha256-BdisAHsLHNqtuDu8rtBZZaqiTeL60pQOWKsRct35VZM=";
+    rev = "b9946d996226c9e47d5cd64a9452d7d4a3549ac7";
+    hash = "sha256-auk/47dNcYjrIW7B92Odjvl/6nHP8QIC5tY3BlauQ3U=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
index 9660b8ae78cf..a5efd5c9b620 100644
--- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "vcs-files.yazi";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-06-18";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "babfd0f6144aedcc7af11852ce962b989d052898";
-    hash = "sha256-y/UnRuZ2QytCdtGhxkbVvaGXglpqwufaUddXOzs7fzo=";
+    rev = "ae1335e11fe062661fb1a9d89644151d38f2d052";
+    hash = "sha256-KlwpFOfe+TXozd4yP+dXFO787pyg5+LBwAps6w1g9WI=";
   };
 
   meta = {
diff --git a/pkgs/desktops/lomiri/development/cmake-extras/default.nix b/pkgs/desktops/lomiri/development/cmake-extras/default.nix
index 16b1d5580201..c1d201fd2add 100644
--- a/pkgs/desktops/lomiri/development/cmake-extras/default.nix
+++ b/pkgs/desktops/lomiri/development/cmake-extras/default.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cmake-extras";
-  version = "1.9";
+  version = "1.10";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/cmake-extras";
     tag = finalAttrs.version;
-    hash = "sha256-7dIuQ2SdtpG93cPZTmoxXUCwFhsq11gmg4OJlGTQ3VY=";
+    hash = "sha256-8WGbfvHFd8Z8wLVBfRYiOTGE9GpvjDT4pelE6N+xhmk=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index fadfd279cdc7..dacaf27ca9d0 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -69,6 +69,8 @@ lib.makeScope pkgs.newScope (
       elm-xref = callPackage ./packages/elm-xref { };
 
       lamdera = callPackage ./packages/lamdera { };
+
+      elm-wrap = callPackage ./packages/elm-wrap { };
     }
     // lib.optionalAttrs config.allowAliases {
       create-elm-app = throw "'elmPackages.create-elm-app' has not had a release since December 2020, so it was removed."; # Added 2025-11-15
diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
index a59c96ec4cbf..e01e18cd7418 100644
--- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "elm-test-rs";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "mpizenberg";
     repo = "elm-test-rs";
     tag = "v${version}";
-    hash = "sha256-NGonWCOLxON1lxsgRlWgY67TtIJYsLPXi96NcxF4Tso=";
+    hash = "sha256-H9InR28T0PQjxqT99ojw8ey29tk79BPeXpkHL3VNnkU=";
   };
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
-  cargoHash = "sha256-qs6ujXl4j9gCEDQV5i47oa0eaqWZf4NqsVbNDsao5fI=";
+  cargoHash = "sha256-Y3hqSw8SyU9uVE9jBsLV9bL5KzaB9pw96Yqy3Dvh4QA=";
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       jpagex
       zupo
+      turbomack
     ];
   };
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-wrap/default.nix b/pkgs/development/compilers/elm/packages/elm-wrap/default.nix
new file mode 100644
index 000000000000..c7138ed8913f
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-wrap/default.nix
@@ -0,0 +1,50 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  hostname,
+  rsync,
+  zip,
+  curl,
+  python3,
+  lib,
+}:
+stdenv.mkDerivation rec {
+  name = "elm-wrap";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "dsimunic";
+    repo = "elm-wrap";
+    tag = "v${version}";
+    hash = "sha256-n7wX2jP4sX2LYiiFKOIyrEw5B4eJB9Bp2JD4qpp9Kmw=";
+  };
+
+  nativeBuildInputs = [
+    hostname
+    rsync
+    zip
+  ];
+
+  buildInputs = [
+    curl
+  ];
+
+  nativeCheckInputs = [
+    python3
+  ];
+
+  doCheck = true;
+  checkPhase = "make test";
+
+  buildFlags = [ "RELEASE_VERSION=1" ];
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    changelog = "https://github.com/dsimunic/elm-wrap/blob/${version}/CHANGELOG.md";
+    description = "This utility is a comprehensive package management solution for Elm programming language packages and code. It wraps Elm compiler and intercepts its package management commands like install to augment them with support for custom package registries and policies.";
+    homepage = "https://elm-wrap.dev/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ turbomack ];
+    mainProgram = "wrap";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
index 35801332a7da..14a7a877828b 100644
--- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
+++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     apple-sdk_gstreamer
   ];
 
-  NIX_CFLAGS_COMPILE = [
+  env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error"
     # gstcameradeinterlace.cpp:55:10: fatal error: gst/video/video.h: No such file or directory
     "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix
index bd40a12cea03..20a89a3647de 100644
--- a/pkgs/development/libraries/science/chemistry/tblite/default.nix
+++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix
@@ -1,6 +1,6 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
   gfortran,
   buildType ? "meson",
@@ -29,13 +29,13 @@ assert (
 
 stdenv.mkDerivation rec {
   pname = "tblite";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "tblite";
     repo = "tblite";
     rev = "v${version}";
-    hash = "sha256-hePy/slEeM2o1gtrAbq/nkEUILa6oQjkD2ddDstQ2Zc=";
+    hash = "sha256-z0g+bf6APqNLB9mDE49FelitQ9ptZXdFQuYeXIT0NIw=";
   };
 
   patches = [
@@ -45,10 +45,18 @@ stdenv.mkDerivation rec {
     ./pkgconfig.patch
   ];
 
-  # Python scripts in test subdirectories to run the tests
-  postPatch = ''
-    patchShebangs ./
-  '';
+  postPatch =
+    # Python scripts in test subdirectories to run the tests
+    ''
+      patchShebangs ./
+    ''
+
+    # libquadmath is only shipped by GCC on architectures that lack native
+    # quad-precision support (e.g. x86_64); on aarch64 it does not exist.
+    + lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
+      substituteInPlace config/meson.build \
+        --replace-fail "lib_deps += cc.find_library('quadmath')" ""
+    '';
 
   nativeBuildInputs = [
     gfortran
diff --git a/pkgs/development/libraries/science/chemistry/tblite/python.nix b/pkgs/development/libraries/science/chemistry/tblite/python.nix
index 1039df75452f..0c481ee391bb 100644
--- a/pkgs/development/libraries/science/chemistry/tblite/python.nix
+++ b/pkgs/development/libraries/science/chemistry/tblite/python.nix
@@ -23,6 +23,7 @@ buildPythonPackage {
     pname
     version
     src
+    postPatch
     meta
     ;
 
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index f9d65d943136..09ba666c16c2 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1040,15 +1040,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2657-1";
+      version = "0.0.2658-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2657-1.rockspec";
-          sha256 = "0c7q9gjx9p0gqgsf89b510g729hz8301qffd936m86pwqgzxmvqi";
+          url = "mirror://luarocks/fzf-lua-0.0.2658-1.rockspec";
+          sha256 = "1dibv791x3yvw4ib56661r4g1v0lmfbwssj0x0jbwsjwnrnqis14";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/988416cc782dfe28bff3f0da9b8c943b236cd86a.zip";
-        sha256 = "0hh2dkgpf1002b9ik2r1iakszs60qk9yb84db1jnkj2ks5mah98g";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/267f5db2aa2202b9f6cc7a50783f0ccd2121766c.zip";
+        sha256 = "1a4yy3wj0xq0jyrx8qnj6i29v5c8vvi52sbrk8112xy66qlysmm8";
       };
 
       disabled = luaOlder "5.1";
@@ -1322,22 +1322,22 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "kulala.nvim";
-      version = "6.14.0-1";
+      version = "6.15.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/kulala.nvim-6.14.0-1.rockspec";
-          sha256 = "05nj8yy1cqs2ybpx53zg06a4cisz5xwp8nir6p1vamnmmsj8xq06";
+          url = "mirror://luarocks/kulala.nvim-6.15.3-1.rockspec";
+          sha256 = "00ghq3ph0vykphhiilj2k8643hdm5glz3h9iwpnsbahpgwpwppzy";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.14.0.zip";
-        sha256 = "1y8bbc3v9508pg500gx5vip5pd416zx4kkmsqfjjcnq86x8wsl7q";
+        url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.15.3.zip";
+        sha256 = "1friyckh8bxsixsql1r3h1ljfr3a13w061hnw5z7rj92inyx5536";
       };
 
       disabled = luaOlder "5.1";
       propagatedBuildInputs = [ tree-sitter-kulala_http ];
 
       meta = {
-        homepage = "https://kulala.app/usage";
+        homepage = "https://kulala.app";
         license = lib.licenses.mit;
         description = "A fully-featured 🤏 HTTP/GraphQL/gRPC/Websocket-client 🐼 interface 🖥️ for Neovim ❤️, that supports the Jetbrains .http spec (with full scripting support).";
       };
@@ -5140,21 +5140,23 @@ final: prev: {
       fetchurl,
       fetchzip,
       luaOlder,
+      tree-sitter-orgmode,
     }:
     buildLuarocksPackage {
       pname = "orgmode";
-      version = "0.7.3-1";
+      version = "0.7.5-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/orgmode-0.7.3-1.rockspec";
-          sha256 = "1zvyidy23am6qkya8yc6pxxhc5nf42y8c9djfmlx67z89gxfxm9n";
+          url = "mirror://luarocks/orgmode-0.7.5-1.rockspec";
+          sha256 = "03spnsdpl34qkh14gniac15k4rncai2239wnv90p7z9wvkr2y0s1";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-orgmode/orgmode/archive/0.7.3.zip";
-        sha256 = "16glwzys6pcq8pi96jkdc93fasqgf0d8yqncxaw3741906mni9ym";
+        url = "https://github.com/nvim-orgmode/orgmode/archive/0.7.5.zip";
+        sha256 = "00x1spp077bgm180pr0pnwa6hk34isjizf2zxcmlaq06rk548i7i";
       };
 
       disabled = luaOlder "5.1";
+      propagatedBuildInputs = [ tree-sitter-orgmode ];
 
       meta = {
         homepage = "https://nvim-orgmode.github.io";
@@ -6032,8 +6034,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "7d324792b7943e4aa16ad007212e6acc6f9fe335";
-        hash = "sha256-+e/ijnuw0Zrj+zcfO2iRusukD4WHrgVC5reOTNk/04o=";
+        rev = "9377230aa5305d9e9aca4ed8dadf1070fb4aa9fc";
+        hash = "sha256-iFHYx+5Rf3ol7CjVLjqVu+VNjdGfeC8V8nS/1THO+cQ=";
       };
 
       disabled = lua.luaversion != "5.1";
@@ -6272,15 +6274,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "tree-sitter-kulala_http";
-      version = "0.2.0-1";
+      version = "0.2.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/tree-sitter-kulala_http-0.2.0-1.rockspec";
-          sha256 = "19zl90z7jm3qz62f4q4hp95a0z78k3db1lrb6bhhn27kwiy4ww5z";
+          url = "mirror://luarocks/tree-sitter-kulala_http-0.2.1-1.rockspec";
+          sha256 = "05zrx3sqjdyibfdlm0ycf02s0vpzbaq47gwamg9bizjd5mhhyv22";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mistweaverco/tree-sitter-kulala-http/archive/v0.2.0.zip";
-        sha256 = "0cc0ff8py1mqdxscp3q6zvpiryanc8fjx2y60csng00bzx4g42mj";
+        url = "https://github.com/mistweaverco/tree-sitter-kulala-http/archive/v0.2.1.zip";
+        sha256 = "1xl2qjfdqj13jmqzvh90i9djlqf675br42z6jm3cfkmj14riid1s";
       };
 
       nativeBuildInputs = [ luarocks-build-treesitter-parser ];
diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index a0885810336c..1485a7b4fe7b 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aioamazondevices";
-  version = "14.0.4";
+  version = "14.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C0cwPtAiA63DXqs8x0zlJ+y1BXgVe87Q56WKER/cmnk=";
+    hash = "sha256-MUPj3smDMOCV+g1cC6YKWSGYvB1UD8OKzlil61H4rZg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix
index 5fbb76a80004..af9957be5a5d 100644
--- a/pkgs/development/python-modules/aiocomelit/default.nix
+++ b/pkgs/development/python-modules/aiocomelit/default.nix
@@ -1,40 +1,42 @@
 {
   lib,
   aiohttp,
+  aioresponses,
+  anyio,
   buildPythonPackage,
-  colorlog,
   fetchFromGitHub,
   orjson,
   pint,
-  pytest-cov-stub,
   pytestCheckHook,
   setuptools,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "aiocomelit";
-  version = "2.0.4";
+  version = "2.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aiocomelit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E5hI3PGNmJxly5RvOsV4DsGxOLsdfYppcMSTcoX0ohQ=";
+    hash = "sha256-T48aRtuF9eNrW5L97CGkjc2PCdRzbuGCvhdWCuqe7yk=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     aiohttp
-    colorlog
     orjson
     pint
   ];
 
   nativeCheckInputs = [
-    pytest-cov-stub
+    aioresponses
+    anyio
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "aiocomelit" ];
diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix
index 3af2684d74cc..4b7846cc6c6c 100644
--- a/pkgs/development/python-modules/aioimmich/default.nix
+++ b/pkgs/development/python-modules/aioimmich/default.nix
@@ -1,7 +1,7 @@
 {
   aiofiles,
   aiohttp,
-  aioresponses,
+  aiointercept,
   buildPythonPackage,
   fetchFromGitHub,
   lib,
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "aioimmich";
-  version = "0.14.1";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "aioimmich";
     tag = "v${version}";
-    hash = "sha256-wKB2WtC5zMEnT2wF9Ed0yW2w9c1p642SXJmy5jJrQQc=";
+    hash = "sha256-lsxN4gl1t7za/0ac6fXZysEeXSQtNAvQCMN/eqRvWoQ=";
   };
 
   postPatch = ''
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aioimmich" ];
 
   nativeCheckInputs = [
-    aioresponses
+    aiointercept
     pytest-asyncio
     pytestCheckHook
     syrupy
diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix
index 0ba4c70a90bd..99d6d104ce33 100644
--- a/pkgs/development/python-modules/alexapy/default.nix
+++ b/pkgs/development/python-modules/alexapy/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "alexapy";
-  version = "1.29.22";
+  version = "1.29.23";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "keatontaylor";
     repo = "alexapy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mWEotNbG4On7EqwPX5bVWr1ZRi4WdzCwJ06NXc/9RL4=";
+    hash = "sha256-RO09mCHDgA7TtPm/iZ6PvvkWhKTTMAublci5Z99+fec=";
   };
 
   pythonRelaxDeps = [ "aiofiles" ];
diff --git a/pkgs/development/python-modules/alphaessopenapi/default.nix b/pkgs/development/python-modules/alphaessopenapi/default.nix
index f0a28f9c2fce..4cb1eef1aaf0 100644
--- a/pkgs/development/python-modules/alphaessopenapi/default.nix
+++ b/pkgs/development/python-modules/alphaessopenapi/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "alphaess";
-  version = "0.0.17";
+  version = "0.0.19";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CharlesGillanders";
     repo = "alphaess-openAPI";
     tag = version;
-    sha256 = "sha256-ECOL1fCJDL9OEDKElw9yAzF5SF3RB/6TrgK26ddtSzw=";
+    sha256 = "sha256-wdwA1MIQrkZCT4zIf8WXyq0+F+peC/auVtjDJ8ZZyxE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/banks/default.nix b/pkgs/development/python-modules/banks/default.nix
index d0440bd9dc0c..a3dd269437bc 100644
--- a/pkgs/development/python-modules/banks/default.nix
+++ b/pkgs/development/python-modules/banks/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "banks";
-  version = "2.4.2";
+  version = "2.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "masci";
     repo = "banks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FSulHLWXNO9jz9K7qgrrZcvfe2iQGxdkJVOZlo+Qw/c=";
+    hash = "sha256-6B/jbvW+nfsruPJMk+z5SP2LS85MYOlmMpBYHypUOHA=";
   };
 
   env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix
index e746ebdfda77..61ac0b0c0670 100644
--- a/pkgs/development/python-modules/blinkstick/default.nix
+++ b/pkgs/development/python-modules/blinkstick/default.nix
@@ -2,13 +2,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pyusb,
 }:
 
 buildPythonPackage {
   pname = "blinkstick";
-  version = "unstable-2023-05-04";
-  format = "setuptools";
+  version = "1.2.0-unstable-2023-05-04";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "arvydas";
@@ -17,7 +20,9 @@ buildPythonPackage {
     hash = "sha256-9bc7TD/Ilc952ywLauFd0+3Lh64lQlYuDC1KG9eWDgs=";
   };
 
-  propagatedBuildInputs = [ pyusb ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pyusb ];
 
   # Project has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index 95041f6b2b91..ba236477d2ff 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boschshcpy";
-  version = "0.2.111";
+  version = "0.2.115";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tschamm";
     repo = "boschshcpy";
-    tag = finalAttrs.version;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mR2TWfq7ItM1WLnnU7fzeWEeK65ENrCuRxzKte+zDZs=";
   };
 
@@ -38,6 +38,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module to work with the Bosch Smart Home Controller API";
     homepage = "https://github.com/tschamm/boschshcpy";
+    changelog = "https://github.com/tschamm/boschshcpy/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index d38681e04c90..3ace80835e80 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.43.33";
+  version = "1.43.34";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-fcaKNxemictMYAM11XGeBjXg0HEPICs678A+WQpMmAI=";
+    hash = "sha256-K2WABl4eFFaH/VdvFbz1o5lhnI1RIXacilnHhMLdIqw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix
index de61bab4f1c3..a0fbb96a7399 100644
--- a/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/pkgs/development/python-modules/checkdmarc/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "checkdmarc";
-  version = "5.17.0";
+  version = "5.17.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "domainaware";
     repo = "checkdmarc";
     tag = finalAttrs.version;
-    hash = "sha256-smKilbk+91da1Jh/e+eG6rP/YSCwS499qk3qHFQWH3A=";
+    hash = "sha256-IF+3Og67PrW3HuSnkarrjGl9RFHLrNEBo0CqmKliH1M=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix
index 9134ea3380e6..06f3b6d3e459 100644
--- a/pkgs/development/python-modules/compressed-tensors/default.nix
+++ b/pkgs/development/python-modules/compressed-tensors/default.nix
@@ -17,14 +17,16 @@
   transformers,
 
   # tests
+  accelerate,
   nbconvert,
   nbformat,
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "compressed-tensors";
-  version = "0.15.0.1";
+  version = "0.17.1";
   pyproject = true;
 
   # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import
@@ -32,7 +34,7 @@ buildPythonPackage (finalAttrs: {
     owner = "neuralmagic";
     repo = "compressed-tensors";
     tag = finalAttrs.version;
-    hash = "sha256-iiYo3Vne2CYlj+wMHxQFTTU7gb8oNwPtCe873nX5KgA=";
+    hash = "sha256-14AHbokDlN5iXy/fvOq7Xp1OS8N1b+Xpxd33KOylWiU=";
   };
 
   postPatch = ''
@@ -60,9 +62,11 @@ buildPythonPackage (finalAttrs: {
   pythonImportsCheck = [ "compressed_tensors" ];
 
   nativeCheckInputs = [
+    accelerate
     nbconvert
     nbformat
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   disabledTests = [
@@ -87,10 +91,44 @@ buildPythonPackage (finalAttrs: {
     "test_set_item_buffers"
     "test_update_offload_parameter_with_grad"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox:
+    # RuntimeError: Failed to initialize cpuinfo!
+    "test_mxfp4_scales_e2e"
+    "test_mxfp8_scales_e2e"
+  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # torch._inductor.exc.InductorError: ImportError: dlopen(/nix/var/nix/builds/nix-25002-542173852/torchinductor__nixbld1/xo/cxovsevcfanmw7lgoddbnyhoxes3nzlu7ecugxedaq2zr4f6b2qh.main.so, 0x0002):
     # symbol not found in flat namespace '___kmpc_barrier'
     "test_compress_decompress_module"
+
+    # AssertionError: Torch not compiled with CUDA enabled
+    "test_match_quantizable_tensors"
+    "test_narrow_match_true_child_only"
+    "test_narrow_match_false_when_parent_also_matches"
+    "test_narrow_match_false_when_neither_matches"
+    "test_narrow_match_iterable_targets_any_true"
+    "test_narrow_match_with_explicit_module_argument"
+    "test_narrow_match_top_level_behavior_documented"
+    "test_complex_model_matching"
+    "test_parameter_and_module_consistency"
+    "test_all_functions_with_regex"
+    "test_match_quantizable_tensors"
+    "test_mtp_tensors_saved_correctly"
+    "test_index_updated"
+    "test_single_shard_dest_creates_index"
+    "test_no_mtp_tensors_raises"
+    "test_missing_dest_files_raises"
+    "test_custom_mtp_prefix"
+    "test_apply_config_detects_deepseekv3_attention_and_hooks"
+    "test_initialize_module_for_quantization_offloaded"
+    "test_correctness_model"
+    "test_random_matrix_device_handling"
+    "test_memory_sharing"
+    "test_attention_cache"
+
+    # TypeError: Trying to convert Float8_e4m3fn to the MPS backend but it does not have support for that dtype.
+    "test_compressed_model_inference_with_hook"
   ];
 
   disabledTestPaths = [
@@ -111,6 +149,17 @@ buildPythonPackage (finalAttrs: {
     "tests/test_transform/factory/test_serialization.py::test_serialization[True-True-random-hadamard]"
     "tests/test_transform/factory/test_serialization.py::test_serialization[True-False-hadamard]"
     "tests/test_transform/factory/test_serialization.py::test_serialization[True-False-random-hadamard]"
+
+    # AttributeError: 'NoneType' object has no attribute 'type'
+    "tests/test_compressors/distributed/test_distributed_compression.py"
+    "tests/test_compressors/distributed/test_module_parallel.py"
+    "tests/test_compressors/model_compressors/test_model_compressor_distributed.py"
+    "tests/test_offload"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AssertionError: Torch not compiled with CUDA enabled
+    "tests/test_transform/utils/test_hadamard.py"
+    "tests/test_utils/test_match.py"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix
index ccd4ea738153..2bb7d9ec44b3 100644
--- a/pkgs/development/python-modules/cxxheaderparser/default.nix
+++ b/pkgs/development/python-modules/cxxheaderparser/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "cxxheaderparser";
-  version = "1.7.3";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robotpy";
     repo = "cxxheaderparser";
     tag = version;
-    hash = "sha256-1i8HbVq1dEXktKCZg/ZGX0n5J8LrZx64flMCP/c6ltI=";
+    hash = "sha256-l81b/M6ir3aWnycrl8RfuN3JQYkcRcTFRhejBWXGgb4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index 42337ed81885..a8b9d27028cf 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "databricks-sdk";
-  version = "0.116.0";
+  version = "0.118.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
     owner = "databricks";
     repo = "databricks-sdk-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o9QVw0x2FFNT+cgdGELH7f2DEmzq2xeyisjyY0FNTaE=";
+    hash = "sha256-ukb5Sit+BRJd7DipvGMqXbFrC8jXsLDJjCbJdIO5G0U=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index d36f2048a919..bcdcf80215d8 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "65.16.1";
+  version = "65.18.0";
   pyproject = true;
 
   src = fetchFromCodeberg {
     owner = "allauth";
     repo = "django-allauth";
     tag = version;
-    hash = "sha256-ZtrbIklik0GmVMNtZegXJ8ot+5LKjO0B5ioo5nArKMk=";
+    hash = "sha256-OUU42yld3CTutgu7XOkC/f4U2Yo9HpQV8GCfZsM2P5w=";
   };
 
   nativeBuildInputs = [ gettext ];
diff --git a/pkgs/development/python-modules/django-js-asset/default.nix b/pkgs/development/python-modules/django-js-asset/default.nix
index 1a23bd6e0beb..7b8a21ea9315 100644
--- a/pkgs/development/python-modules/django-js-asset/default.nix
+++ b/pkgs/development/python-modules/django-js-asset/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-js-asset";
-  version = "3.1.2";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "matthiask";
     repo = "django-js-asset";
     tag = version;
-    hash = "sha256-OG31i8r6rwR2aDzraAorHdYrJrWt/e7SY9+iV7SJGJ8=";
+    hash = "sha256-TmoT+WuOw92wWW82CpKLy0Lr+oSKf+c2diG8Gs5rWg4=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 33529c179074..15a1b066e5e2 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -18,16 +18,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "django-oauth-toolkit";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-oauth-toolkit";
-    tag = version;
-    hash = "sha256-jUIZfLi8Xm9v40k1hefKv96z2pXch+9V+xMaZSUW1pw=";
+    tag = finalAttrs.version;
+    hash = "sha256-eRQzAFUvSgoDiP7LW/+hMrNxHuXVxY+wc/E3VU/zeXo=";
   };
 
   build-system = [ setuptools ];
@@ -62,8 +62,8 @@ buildPythonPackage rec {
   meta = {
     description = "OAuth2 goodies for the Djangonauts";
     homepage = "https://github.com/jazzband/django-oauth-toolkit";
-    changelog = "https://github.com/jazzband/django-oauth-toolkit/django-filer/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/jazzband/django-oauth-toolkit/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd2;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix
index 3600b0aa51fb..65245ca72ab2 100644
--- a/pkgs/development/python-modules/dramatiq/default.nix
+++ b/pkgs/development/python-modules/dramatiq/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dramatiq";
-  version = "2.0.1";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bogdanp";
     repo = "dramatiq";
     tag = "v${version}";
-    hash = "sha256-VqMHSn2mdkO140t7IpZt32OHoEU0nEXiRWJ0w6Km0o8=";
+    hash = "sha256-wUE3R/lFafP7P9tjKjFC+jwCc3jkvGeXunC8AhkBLbM=";
   };
 
   build-system = [ setuptools ];
@@ -87,6 +87,8 @@ buildPythonPackage rec {
     # AssertionError
     "test_cli_scrubs_stale_pid_files"
     "test_message_contains_requeue_time_after_retry"
+    # Timing-sensitive under load on the aarch64-linux builder.
+    "test_actor_messages_can_be_assigned_time_limits"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Takes too long for darwin ofborg
diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index e3d1a8d372e3..ef3761c32691 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dsmr-parser";
-  version = "1.8.0";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ndokter";
     repo = "dsmr_parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h7huLTdyDon2l2dUXwqilrM0tr6Tkk6918KLK/c2S9s=";
+    hash = "sha256-KoSRfkTKdAusDi1twiU4Xs0p4nijDslkDPJMTfUvWsE=";
   };
 
   pythonRelaxDeps = [ "dlms_cosem" ];
diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix
index b015a719d089..31e6673e9b59 100644
--- a/pkgs/development/python-modules/dvc-studio-client/default.nix
+++ b/pkgs/development/python-modules/dvc-studio-client/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "dvc-studio-client";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-studio-client";
     tag = version;
-    hash = "sha256-pMjLbtsUD0fj4OcJI8FufQRYe7HJ0S8z1jYK0Ri7uWA=";
+    hash = "sha256-Zc6DQ/memnEwxHkSMPi1/fLBgvinqaMpWSOBfAI4sUk=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index 3d2fd1706ab7..b24800a0117e 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "elevenlabs";
-  version = "2.52.0";
+  version = "2.53.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Acqwa1zmDV4+xedGtabtB/utU4D5WkgbLyYCrmZiwFo=";
+    hash = "sha256-V/6zky0jekajrFZh+D6jlK3GSDN4Ms0mByi9CHceGo8=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix
index 2114bd73ba76..6f759cdffc0d 100644
--- a/pkgs/development/python-modules/evtx/default.nix
+++ b/pkgs/development/python-modules/evtx/default.nix
@@ -10,19 +10,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "evtx";
-  version = "0.11.1";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "omerbenamram";
     repo = "pyevtx-rs";
     tag = finalAttrs.version;
-    hash = "sha256-oF/Hvox294/Vi7TqaJVAboAFreavnlhmqa5rpVsOv6o=";
+    hash = "sha256-pPWZOnBlHtt2xVGXYfh06GF3JyoB5wSLeZvC1gUdejk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-4pDLwM1ylZbqymG+cL7QVByc43p8XJi2MKb/cL3aWak=";
+    hash = "sha256-D27XBfc5ZdkVKfv373NXm0W1WqZksUdmxs0FCGsx6Js=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 74e0f892129b..533136eef735 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fakeredis";
-  version = "2.35.1";
+  version = "2.36.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cunla";
     repo = "fakeredis-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-euhWKXFERpRoXX7G81ffAygt5e1mt7uy9Y9zAGacu38=";
+    hash = "sha256-vOQBezPsgcjSUigCiW7Q+VueUTtQm3Y7hhB0mTstwKM=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix
index 6134320bad67..8ee44699de64 100644
--- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix
+++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-audit-log";
-  version = "0.4.0";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_audit_log";
     inherit version;
-    hash = "sha256-hGfU3MqfPmFgUgwk1xWS5J6HSDjxdHYicuwQ55ULb+s=";
+    hash = "sha256-TdNDaDwLsxGH6+80JoA/ExWelQ++o/5gqGSFXP7ZWbg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index 80e8ec37aaa6..8630cff464b8 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "2.38.0";
+  version = "2.40.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_speech";
     inherit version;
-    hash = "sha256-GFS1HLt5Vyc7a6YfSmz0neyNCexFCZFYeJflAmfqylE=";
+    hash = "sha256-6J5ojkzguSZ1QDi/mS0NDwZcXxw1A7sg5sRtCLY2WPw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index 50ea60c8caa3..9047333c2731 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.6.3";
+  version = "2.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jim-easterbrook";
     repo = "python-gphoto2";
     tag = "v${version}";
-    hash = "sha256-inxKfZ/u7b9Kx1ytmEKJsK2PnnrhSI54A2Dm6Mtxnmc=";
+    hash = "sha256-fxrgHFVfTs7PZFHafld5uNmvaqW2uLAs01GatdxtbAU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/griffelib/default.nix b/pkgs/development/python-modules/griffelib/default.nix
index 5ebee7b09a85..5aedae6d6a72 100644
--- a/pkgs/development/python-modules/griffelib/default.nix
+++ b/pkgs/development/python-modules/griffelib/default.nix
@@ -12,18 +12,24 @@
   pip,
   platformdirs,
   wheel,
+
+  # tests
+  griffe,
+  jsonschema,
+  mkdocstrings,
+  pytestCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "griffelib";
-  version = "2.0.2";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "griffe";
     tag = finalAttrs.version;
-    hash = "sha256-Fxa9lrBVQ/enVLiU7hUc0d5x9ItI19EGnbxa7MX6Plc=";
+    hash = "sha256-hNKL86LSE9PwIofxt2t5PrlThiX7hTgYADK2HDVhNjk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/griffelib";
@@ -44,6 +50,19 @@ buildPythonPackage (finalAttrs: {
     "griffe"
   ];
 
+  nativeCheckInputs = [
+    griffe
+    jsonschema
+    mkdocstrings
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # missing griffecli
+    "tests/test_api.py"
+    "tests/test_git.py"
+  ];
+
   meta = {
     changelog = "https://github.com/mkdocstrings/griffe/releases/tag/${finalAttrs.src.tag}";
     description = "Signatures for entire Python programs. Extract the structure, the frame, the skeleton of your project, to generate API documentation or find breaking changes in your API";
diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix
index b83ac28068a4..47181669215b 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/pkgs/development/python-modules/hiredis/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/redis/hiredis-py";
     changelog = "https://github.com/redis/hiredis-py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ hythera ];
+    teams = [ lib.teams.redis ];
   };
 })
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 55e9bf3a4c6b..682eaa060de9 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "holidays";
-  version = "0.98";
+  version = "0.99";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-miXThSQLiWrw0IfJC5ozJQJmQnNuf1szpNVKBG86LZA=";
+    hash = "sha256-iIBkusWBwvDI9EMTvf62UVl/N8tlKhasCj/yPBh+lk4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index f76a9d4e97cc..37a3366e8a59 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.202606191";
+  version = "0.1.202606201";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E3//Jc1VSjoymAcqe+uSKTZ3Dw45sNXP3NYI00EN6N8=";
+    hash = "sha256-mL3zujZ/lqBM6RwANbuDUPAOIBhDcc/i9Zu9ePcFVoc=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/lark-oapi/default.nix b/pkgs/development/python-modules/lark-oapi/default.nix
new file mode 100644
index 000000000000..bad1da3feed1
--- /dev/null
+++ b/pkgs/development/python-modules/lark-oapi/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  httpx,
+  pycryptodome,
+  pytest-asyncio,
+  pytestCheckHook,
+  requests,
+  requests-toolbelt,
+  websockets,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "lark-oapi";
+  version = "1.6.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "larksuite";
+    repo = "oapi-sdk-python";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dFfg24TyCaGX+nu/HuD+UjHibdPMccn/X4V6SVdvO60=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    httpx
+    pycryptodome
+    requests
+    requests-toolbelt
+    websockets
+  ];
+
+  # websockets 16.0 is compatible despite the <16 metadata constraint
+  pythonRelaxDeps = [ "websockets" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "lark_oapi" ];
+
+  meta = {
+    description = "Larksuite development interface SDK";
+    homepage = "https://github.com/larksuite/oapi-sdk-python";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.knightfemale ];
+  };
+})
diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index 4e76d4e1bb7f..fd9d0a2ae146 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -9,14 +9,14 @@
   lmdb,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "lmdb";
-  version = "1.7.5";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-8GBHUXYssJcFnVQSRExAV7lfOGx+2Vg2PPY/RT5RCNo=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-sgG0FvfWzqm9L5dyd6X1HW5SpDTW7FEaizSZDfKxqcU=";
   };
 
   build-system = [ setuptools ];
@@ -36,9 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "Universal Python binding for the LMDB 'Lightning' Database";
     homepage = "https://github.com/dw/py-lmdb";
-    changelog = "https://github.com/jnwatson/py-lmdb/blob/py-lmdb_${version}/ChangeLog";
+    changelog = "https://github.com/jnwatson/py-lmdb/blob/py-lmdb_${finalAttrs.version}/ChangeLog";
     license = lib.licenses.openldap;
-    maintainers = [
-    ];
+    maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/midea-local/default.nix b/pkgs/development/python-modules/midea-local/default.nix
index 2c424e85f7a9..dfe5c3294d80 100644
--- a/pkgs/development/python-modules/midea-local/default.nix
+++ b/pkgs/development/python-modules/midea-local/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "midea-local";
-  version = "6.6.0";
+  version = "6.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "midea-lan";
     repo = "midea-local";
     tag = "v${version}";
-    hash = "sha256-c66SvwyJZpTVA4bOgiOtrO3wHfK0rMpU2Uolu0Zpa6w=";
+    hash = "sha256-tJxSAjugFWvlpmLE7A7+wqsxM8RlgPQGE0fH7cdwxxI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/momonga/default.nix b/pkgs/development/python-modules/momonga/default.nix
index 6ba2a5711374..627e3cf7b69b 100644
--- a/pkgs/development/python-modules/momonga/default.nix
+++ b/pkgs/development/python-modules/momonga/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "momonga";
-  version = "0.3.0";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nbtk";
     repo = "momonga";
     tag = "v${version}";
-    hash = "sha256-ZzQPJcvjRuRjU/u8KjxZ0C4XUb4fbVkLIcsf2JmzDRA=";
+    hash = "sha256-EJatEOpXJoRHEYs2ve90APOe17tBUZRWBygjIWWFW+c=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0d1700d85459..66272606b75e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -127,8 +127,8 @@ in
       "sha256-gJM0o+V8YnmwVkgnRzR+Peaz45JuRpE8Hs6LRwfTeUQ=";
 
   mypy-boto3-appstream =
-    buildMypyBoto3Package "appstream" "1.43.17"
-      "sha256-cs792cAqETR/V76EgDuwa8cnLJKfqBgCib6ah6c0Qfc=";
+    buildMypyBoto3Package "appstream" "1.43.34"
+      "sha256-si3z29/l/egjuZZC0kQj7w8nROjvu+n+YtxYLlETnY0=";
 
   mypy-boto3-appsync =
     buildMypyBoto3Package "appsync" "1.43.0"
@@ -335,8 +335,8 @@ in
       "sha256-6FyB/VCGsMYDBFUu0VzWpge94lASfg6CVewhkmpxycQ=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.43.22"
-      "sha256-XGey9ie/uGSXFaB5NfoQXeQ+LQUnqKPUOtMpq2y7aZk=";
+    buildMypyBoto3Package "connect" "1.43.34"
+      "sha256-NOESFHTxOOYkpkV3Eer4M0Ag7jYA0eZvIdGzQUZlrAg=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.43.0"
@@ -571,8 +571,8 @@ in
       "sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.43.32"
-      "sha256-wV0hi33q2UoKY4LiXQmplnsMuJzf2QGhj1m77Lir08U=";
+    buildMypyBoto3Package "glue" "1.43.34"
+      "sha256-8CB9DsZgBM6ht/yzlkIEeN0+QT3lan+95vSP0pDLps4=";
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.43.11"
       "sha256-XJOSLyL1+uEweZ9zER7IhH3DFLaLtpJKvuRIn8Ri+P4=";
@@ -966,8 +966,8 @@ in
       "sha256-dlZYG0M6H1b3SyocmFc+HQYn9MX1fryNJo6cIu6paBA=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.43.32"
-      "sha256-fLNaflt1AOYy8OKGiX+MvnDOgYcnFtTP6/h8zi/Eqy0=";
+    buildMypyBoto3Package "opensearch" "1.43.34"
+      "sha256-MCgsSuTTm5JpFVTCWYOqi4usXhqThxyda6Q8dd4FiLA=";
 
   mypy-boto3-opensearchserverless =
     buildMypyBoto3Package "opensearchserverless" "1.43.17"
diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix
index d36c1955bb1d..1c72964d5242 100644
--- a/pkgs/development/python-modules/nextdns/default.nix
+++ b/pkgs/development/python-modules/nextdns/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   aiohttp,
+  aiointercept,
   aioresponses,
   buildPythonPackage,
   fetchFromGitHub,
@@ -14,16 +15,18 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nextdns";
-  version = "5.0.0";
+  version = "5.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "nextdns";
     tag = finalAttrs.version;
-    hash = "sha256-jZ+ULAlqaOnVWEHDPzIxIFjx+4eC3jMlXyX0QhfZUYM=";
+    hash = "sha256-QCiosQHxuwDxztXMEkEosob8M2NMtnlGI33m5oAkaBw=";
   };
 
+  pythonRelaxDeps = [ "aiohttp" ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -32,6 +35,7 @@ buildPythonPackage (finalAttrs: {
   ];
 
   nativeCheckInputs = [
+    aiointercept
     aioresponses
     pytest-asyncio
     pytest-error-for-skips
diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix
index 5eebfa80f3e5..1b33556b4d95 100644
--- a/pkgs/development/python-modules/nutpie/default.nix
+++ b/pkgs/development/python-modules/nutpie/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nutpie";
-  version = "0.16.10";
+  version = "0.16.11";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -43,12 +43,12 @@ buildPythonPackage (finalAttrs: {
     owner = "pymc-devs";
     repo = "nutpie";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cqi4vhvu6Gvy0gOcgrpKCHbuVIyY5L9+y5nafzksPwg=";
+    hash = "sha256-ZakNyVW06QONdBSZFonOc585ZPLHsIjbFlBnX+Kg2kc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-cJixyzzt2vwdT2B/XbOLbG6XfWVeYAJg5YWT18GqMDw=";
+    hash = "sha256-n61ZrJtJFQ0G/7X59pKI8QNnOZPvDWiPmGC3tW3NQkk=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/default.nix b/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/default.nix
index acee32ae26f2..e4982f399263 100644
--- a/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/default.nix
+++ b/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/default.nix
@@ -12,6 +12,7 @@
   # dependencies
   cuda-bindings,
   numpy,
+  protobuf,
   typing-extensions,
 }:
 
@@ -28,22 +29,22 @@ let
 
   hashes = {
     x86_64-linux = {
-      cp311 = "sha256-kReQDLpT08Iajay6a789bl8mnkJ6UmwyD7RHB6DVc2M=";
-      cp312 = "sha256-Fe9qWRk2Z+Zjk070hz+MytN0Vem3w8QZwwchE7iu32E=";
-      cp313 = "sha256-5Z2n2J5eT4UUxlMIQ/kQ+dhzTYBC3KoHnJ2cUGPrNRQ=";
-      cp314 = "sha256-EsKffB8fgoUQkro4aSZNr6+wNSKMDZgnqNsIuIT7gMo=";
+      cp311 = "sha256-IYsM/q+MMYSTNjUDL1icbBkFE/Pv4LIysFtp0LW+XEs=";
+      cp312 = "sha256-oz2DkFz8p6LbIDSi9liUECR1XXXBtQDJOqy+YWTsAwA=";
+      cp313 = "sha256-Gd4Dm7NJa6qAbPIsimi5id2ZihKYR9PYu4MNNLp3fwg=";
+      cp314 = "sha256-Xj3sJ4B7XSQ0eeWX8shGtWC4m4DXfyUmiWOeZzcxPRA=";
     };
     aarch64-linux = {
-      cp311 = "sha256-y7VVqVxwEeSzyjKL5AcpnHfSiWYK2+oi7VFdRAbmlJw=";
-      cp312 = "sha256-0qPEEih+NW++SP6fhF1tM8013qXiDX5PYowglXlnys0=";
-      cp313 = "sha256-OVvXfPZCru8xExNFPmWC8RyTV6S4H+Yg6j2szR/Mq5s=";
-      cp314 = "sha256-IW7uaqgQfTVWn5RRtmsDo8UxZ4QdGvm2MLlm742Wbhk=";
+      cp311 = "sha256-0I/rlCm9hyAi0B/XkKapze1XoU9OorJSXtYu5KMvX38=";
+      cp312 = "sha256-l2g+5iMexXxPe/0s5TFx1/o4Bc+PMH3dI47XVwdEbNs=";
+      cp313 = "sha256-/ikvI1LniluT91AYEaA199iUX8GYZCawvozueoy7Lh8=";
+      cp314 = "sha256-M/2vaRZTr0UgbH5BFK1T6/8mCxqDdAHlSXdc2dDMJo8=";
     };
   };
 in
 buildPythonPackage (finalAttrs: {
   pname = "nvidia-cutlass-dsl-libs-base";
-  version = "4.5.2";
+  version = "4.6.0.dev0";
   format = "wheel";
 
   src = fetchPypi {
@@ -63,9 +64,13 @@ buildPythonPackage (finalAttrs: {
     # Only cuda-bindings is needed
     "cuda-python"
   ];
+  pythonRelaxDeps = [
+    "protobuf"
+  ];
   dependencies = [
     cuda-bindings
     numpy
+    protobuf
     typing-extensions
   ];
 
diff --git a/pkgs/development/python-modules/nvidia-cutlass-dsl/default.nix b/pkgs/development/python-modules/nvidia-cutlass-dsl/default.nix
index a57b71de3e32..e14bb93f8eab 100644
--- a/pkgs/development/python-modules/nvidia-cutlass-dsl/default.nix
+++ b/pkgs/development/python-modules/nvidia-cutlass-dsl/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
     format = "wheel";
     python = "py3";
     dist = "py3";
-    hash = "sha256-aO0bY8p0quh5VQEtqd/X/arkcTKdACiyKbhBxxksz1I=";
+    hash = "sha256-mN/UD6vGwNthDu6upAPwu54q7AvGma4M30dfpKVHEMo=";
   };
 
   dependencies = [
diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 9a050028b68b..6093f9d965c1 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-data";
-  version = "1.5.3";
+  version = "1.5.6";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = finalAttrs.version;
-    hash = "sha256-cTfalHdfMu21sxAY8ssXE9a1L5xTHtbM7bQX2PPUdWE=";
+    hash = "sha256-JkH8y3FzpMMIIv/42c+WzqJtA63SVQ/1v6ZE/5ybYR8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index e382d817ff66..8e5e146ac649 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-parser";
-  version = "8.11.2";
+  version = "8.11.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = finalAttrs.version;
-    hash = "sha256-wzC9tXhPuGtyD2pQ2hO4sfERNOH8+sCNvXUcrqqlEAM=";
+    hash = "sha256-l2An1JQrDA8Sf0R3Xu0qp84fksUQu/3aPkwHGmfv6AY=";
   };
 
   pythonRelaxDeps = [ "regex" ];
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 16174e934857..3f5d7651a5e0 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -4,7 +4,6 @@
   boost,
   buildPythonPackage,
   cmake,
-  distutils,
   doxygen,
   draco,
   embree,
@@ -53,25 +52,19 @@ in
 
 buildPythonPackage rec {
   pname = "openusd";
-  version = "25.05.01";
+  version = "26.03";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenUSD";
     tag = "v${version}";
-    hash = "sha256-gxikEC4MqTkhgYaRsCVYtS/VmXClSaCMdzpQ0LmiR7Q=";
+    hash = "sha256-Ijh7x63TqEkittO+r//sIkBu7I52/6C7a2n9Nq6Kt7g=";
   };
 
   outputs = [ "out" ] ++ lib.optional withDocs "doc";
 
   patches = [
-    (fetchpatch {
-      name = "port-to-embree-4.patch";
-      # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266
-      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/9ea3bc1ab550ec46c426dab04292d9667ccd2518.patch?full_index=1";
-      hash = "sha256-QjA3kjUDsSleUr+S/bQLb+QK723SNFvnmRPT+ojjgq8=";
-    })
     (fetchpatch {
       # https://github.com/PixarAnimationStudios/OpenUSD/pull/3648
       name = "propagate-dependencies-opengl.patch";
@@ -142,7 +135,6 @@ buildPythonPackage rec {
     numpy
     opensubdiv
     pyopengl
-    distutils
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGL
diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 7a1a3fb5cba2..75c632dd0fae 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "opower";
-  version = "0.18.4";
+  version = "0.18.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AAKaRnjj6M4mmFkYRInmxlIwEGA7lA2foiT8FwDOB98=";
+    hash = "sha256-s6nacD6k9OgByt2ZdBrZsHtAhdUto7gngqqQWI3henY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix
index 2d63e03bed3c..3332f7df0d87 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/pkgs/development/python-modules/optuna/default.nix
@@ -43,7 +43,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "optuna";
-  version = "4.8.0";
+  version = "4.9.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: {
     owner = "optuna";
     repo = "optuna";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DgmNIq4LksG3YRQLSbshMzGGRW/qAxMccs/oCRxI5tc=";
+    hash = "sha256-BoRy5LSzMl9w5KS9BW1uHUTcEj1ZyYp4nWykPgq6ckI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix
deleted file mode 100644
index ada770119d57..000000000000
--- a/pkgs/development/python-modules/py-deprecate/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pytestCheckHook,
-  scikit-learn,
-}:
-
-let
-  pname = "py-deprecate";
-  version = "0.7.0";
-in
-buildPythonPackage {
-  inherit pname version;
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "Borda";
-    repo = "pyDeprecate";
-    tag = "v${version}";
-    hash = "sha256-agJTANU3WhmAxj8EjeewHtvPxF9Fr0cRHNTMZBtDFQA=";
-  };
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    scikit-learn
-  ];
-
-  pythonImportsCheck = [ "deprecate" ];
-
-  meta = {
-    description = "Module for marking deprecated functions or classes and re-routing to the new successors' instance. Used by torchmetrics";
-    homepage = "https://borda.github.io/pyDeprecate/";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ SomeoneSerge ];
-  };
-}
diff --git a/pkgs/development/python-modules/py7zr/default.nix b/pkgs/development/python-modules/py7zr/default.nix
index 4c3ab83bdd40..9e8c075aba85 100644
--- a/pkgs/development/python-modules/py7zr/default.nix
+++ b/pkgs/development/python-modules/py7zr/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "py7zr";
-  version = "1.1.0";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miurahr";
     repo = "py7zr";
     tag = "v${version}";
-    hash = "sha256-lWZni9yhS5otWL1cyi8qZx2JLExbDiTPTadKKnDB2Ds=";
+    hash = "sha256-/sorvv5/kwlY/DtxW33ytHhyrR06p6aNgGW9oH+lpUw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pycrdt-store/default.nix b/pkgs/development/python-modules/pycrdt-store/default.nix
index 5b016b74758e..c29309599d88 100644
--- a/pkgs/development/python-modules/pycrdt-store/default.nix
+++ b/pkgs/development/python-modules/pycrdt-store/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pycrdt-store";
-  version = "0.1.4";
+  version = "0.1.5";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
     owner = "y-crdt";
     repo = "pycrdt-store";
     tag = finalAttrs.version;
-    hash = "sha256-njahh5wbUGYkXh/ibZYH+2gmvqegaD8LwlhNDpYFTcM=";
+    hash = "sha256-ggfk9MT/thBKHStToYwSDT4+ZL7mqveg9XDEXLAViU8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix
index 2d825a721c20..660077885c56 100644
--- a/pkgs/development/python-modules/pycrdt-websocket/default.nix
+++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pycrdt-websocket";
-  version = "0.16.2";
+  version = "0.16.3";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     owner = "y-crdt";
     repo = "pycrdt-websocket";
     tag = finalAttrs.version;
-    hash = "sha256-0HGDH3RP7uHr6eAU/s0e1LnRgtdz+v0ToZdrxG1wduc=";
+    hash = "sha256-VGEMsy/UNowGuj9XnjU82H+48QOhqzjI76tqTuYjNlM=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index 6d79266a8daf..afef0519927c 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -35,9 +35,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.11.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 
 [[package]]
 name = "bumpalo"
@@ -110,6 +110,37 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
 [[package]]
 name = "getrandom"
 version = "0.3.4"
@@ -144,12 +175,11 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "js-sys"
-version = "0.3.99"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
  "cfg-if",
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -170,9 +200,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
 
 [[package]]
 name = "once_cell"
@@ -222,18 +252,21 @@ dependencies = [
 
 [[package]]
 name = "pycrdt"
-version = "0.13.1"
+version = "0.14.1"
 dependencies = [
+ "futures-lite",
+ "futures-task",
  "pyo3",
+ "serde",
  "serde_json",
  "yrs",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
+checksum = "cd274650b21d4bfc26a0a47587962c1edb425f69287324355cd040c3ea66071c"
 dependencies = [
  "libc",
  "once_cell",
@@ -245,18 +278,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
+checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
+checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -264,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
+checksum = "9ac53762fd065daa3194dd09337a38bd793a188100fd1a9304c4ab312d901771"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -276,13 +309,12 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
+checksum = "4ca3a1557399783172dc5bf39cfca835157732532cba56b71d2292161e53b362"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
  "syn",
 ]
@@ -377,15 +409,15 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -426,18 +458,18 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "wasip2"
-version = "1.0.3+wasi-0.2.9"
+version = "1.0.4+wasi-0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.122"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
+checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -448,9 +480,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.122"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
+checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -458,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.122"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
+checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -471,9 +503,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.122"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
+checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
 dependencies = [
  "unicode-ident",
 ]
@@ -492,9 +524,9 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
 [[package]]
 name = "yrs"
-version = "0.26.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89512f2d869f9947e1c58d57ef86c8f4ca1b1e8ccf24d6e1ff8c7cdbd67d54df"
+checksum = "ccc6a0094c76c87b1b72ca0579bf7aa00f540957182264e6561cbde707c2ce51"
 dependencies = [
  "arc-swap",
  "async-lock",
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 31fc478a50af..a016934882e6 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pycrdt";
-  version = "0.13.1";
+  version = "0.14.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: {
     owner = "y-crdt";
     repo = "pycrdt";
     tag = finalAttrs.version;
-    hash = "sha256-B4Ez0aYQihLnQOhk4bPBrNeo/u9Qrvv0thvy+esEP/Q=";
+    hash = "sha256-60fRju7VwxaEw5KHcpBt9D0ooAXucckMsvBC5KW2uvg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pydeprecate/default.nix b/pkgs/development/python-modules/pydeprecate/default.nix
new file mode 100644
index 000000000000..962cb0467a85
--- /dev/null
+++ b/pkgs/development/python-modules/pydeprecate/default.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  typing-extensions,
+
+  # optional-dependencies
+  # audit
+  packaging,
+  # cli
+  fire,
+  rich,
+
+  # tests
+  pytest-asyncio,
+  pytestCheckHook,
+  scikit-learn,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyDeprecate";
+  version = "0.9.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Borda";
+    repo = "pyDeprecate";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-M3h5m+MqUYl8902YUqKqPfLpZXF3yQjlXP8f0ehnHds=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = lib.optionals (pythonOlder "3.13") [
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    audit = [
+      packaging
+    ];
+    cli = [
+      fire
+      rich
+    ];
+  };
+
+  pythonImportsCheck = [ "deprecate" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+    scikit-learn
+    typing-extensions
+  ]
+  ++ finalAttrs.passthru.optional-dependencies.cli;
+
+  meta = {
+    description = "Module for marking deprecated functions or classes and re-routing to the new successors' instance";
+    homepage = "https://borda.github.io/pyDeprecate/";
+    downloadPage = "https://github.com/Borda/pyDeprecate";
+    changelog = "https://github.com/Borda/pyDeprecate/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ SomeoneSerge ];
+  };
+})
diff --git a/pkgs/development/python-modules/pyituran/default.nix b/pkgs/development/python-modules/pyituran/default.nix
index aaac2f756c12..21c5649ee6b8 100644
--- a/pkgs/development/python-modules/pyituran/default.nix
+++ b/pkgs/development/python-modules/pyituran/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyituran";
-  version = "0.1.5";
+  version = "0.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "shmuelzon";
     repo = "pyituran";
     tag = version;
-    hash = "sha256-Nil9bxXzDvwMIVTxeaVUOtJwx92zagA6OzQV3LMR8d8=";
+    hash = "sha256-+3trWl9eijrtGfgBn5m4KfIVhS8u/o8n90bs3a3K9mo=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index e91972254e54..94d97162dbb4 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylint";
-  version = "4.0.5";
+  version = "4.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pylint-dev";
     repo = "pylint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RMoX3RR7T54Bvx0bBSmyuEsezqkxfdE/hIUa4G9exjQ=";
+    hash = "sha256-vg33n+MHCQTYeiMYmKJ7wORLx7Z/wv4t8v3u7k1keh4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix
index 888a8ce22d85..798a0f289342 100644
--- a/pkgs/development/python-modules/pynetbox/default.nix
+++ b/pkgs/development/python-modules/pynetbox/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pynetbox";
-  version = "7.7.0";
+  version = "7.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "pynetbox";
     tag = "v${version}";
-    hash = "sha256-h/kEMPr3l9ZhWNv4i4R58AQ7z4WdVbBM5Mq3X6Hnp88=";
+    hash = "sha256-vHtKWiaIb1dwzXaFDqDQ3iWCHYtCqOJD5PMKigXbHtU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix
index 22671fe18f2e..d27999d63045 100644
--- a/pkgs/development/python-modules/pynput/default.nix
+++ b/pkgs/development/python-modules/pynput/default.nix
@@ -14,6 +14,8 @@
   xlib,
   evdev,
   six,
+  pyobjc-framework-ApplicationServices,
+  pyobjc-framework-Quartz,
 
   # tests
   unittestCheckHook,
@@ -52,6 +54,11 @@ buildPythonPackage rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     evdev
     xlib
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # the darwin backend imports HIServices (ApplicationServices) and Quartz
+    pyobjc-framework-ApplicationServices
+    pyobjc-framework-Quartz
   ];
 
   doCheck = false; # requires running X server
@@ -59,7 +66,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [ unittestCheckHook ];
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Library to control and monitor input devices";
     homepage = "https://github.com/moses-palmer/pynput";
     license = lib.licenses.lgpl3;
diff --git a/pkgs/development/python-modules/pyobjc-framework-ApplicationServices/default.nix b/pkgs/development/python-modules/pyobjc-framework-ApplicationServices/default.nix
new file mode 100644
index 000000000000..c6df11fc9dc4
--- /dev/null
+++ b/pkgs/development/python-modules/pyobjc-framework-ApplicationServices/default.nix
@@ -0,0 +1,62 @@
+{
+  buildPythonPackage,
+  setuptools,
+  darwin,
+  pyobjc-core,
+  pyobjc-framework-Cocoa,
+  pyobjc-framework-Quartz,
+  pyobjc-framework-CoreText,
+  lib,
+}:
+
+buildPythonPackage rec {
+  pname = "pyobjc-framework-ApplicationServices";
+  pyproject = true;
+
+  inherit (pyobjc-core) version src;
+
+  sourceRoot = "${src.name}/pyobjc-framework-ApplicationServices";
+
+  build-system = [ setuptools ];
+
+  buildInputs = [ darwin.libffi ];
+
+  nativeBuildInputs = [
+    darwin.DarwinTools # sw_vers
+  ];
+
+  # Same workaround as pyobjc-framework-Quartz; see
+  # https://github.com/ronaldoussoren/pyobjc/pull/641.
+  postPatch = ''
+    substituteInPlace pyobjc_setup.py \
+      --replace-fail "-buildversion" "-buildVersion" \
+      --replace-fail "-productversion" "-productVersion" \
+      --replace-fail "/usr/bin/sw_vers" "sw_vers" \
+      --replace-fail "/usr/bin/xcrun" "xcrun"
+  '';
+
+  dependencies = [
+    pyobjc-core
+    pyobjc-framework-Cocoa
+    pyobjc-framework-Quartz
+    pyobjc-framework-CoreText
+  ];
+
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-I${darwin.libffi.dev}/include"
+    "-Wno-error=unused-command-line-argument"
+  ];
+
+  pythonImportsCheck = [
+    "ApplicationServices"
+    "HIServices"
+  ];
+
+  meta = {
+    description = "PyObjC wrappers for the ApplicationServices framework on macOS";
+    homepage = "https://github.com/ronaldoussoren/pyobjc";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ l1n ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyobjc-framework-CoreText/default.nix b/pkgs/development/python-modules/pyobjc-framework-CoreText/default.nix
new file mode 100644
index 000000000000..7a5fed7c016e
--- /dev/null
+++ b/pkgs/development/python-modules/pyobjc-framework-CoreText/default.nix
@@ -0,0 +1,59 @@
+{
+  buildPythonPackage,
+  setuptools,
+  darwin,
+  pyobjc-core,
+  pyobjc-framework-Cocoa,
+  pyobjc-framework-Quartz,
+  lib,
+}:
+
+buildPythonPackage rec {
+  pname = "pyobjc-framework-CoreText";
+  pyproject = true;
+
+  inherit (pyobjc-core) version src;
+
+  sourceRoot = "${src.name}/pyobjc-framework-CoreText";
+
+  build-system = [ setuptools ];
+
+  buildInputs = [ darwin.libffi ];
+
+  nativeBuildInputs = [
+    darwin.DarwinTools # sw_vers
+  ];
+
+  # Same workaround as pyobjc-framework-Quartz; see
+  # https://github.com/ronaldoussoren/pyobjc/pull/641.
+  postPatch = ''
+    substituteInPlace pyobjc_setup.py \
+      --replace-fail "-buildversion" "-buildVersion" \
+      --replace-fail "-productversion" "-productVersion" \
+      --replace-fail "/usr/bin/sw_vers" "sw_vers" \
+      --replace-fail "/usr/bin/xcrun" "xcrun"
+  '';
+
+  dependencies = [
+    pyobjc-core
+    pyobjc-framework-Cocoa
+    pyobjc-framework-Quartz
+  ];
+
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-I${darwin.libffi.dev}/include"
+    "-Wno-error=unused-command-line-argument"
+  ];
+
+  pythonImportsCheck = [
+    "CoreText"
+  ];
+
+  meta = {
+    description = "PyObjC wrappers for the CoreText framework on macOS";
+    homepage = "https://github.com/ronaldoussoren/pyobjc";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ l1n ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix
index b447408dec6f..22e620d13eae 100644
--- a/pkgs/development/python-modules/pyreadstat/default.nix
+++ b/pkgs/development/python-modules/pyreadstat/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyreadstat";
-  version = "1.3.4";
+  version = "1.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Roche";
     repo = "pyreadstat";
     tag = "v${version}";
-    hash = "sha256-DC8iNv+4JpqdLq8op5gSHJEnodW+mc8utE7HCezcqpM=";
+    hash = "sha256-9SSY8wX0CMEjoSOHZHH9z5e5/PU4EsXiRxu8f2EXzZk=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix
index ea5083233c88..c7a3b75fb5b0 100644
--- a/pkgs/development/python-modules/pytest-playwright/default.nix
+++ b/pkgs/development/python-modules/pytest-playwright/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-playwright";
-  version = "0.7.2";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "playwright-pytest";
     tag = "v${version}";
-    hash = "sha256-FAG+lpo4cdfHSqQ1k0U2U0agTpUkEUIV+4veFijwR9A=";
+    hash = "sha256-gSCRbclPGdYUnhxYKWoSE9YALIDzmLgiqH0waELKLWk=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index f0e2706896b5..0e9b24403415 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2026.1";
+  version = "2026.1.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-e2Q4yl7N7e5C4WyMtwLCrlYqmPsmLawaOwGxIcw0vtU=";
+    hash = "sha256-Jg4NiMmpA8Zc/jT76Bh2T0Sj+W5yLho2Rc5NWWrdIrE=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/quack-kernels/default.nix b/pkgs/development/python-modules/quack-kernels/default.nix
index b817693d6d55..d46c8a2d8140 100644
--- a/pkgs/development/python-modules/quack-kernels/default.nix
+++ b/pkgs/development/python-modules/quack-kernels/default.nix
@@ -21,7 +21,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "quack-kernels";
-  version = "0.5.0";
+  version = "0.5.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
     owner = "Dao-AILab";
     repo = "quack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y56jJUTn/HopOe0yNxxxwMf+abXSdzTa8+YoiHd/rFE=";
+    hash = "sha256-iIINpP6teFPQFvxwfDYLPhIOFSqw3A6Nita/FjVFiBM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix
index e290fae8f5ec..5937f8d8faa6 100644
--- a/pkgs/development/python-modules/redis-om/default.nix
+++ b/pkgs/development/python-modules/redis-om/default.nix
@@ -87,5 +87,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
+    teams = [ lib.teams.redis ];
   };
 }
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 66f7a75717a5..2602e0f0e3e1 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -73,5 +73,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/redis/redis-py/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.dotlambda ];
+    teams = [ lib.teams.redis ];
   };
 }
diff --git a/pkgs/development/python-modules/redisvl/default.nix b/pkgs/development/python-modules/redisvl/default.nix
index 8954d672b771..05897866f9bf 100644
--- a/pkgs/development/python-modules/redisvl/default.nix
+++ b/pkgs/development/python-modules/redisvl/default.nix
@@ -49,9 +49,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/redis/redis-vl-python/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "rvl";
-    maintainers = with lib.maintainers; [
-      codgician
-      hythera
-    ];
+    maintainers = with lib.maintainers; [ codgician ];
+    teams = [ lib.teams.redis ];
   };
 })
diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 8f3c55996e7d..a53e08d86223 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rq";
-  version = "2.8";
+  version = "2.9.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     owner = "rq";
     repo = "rq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZO67rsqub9hBUt4XMqrx+P7Dj1dEKD9zp4O5x1Kehe0=";
+    hash = "sha256-arPz/+T8+NneiTur17BQehMiIIpHqqR8M8nw5LWu56o=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/sklearn2pmml/default.nix b/pkgs/development/python-modules/sklearn2pmml/default.nix
index 53dea7d9bfa8..9d666848865b 100644
--- a/pkgs/development/python-modules/sklearn2pmml/default.nix
+++ b/pkgs/development/python-modules/sklearn2pmml/default.nix
@@ -33,14 +33,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "sklearn2pmml";
-  version = "0.130.0";
+  version = "0.131.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpmml";
     repo = "sklearn2pmml";
     tag = finalAttrs.version;
-    hash = "sha256-u+fuOiJ0YTyxVZkKhBhxn0gUHbLRQ69WwSX2GwhYaHU=";
+    hash = "sha256-FHk5vsXksVJs873VJqfX85nkRkojYBhaivbPIv1FReU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix b/pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix
index ea76afe73264..a5e094a715af 100644
--- a/pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix
+++ b/pkgs/development/python-modules/snakemake-logger-plugin-rich/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "snakemake-logger-plugin-rich";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: {
     owner = "cademirch";
     repo = "snakemake-logger-plugin-rich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kMjzagM95Td529JU+qIxGStgJGctS08glrFo3CF+Ih8=";
+    hash = "sha256-vdPM1nRovZ5QhKudzCebMNMndzOWPvTmI5I1oTbzg9o=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index 5bdae28926f5..4bf7de2154ae 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "ufo2ft";
-  version = "3.8.1";
+  version = "3.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "ufo2ft";
     tag = "v${version}";
-    hash = "sha256-Y9QyirOYbZ7fNivsb2N/hNlzr5FZqyscN9m1G8x1icE=";
+    hash = "sha256-6lo1WyLmXIcZnHDewwQekTxALHQAiCLNF7Kxj+nKBj8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index 7c0fd4b1f568..4577f00e9f22 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sigma67";
     repo = "ytmusicapi";
     tag = version;
-    hash = "sha256-hz/kDupzZV2wwuElvUbBtWUFVI0q0bDo1WwzvjXGclo=";
+    hash = "sha256-9K61PJz+edCdLv8HiuASV4Bn3Tpw4JsCbIQNn24LjSU=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix
index 0bab2db0ba3b..a8b3e562573a 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/pkgs/games/cataclysm-dda/git.nix
@@ -37,7 +37,7 @@ let
     ];
 
     meta = common.meta // {
-      maintainers = with lib.maintainers; common.meta.maintainers ++ [ rardiol ];
+      maintainers = common.meta.maintainers ++ [ ];
     };
   });
 in
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index b2fef65e07a5..9a95fa154501 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2026.6.3";
+  version = "2026.6.4";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/custom-components/alphaess/package.nix b/pkgs/servers/home-assistant/custom-components/alphaess/package.nix
index 2e3c0012d56f..9ff7d45c605f 100644
--- a/pkgs/servers/home-assistant/custom-components/alphaess/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/alphaess/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "CharlesGillanders";
   domain = "alphaess";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "CharlesGillanders";
     repo = "homeassistant-alphaESS";
     tag = "v${version}";
-    hash = "sha256-p5F1qBeTQ/LshyvApo0xWN/WmFLFf7J9tL7XiIr+/fU=";
+    hash = "sha256-7IswE+Eqdo+hXic4MQ+vx6lBAudoQPW80eT6AEPFDjQ=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix
index 712f554aaacd..e2a9f33cc2ec 100644
--- a/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "luuquangvu";
   domain = "blueprints_updater";
-  version = "2.7.4";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "blueprints-updater";
     tag = version;
-    hash = "sha256-8vq/tU9a0faioSmy9CdJerIx1ry67B+gqdlnSNiEFGU=";
+    hash = "sha256-aqufiwH9yJmyr5Bd3Etwf5aK9dAfa7srXpBcmXDFAoY=";
   };
 
   patches = [
diff --git a/pkgs/servers/home-assistant/custom-components/dreo/package.nix b/pkgs/servers/home-assistant/custom-components/dreo/package.nix
index 95551e240f60..42cd01c92268 100644
--- a/pkgs/servers/home-assistant/custom-components/dreo/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/dreo/package.nix
@@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
   owner = "JeffSteinbok";
   domain = "dreo";
-  version = "1.9.14";
+  version = "1.9.16";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hass-dreo";
     tag = "v${version}";
-    hash = "sha256-zLt/nFb0mhiz6sI4ZoSekMWsJfQejcV8p1xd7vWoWPk=";
+    hash = "sha256-qhO0qTB5aieO1C1RrZfW9eHVDqy6QzFneqVOnMjCLag=";
   };
 
   dependencies = [ websockets ];
diff --git a/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix b/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix
index 39f9a11289f2..10e012e22196 100644
--- a/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix
@@ -18,13 +18,13 @@
 buildHomeAssistantComponent rec {
   owner = "rabits";
   domain = "ef_ble";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "rabits";
     repo = "ha-ef-ble";
     tag = "v${version}";
-    hash = "sha256-MSfXSvnaVFot4JkLSZrbL3DB3MV7DvgRT8MCxv6qHlQ=";
+    hash = "sha256-OGU5PkW+H+tIPRwMWFEAMUZbJsm880HurLAdjIV0zG4=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
index 4658594802ea..c5a9fba9f302 100644
--- a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "bm1549";
   domain = "frigidaire";
-  version = "0.1.20";
+  version = "0.1.21";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "home-assistant-frigidaire";
     tag = version;
-    hash = "sha256-XUtffkwy1HGVt41rrPl5Yk2DkYQie2FcYMoxSnzlArY=";
+    hash = "sha256-Pa1pVxP1gB/1XNqFy3U5t2xeHk+BUe6TQKtU00xcbx4=";
   };
 
   dependencies = [ frigidaire ];
diff --git a/pkgs/servers/home-assistant/custom-components/meshcore/package.nix b/pkgs/servers/home-assistant/custom-components/meshcore/package.nix
index 3f87437585a0..72074dbc23a0 100644
--- a/pkgs/servers/home-assistant/custom-components/meshcore/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/meshcore/package.nix
@@ -14,13 +14,13 @@
 buildHomeAssistantComponent (finalAttrs: {
   owner = "meshcore-dev";
   domain = "meshcore";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "meshcore-dev";
     repo = "meshcore-ha";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DykWjoMVVKzDa05UtytrkwUej80zteZThi8E3e7M+ZU=";
+    hash = "sha256-K1DYBcuAilcKBzQVSUQvoA9OoxUbtfISYNY8IwgUdZk=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
index 187bbafcebae..a1523395e88b 100644
--- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wuwentao";
   domain = "midea_ac_lan";
-  version = "0.6.11";
+  version = "0.6.12";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     tag = "v${version}";
-    hash = "sha256-s5Rk3xBVWBicKVCbPDTuwyMRaLqIG8ttGthtQtastBs=";
+    hash = "sha256-3+DCG08VZL1w4sn9igZE/ysbrPRpOn7/fPV6nZWwntY=";
   };
 
   dependencies = [ midea-local ];
diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
index 4a13ef623d24..eadef67ec1b0 100644
--- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
@@ -2,7 +2,6 @@
   lib,
   buildHomeAssistantComponent,
   fetchFromGitHub,
-  fetchpatch,
 
   # dependencies
   numpy,
@@ -18,23 +17,15 @@
 buildHomeAssistantComponent rec {
   owner = "bramstroker";
   domain = "powercalc";
-  version = "1.20.14";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-powercalc";
     tag = "v${version}";
-    hash = "sha256-Tm9h6ZHByuiM9XZz3D1TZR3ISbb16l0K1Vy8sJxI4+s=";
+    hash = "sha256-XVLemGYPuArcwek6zEZW/MS79sUWL2qbeUSTNarsZ8I=";
   };
 
-  patches = [
-    # Fix compatibility with Home-Assistant 2026.5.0
-    (fetchpatch {
-      url = "https://github.com/bramstroker/homeassistant-powercalc/commit/3d5e162954c21adfd9251c4d8e21872e66680454.patch";
-      hash = "sha256-7InjKxT8gPiR2IvLbA4oZpkgPRJbQY39SF4YNPilp4k=";
-    })
-  ];
-
   dependencies = [ numpy ];
 
   nativeCheckInputs = [
diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 79cba9d5d0f4..ea455dff2e5f 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2026.06.5";
+  version = "2026.06.6";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-FNb/3SwpJb5fPJ/qegLy6XMxHs3YQjHAjkgmL+14qMI=";
+    hash = "sha256-25JXvgcxx2DX7/obQhdlpCtMKxrZnEmpqChn/gaiRhk=";
   };
 
   dependencies = [ pymodbus ];
diff --git a/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix b/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix
index 6c99cd62cfae..abf556d2a04e 100644
--- a/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "marq24";
   domain = "tibber_local";
-  version = "2026.5.1";
+  version = "2026.6.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-tibber-pulse-local";
     tag = version;
-    hash = "sha256-PjFPk/hwgpyCtjy/kRrLpDDpcGq+JwcsSA3P9NG+W/w=";
+    hash = "sha256-HalEHJg3+6D+3TXVsfdlxL3HvSqXUcaSrW1owtRPff8=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
index 1589ba238f21..8b3a1edde7ec 100644
--- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "make-all";
   domain = "tuya_local";
-  version = "2026.6.1";
+  version = "2026.6.2";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "tuya-local";
     tag = version;
-    hash = "sha256-guZEslmDKsQr/wcjLqpHNLZo1qrKqmz4i8dTlGsiL2k=";
+    hash = "sha256-4897QCslPQ/5Rt1U6EcapUav7XMa65i+5aXbMyv9mxE=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index 1f8d6879c947..eb9073956dd1 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -20,13 +20,13 @@
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.27.0";
+  version = "2.28.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = "v${version}";
-    hash = "sha256-jjLebP2rkxI59JN4peTAGDBQe8/Si6xihQW8aqE1neo=";
+    hash = "sha256-fE2/nMUsAtqZMRsZyxNFvQzv1QtMxmWP52vvjqWmfJw=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
index 2f9ffa7c6451..fe7d1471398d 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "auto-entities";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "Lint-Free-Technology";
     repo = "lovelace-auto-entities";
     tag = "v${version}";
-    hash = "sha256-m8rR4IqB4k3ZJAJVR6A1lzCTutDdbuWBEIBd+6xIh6Y=";
+    hash = "sha256-qKhxVLD4NbkCzpUNX5UkjEjLOMQ7ZvHHLVLTrcunTPQ=";
   };
 
-  npmDepsHash = "sha256-jQfEUWlxavD4+RsfA1vQlwtkP0uAzNVs8aC93ccQcEk=";
+  npmDepsHash = "sha256-Z+9Lp1AzrY2I+unpBxdbr9rkfcIe/dDblB3MDSd2D8w=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
index 8e1bfacc40e1..27d07166f0f1 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "weather-radar-card";
-  version = "3.6.5";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "jpettitt";
     repo = "weather-radar-card";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D+aWTcUOVkt99mdl3q1VahJKXDBIbh6RX3psYsjnTLo=";
+    hash = "sha256-ZEd27lt5S7pnGGzTnxLV6voEpzXjvRjubjmusLuISZg=";
   };
 
   npmDepsFetcherVersion = 2;
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 80cbb9803774..5ca1e26dfea4 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -265,7 +265,7 @@ let
   extraBuildInputs = extraPackages python3Packages;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.6.3";
+  hassVersion = "2026.6.4";
 
 in
 python3Packages.buildPythonApplication rec {
@@ -286,13 +286,13 @@ python3Packages.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-I9vmwlCoxEK3o04e1x5LissX3u0fgxVOu6Uzq88e9kI=";
+    hash = "sha256-NeqJT2CW8A0VfUJ2yrR+KGmmQMK8q0Wdag43rUBBoWU=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-23tqASXXrhYh1x7Qy+ZR4T7z+XKkhW0Qn6YGM2iNJOk=";
+    hash = "sha256-7Y26vN0oskJBgijtm9RZcvHw/xBEH3IsI8hezgsOVr0=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index fb2368b8e5f2..f0950cfe0265 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20260527.6";
+  version = "20260527.7";
   format = "wheel";
 
   src = fetchPypi {
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-tvJXB+lFrlDA3eUnE5NPQwXbWn8XGggPJ9I1f9U1ddk=";
+    hash = "sha256-zYm8K3HJnAkT41S6TmGvj8V8zpt7tb4pRtWCiB9PEXw=";
   };
 
   # there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index 6dc6cbfe0876..d6049a3f5f86 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.339";
+  version = "0.13.340";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     tag = version;
-    hash = "sha256-4BmtdmQyeYaOPPMDnnBNCvB0EgWcw9umC5hV4rFRTLA=";
+    hash = "sha256-08hshNdSbOJSu/uJVBeZSxksYaCSZo7KjwwyaooqNGo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 001d73d97934..d56ddb56f4ce 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2026.6.3";
+  version = "2026.6.4";
   pyproject = true;
 
   disabled = python.version != home-assistant.python3Packages.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-YJT0/2NJiuh7Do3gik2Rr2a1A2rMJYVEjrV6xrxF9Ww=";
+    hash = "sha256-nfBY+nXBv0ZrXXr0Be/0xttYMncx7NmMPbAbx6D00SU=";
   };
 
   build-system = [
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index f75e253e8f17..d4ac5634c5da 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -139,6 +139,11 @@ let
       # https://github.com/home-assistant/core/pull/172909
       "test_upload_image_device_not_in_range"
     ];
+    teslemetry = [
+      # [2026.6.4] http://github.com/home-assistant/core/commit/a33a92982af19e682a0d0fa7bec0cb16929c00d1
+      "test_sensors"
+      "test_sensors_streaming"
+    ];
     yardian = [
       # [2026.6.1] failing snapshot
       "test_all_entities"
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index 8ab58ac56eb2..be0fa6702191 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -5,9 +5,9 @@ let
 in
 {
   mir = common {
-    version = "2.26.0";
-    hash = "sha256-gADqNNkaYj8KQ67wWzUWT4LuTQh1S+w/qLhVDKdBH4Q=";
-    cargoHash = "sha256-bG2p5Gz34yQJLI1Wuejq6o+jXLn6O2eZE1XGddvxkV4=";
+    version = "2.28.0";
+    hash = "sha256-sSxV20loRXQfGWMI1zAzrAwww00bc/BQqJaFB8whH5E=";
+    cargoHash = "sha256-AHB4OYP2kU47EsutOxYa693pMLgyXuF1p+mLXg2cIGs=";
   };
 
   mir_2_15 = common {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
index 5a7f652f2eb0..37362c8b0869 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
@@ -9,13 +9,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_squeeze";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "cybertec-postgresql";
     repo = "pg_squeeze";
     tag = "REL${lib.replaceString "." "_" finalAttrs.version}";
-    hash = "sha256-gzep34mxV9D9xk/J7JfSTWg8EaM/BJezpM3tt/tlxmM=";
+    hash = "sha256-lwjiRWbz+MzfodcP3jgaLdOcZ2/UheZn10iXabdfxh0=";
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
index c1ab46736b9f..10e47558eb4f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgsql-http";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "pramsey";
     repo = "pgsql-http";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tgmty8ZYpSEccwQouI/Ho2M495k6DizbMaaJ0+aW03Q=";
+    hash = "sha256-vTOLAv0TYks8ubQa/y7+XjaIZuHEfh2wi2I38UNJ7NM=";
   };
 
   buildInputs = [ curl ];
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 17c8279340c7..f41498fc1af1 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -35,7 +35,7 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
   pname = "postgis";
-  version = "3.6.3";
+  version = "3.6.4";
 
   outputs = [
     "out"
@@ -46,7 +46,7 @@ postgresqlBuildExtension (finalAttrs: {
     owner = "postgis";
     repo = "postgis";
     tag = finalAttrs.version;
-    hash = "sha256-pCkn3ocRBD70apCdfYTmdUKrcGP28D5VM77S79m5e/0=";
+    hash = "sha256-ZRBrZ23s0w3noFU6L3Ke9G/Z8d7xGGg3qo/2GPDpbK4=";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 08c4b2f91959..05ad32140cf3 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -679,14 +679,17 @@ let
           "/share/postgresql/tsearch_data"
         ];
 
-        nativeBuildInputs = [ makeBinaryWrapper ];
-        postBuild =
-          let
-            args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions;
-          in
-          ''
-            wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args}
-          '';
+        derivationArgs = {
+          strictDeps = true;
+          nativeBuildInputs = [ makeBinaryWrapper ];
+          postBuild =
+            let
+              args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions;
+            in
+            ''
+              wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args}
+            '';
+        };
 
         passthru = {
           inherit installedExtensions;
diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix
index 5f0fd672adf6..bc580f35e396 100644
--- a/pkgs/shells/fish/plugins/done.nix
+++ b/pkgs/shells/fish/plugins/done.nix
@@ -3,6 +3,7 @@
   buildFishPlugin,
   fetchFromGitHub,
   fishtape,
+  jq,
 }:
 
 buildFishPlugin rec {
@@ -16,6 +17,12 @@ buildFishPlugin rec {
     hash = "sha256-GZ1ZpcaEfbcex6XvxOFJDJqoD9C5out0W4bkkn768r0=";
   };
 
+  postPatch = ''
+    substituteInPlace conf.d/done.fish \
+      --replace-fail " jq " " ${lib.getExe jq} " \
+      --replace-fail "and type -q jq" "and type -q ${lib.getExe jq}"
+  '';
+
   checkPlugins = [ fishtape ];
   checkPhase = ''
     fishtape test/done.fish
@@ -25,6 +32,9 @@ buildFishPlugin rec {
     description = "Automatically receive notifications when long processes finish";
     homepage = "https://github.com/franciscolourenco/done";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.malo ];
+    maintainers = with lib.maintainers; [
+      malo
+      rexies
+    ];
   };
 }
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 70c009c3e83a..780e98ed3adc 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -300,7 +300,7 @@ let
 
   metaType =
     let
-      types = import ./meta-types.nix { inherit lib; };
+      types = import ../../../lib/meta-types.nix { inherit lib; };
       inherit (types)
         str
         union
diff --git a/pkgs/stdenv/generic/problems.nix b/pkgs/stdenv/generic/problems.nix
index 0f03c393e384..114d586c0df6 100644
--- a/pkgs/stdenv/generic/problems.nix
+++ b/pkgs/stdenv/generic/problems.nix
@@ -242,7 +242,7 @@ rec {
   # The type for meta.problems
   problemsType =
     let
-      types = import ./meta-types.nix { inherit lib; };
+      types = import ../../../lib/meta-types.nix { inherit lib; };
       inherit (types)
         str
         listOf
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 39c48cbcf876..e99e55652476 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -421,6 +421,7 @@ mapAliases {
   push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17
   pushbullet = throw "'pushbullet' has been renamed to/replaced by 'pushbullet-py'"; # Converted to throw 2025-10-29
   Pweave = throw "'Pweave' has been renamed to/replaced by 'pweave'"; # Converted to throw 2025-10-29
+  py-deprecate = throw "'py-deprecate' has been renamed to/replaced by 'pydeprecate'"; # Converted to throw 2026-06-19
   py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   py-scrypt = scrypt; # added 2025-08-07
   py_stringmatching = throw "'py_stringmatching' has been renamed to/replaced by 'py-stringmatching'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a840615cf085..1d0ef73df8c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8686,6 +8686,8 @@ self: super: with self; {
 
   lark = callPackage ../development/python-modules/lark { };
 
+  lark-oapi = callPackage ../development/python-modules/lark-oapi { };
+
   laspy = callPackage ../development/python-modules/laspy { };
 
   lastversion = callPackage ../development/python-modules/lastversion { };
@@ -13449,8 +13451,6 @@ self: super: with self; {
 
   py-datastruct = callPackage ../development/python-modules/py-datastruct { };
 
-  py-deprecate = callPackage ../development/python-modules/py-deprecate { };
-
   py-desmume = callPackage ../development/python-modules/py-desmume {
     inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
   };
@@ -13948,6 +13948,8 @@ self: super: with self; {
 
   pydenticon = callPackage ../development/python-modules/pydenticon { };
 
+  pydeprecate = callPackage ../development/python-modules/pydeprecate { };
+
   pydeps = callPackage ../development/python-modules/pydeps { inherit (pkgs) graphviz; };
 
   pydes = callPackage ../development/python-modules/pydes { };
@@ -14802,6 +14804,10 @@ self: super: with self; {
 
   pyobjc-core = callPackage ../development/python-modules/pyobjc-core { };
 
+  pyobjc-framework-ApplicationServices =
+    callPackage ../development/python-modules/pyobjc-framework-ApplicationServices
+      { };
+
   pyobjc-framework-Cocoa = callPackage ../development/python-modules/pyobjc-framework-Cocoa { };
 
   pyobjc-framework-CoreAudio =
@@ -14812,6 +14818,8 @@ self: super: with self; {
     callPackage ../development/python-modules/pyobjc-framework-CoreBluetooth
       { };
 
+  pyobjc-framework-CoreText = callPackage ../development/python-modules/pyobjc-framework-CoreText { };
+
   pyobjc-framework-Quartz = callPackage ../development/python-modules/pyobjc-framework-Quartz { };
 
   pyobjc-framework-Security = callPackage ../development/python-modules/pyobjc-framework-Security { };
diff --git a/shell.nix b/shell.nix
index 4d8043f431b5..b68b120a2529 100644
--- a/shell.nix
+++ b/shell.nix
@@ -28,15 +28,14 @@ let
 in
 curPkgs
 // pkgs.mkShellNoCC {
-  inputsFrom = [
-    fmt.shell
-  ];
-  packages = with pkgs; [
+  packages = [
     # Helper to review Nixpkgs PRs
     # See CONTRIBUTING.md
-    nixpkgs-reviewFull
+    pkgs.nixpkgs-reviewFull
     # Command-line utility for working with GitHub
     # Used by nixpkgs-review to fetch eval results
-    gh
+    pkgs.gh
+    # treefmt wrapper
+    fmt.pkg
   ];
 }