From a99adc7c06a8eff52503f4376238b02ad92226a0 Mon Sep 17 00:00:00 2001
From: Niols <niols@niols.fr>
Date: Thu, 10 Jul 2025 13:58:26 +0200
Subject: [PATCH 001/101] lib.fileset: add `isFileset` helper

---
 lib/fileset/default.nix  | 35 ++++++++++++++++++++++++++++++
 lib/fileset/internal.nix | 47 ++++++++++++++++++++++++++++++----------
 2 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix
index 3c51c6d4dab4..27a4d80f68ad 100644
--- a/lib/fileset/default.nix
+++ b/lib/fileset/default.nix
@@ -101,6 +101,7 @@ let
 
   inherit (import ./internal.nix { inherit lib; })
     _coerce
+    _coerceResult
     _singleton
     _coerceMany
     _toSourceFilter
@@ -1005,4 +1006,38 @@ in
         {
           submodules = recurseSubmodules;
         };
+
+  /**
+    Tests whether a given value is a fileset, or can be used in place of a fileset.
+
+    # Inputs
+
+    `value`
+
+    : The value to test
+
+    # Type
+
+    ```
+    isFileset :: Any -> Bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.fileset.isFileset` usage example
+
+    ```nix
+    isFileset ./.
+    => true
+
+    isFileset (unions [  ])
+    => true
+
+    isFileset 1
+    => false
+    ```
+
+    :::
+  */
+  isFileset = x: (_coerceResult "" x).success;
 }
diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix
index 59b8408ae8d6..342b284e1f71 100644
--- a/lib/fileset/internal.nix
+++ b/lib/fileset/internal.nix
@@ -165,14 +165,27 @@ rec {
       _noEval = throw _noEvalMessage;
     };
 
-  # Coerce a value to a fileset, erroring when the value cannot be coerced.
-  # The string gives the context for error messages.
-  # Type: String -> (fileset | Path) -> fileset
-  _coerce =
+  # Coerce a value to a fileset. Return a set containing the attribute `success`
+  # indicating whether coercing succeeded, and either `value` when `success ==
+  # true`, or an error `message` when `success == false`. The string gives the
+  # context for error messages.
+  #
+  # Type: String -> (fileset | Path) -> { success :: Bool, value :: fileset } ] -> { success :: Bool, message :: String }
+  _coerceResult =
+    let
+      ok = value: {
+        success = true;
+        inherit value;
+      };
+      error = message: {
+        success = false;
+        inherit message;
+      };
+    in
     context: value:
     if value._type or "" == "fileset" then
       if value._internalVersion > _currentVersion then
-        throw ''
+        error ''
           ${context} is a file set created from a future version of the file set library with a different internal representation:
               - Internal version of the file set: ${toString value._internalVersion}
               - Internal version of the library: ${toString _currentVersion}
@@ -184,27 +197,37 @@ rec {
             _currentVersion - value._internalVersion
           ) migrations;
         in
-        foldl' (value: migration: migration value) value migrationsToApply
+        ok (foldl' (value: migration: migration value) value migrationsToApply)
       else
-        value
+        ok value
     else if !isPath value then
       if value ? _isLibCleanSourceWith then
-        throw ''
+        error ''
           ${context} is a `lib.sources`-based value, but it should be a file set or a path instead.
               To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`.
               Note that this only works for sources created from paths.''
       else if isStringLike value then
-        throw ''
+        error ''
           ${context} ("${toString value}") is a string-like value, but it should be a file set or a path instead.
               Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.''
       else
-        throw ''${context} is of type ${typeOf value}, but it should be a file set or a path instead.''
+        error ''${context} is of type ${typeOf value}, but it should be a file set or a path instead.''
     else if !pathExists value then
-      throw ''
+      error ''
         ${context} (${toString value}) is a path that does not exist.
             To create a file set from a path that may not exist, use `lib.fileset.maybeMissing`.''
     else
-      _singleton value;
+      ok (_singleton value);
+
+  # Coerce a value to a fileset, erroring when the value cannot be coerced.
+  # The string gives the context for error messages.
+  # Type: String -> (fileset | Path) -> fileset
+  _coerce =
+    context: value:
+    let
+      result = _coerceResult context value;
+    in
+    if result.success then result.value else throw result.message;
 
   # Coerce many values to filesets, erroring when any value cannot be coerced,
   # or if the filesystem root of the values doesn't match.

From b99df9d49420998abd4fb72d666ec1835dec10e4 Mon Sep 17 00:00:00 2001
From: Niols <niols@niols.fr>
Date: Fri, 25 Jul 2025 12:41:46 +0200
Subject: [PATCH 002/101] lib.fileset: expose the `empty` fileset

---
 lib/fileset/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix
index 27a4d80f68ad..32bc00a227b3 100644
--- a/lib/fileset/default.nix
+++ b/lib/fileset/default.nix
@@ -1007,6 +1007,17 @@ in
           submodules = recurseSubmodules;
         };
 
+  /**
+    The empty fileset. It can be useful as a default value or as starting accumulator for a folding operation.
+
+    # Type
+
+    ```
+    empty :: FileSet
+    ```
+  */
+  empty = _emptyWithoutBase;
+
   /**
     Tests whether a given value is a fileset, or can be used in place of a fileset.
 

From 9c00c9af715093c34830a873ba499b0fb42551d5 Mon Sep 17 00:00:00 2001
From: Niols <niols@niols.fr>
Date: Thu, 10 Jul 2025 14:36:16 +0200
Subject: [PATCH 003/101] lib.types: add a `fileset` type

---
 lib/types.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/types.nix b/lib/types.nix
index 6b51f9254a00..1085c36cab01 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -66,6 +66,11 @@ let
     fixupOptionType
     mergeOptionDecls
     ;
+  inherit (lib.fileset)
+    isFileset
+    unions
+    empty
+    ;
 
   inAttrPosSuffix =
     v: name:
@@ -612,6 +617,15 @@ let
         };
       };
 
+      fileset = mkOptionType {
+        name = "fileset";
+        description = "fileset";
+        descriptionClass = "noun";
+        check = isFileset;
+        merge = loc: defs: unions (map (x: x.value) defs);
+        emptyValue.value = empty;
+      };
+
       # A package is a top-level store path (/nix/store/hash-name). This includes:
       # - derivations
       # - more generally, attribute sets with an `outPath` or `__toString` attribute

From ad1e615f486c9274437da2dbc0cc2f57d466bad4 Mon Sep 17 00:00:00 2001
From: Niols <niols@niols.fr>
Date: Mon, 28 Jul 2025 16:48:23 +0200
Subject: [PATCH 004/101] lib.types: add module tests for `fileset`

---
 lib/tests/modules.sh             | 11 +++++++
 lib/tests/modules/fileset.nix    | 50 ++++++++++++++++++++++++++++++++
 lib/tests/modules/fileset/keepme |  1 +
 3 files changed, 62 insertions(+)
 create mode 100644 lib/tests/modules/fileset.nix
 create mode 100644 lib/tests/modules/fileset/keepme

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index fbbccd8172f6..b388f7d8aefe 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -220,6 +220,17 @@ checkConfigError 'A definition for option .* is not of type .path in the Nix sto
 checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./types.nix
 checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./types.nix
 
+# types.fileset
+checkConfigOutput '^0$' config.filesetCardinal.ok1 ./fileset.nix
+checkConfigOutput '^1$' config.filesetCardinal.ok2 ./fileset.nix
+checkConfigOutput '^1$' config.filesetCardinal.ok3 ./fileset.nix
+checkConfigOutput '^1$' config.filesetCardinal.ok4 ./fileset.nix
+checkConfigOutput '^0$' config.filesetCardinal.ok5 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err1 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err2 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err3 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err4 ./fileset.nix
+
 # Check boolean option.
 checkConfigOutput '^false$' config.enable ./declare-enable.nix
 checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix
diff --git a/lib/tests/modules/fileset.nix b/lib/tests/modules/fileset.nix
new file mode 100644
index 000000000000..40b1a8ef601f
--- /dev/null
+++ b/lib/tests/modules/fileset.nix
@@ -0,0 +1,50 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib)
+    mkOption
+    mkIf
+    types
+    mapAttrs
+    length
+    ;
+  inherit (lib.fileset)
+    empty
+    unions
+    toList
+    ;
+in
+
+{
+  options = {
+    fileset = mkOption { type = with types; lazyAttrsOf fileset; };
+
+    ## The following option is only here as a proxy to test `fileset` that does
+    ## not work so well with `modules.sh` because it is not JSONable. It exposes
+    ## the number of elements in the fileset.
+    filesetCardinal = mkOption { default = mapAttrs (_: fs: length (toList fs)) config.fileset; };
+  };
+
+  config = {
+    fileset.ok1 = empty;
+    fileset.ok2 = ./fileset;
+    fileset.ok3 = unions [
+      empty
+      ./fileset
+    ];
+    # fileset.ok4: see imports below
+    fileset.ok5 = mkIf false ./fileset;
+
+    fileset.err1 = 1;
+    fileset.err2 = "foo";
+    fileset.err3 = "./.";
+    fileset.err4 = [ empty ];
+
+  };
+
+  imports = [
+    { fileset.ok4 = ./fileset; }
+    { fileset.ok4 = empty; }
+    { fileset.ok4 = ./fileset; }
+  ];
+}
diff --git a/lib/tests/modules/fileset/keepme b/lib/tests/modules/fileset/keepme
new file mode 100644
index 000000000000..27b2fabd2c27
--- /dev/null
+++ b/lib/tests/modules/fileset/keepme
@@ -0,0 +1 @@
+Do not remove. This file is used by the tests in `../fileset.nix`.

From 53d21a0a6e2091eaecc317f2d3f84f6c6ce0fb97 Mon Sep 17 00:00:00 2001
From: Samuel Meenzen <samuel@meenzen.net>
Date: Thu, 16 Oct 2025 01:01:00 +0200
Subject: [PATCH 005/101] boogie: fix build

---
 pkgs/by-name/bo/boogie/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix
index 960cbd64c5db..1e200709409c 100644
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@@ -15,7 +15,7 @@ buildDotnetModule rec {
     owner = "boogie-org";
     repo = "boogie";
     tag = "v${version}";
-    hash = "sha256-OuNzxzcoWrDCmUfQNXEif5wIY+L5jql14231m7nNBe4=";
+    hash = "sha256-tmcio1GCyfMhjnbBE/pUqYso5HCu4SLHOYx/t0/PZTQ=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;

From a8e88a1be440042dfcecfd7350b9ac714e095e0e Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 22 Oct 2025 08:41:27 +0800
Subject: [PATCH 006/101] buildDartApplication: add workspace-package-config.py

---
 .../hooks/dart-config-hook.sh                 |  3 ++
 .../build-dart-application/hooks/default.nix  |  1 +
 .../workspace-package-config.py               | 42 +++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/build-support/dart/build-dart-application/workspace-package-config.py

diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
index 56f20a4f63a3..80fef886e122 100644
--- a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
+++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
@@ -9,6 +9,9 @@ dartConfigHook() {
     echo "Installing dependencies"
     mkdir -p .dart_tool
     cp "$packageConfig" .dart_tool/package_config.json
+    chmod u+w .dart_tool/package_config.json
+    @python3@ @workspacePackageConfigScript@
+    chmod u-w .dart_tool/package_config.json
     @python3@ @packageGraphScript@ > .dart_tool/package_graph.json
 
     packagePath() {
diff --git a/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/pkgs/build-support/dart/build-dart-application/hooks/default.nix
index 64f1019f882f..a22db27f4d97 100644
--- a/pkgs/build-support/dart/build-dart-application/hooks/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix
@@ -14,6 +14,7 @@
     substitutions.jq = "${jq}/bin/jq";
     substitutions.python3 = lib.getExe (python3.withPackages (ps: with ps; [ pyyaml ]));
     substitutions.packageGraphScript = ../../pub2nix/package-graph.py;
+    substitutions.workspacePackageConfigScript = ../workspace-package-config.py;
   } ./dart-config-hook.sh;
   dartBuildHook = makeSetupHook {
     name = "dart-build-hook";
diff --git a/pkgs/build-support/dart/build-dart-application/workspace-package-config.py b/pkgs/build-support/dart/build-dart-application/workspace-package-config.py
new file mode 100644
index 000000000000..7d7d00988f9a
--- /dev/null
+++ b/pkgs/build-support/dart/build-dart-application/workspace-package-config.py
@@ -0,0 +1,42 @@
+import json
+import re
+from pathlib import Path
+
+import yaml
+
+
+def main() -> None:
+    with Path("pubspec.yaml").open("r", encoding="utf-8") as f:
+        pubspec = yaml.load(f, Loader=yaml.CSafeLoader)
+    if not pubspec.get("workspace"):
+        return
+    with Path(".dart_tool/package_config.json").open("r", encoding="utf-8") as f:
+        package_config = json.load(f)
+    for package_path in pubspec.get("workspace", []):
+        with (Path(package_path) / "pubspec.yaml").open("r", encoding="utf-8") as f:
+            package_pubspec = yaml.load(f, Loader=yaml.CSafeLoader)
+        m = re.match(
+            r"^[ \t]*(\^|>=|>)?[ \t]*([0-9]+\.[0-9]+)\.[0-9]+.*$",
+            package_pubspec.get("environment", {}).get("sdk", ""),
+        )
+        if m:
+            languageVersion = m.group(2)
+        elif package_pubspec.get("environment", {}).get("sdk") == "any":
+            languageVersion = "null"
+        else:
+            languageVersion = "2.7"
+        if not any(
+            pkg["name"] == package_pubspec["name"] for pkg in package_config["packages"]
+        ):
+            package_config["packages"].append({
+                "name": package_pubspec["name"],
+                "rootUri": Path(package_path).resolve().as_uri(),
+                "packageUri": "lib/",
+                "languageVersion": languageVersion,
+            })
+    with Path(".dart_tool/package_config.json").open("w", encoding="utf-8") as f:
+        json.dump(package_config, f, sort_keys=True, indent=4)
+
+
+if __name__ == "__main__":
+    main()

From a6eaeab5a2e38baf4b0053b0f0aba09f609c4d22 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 22 Oct 2025 08:42:01 +0800
Subject: [PATCH 007/101] melos: use workspace

---
 pkgs/by-name/me/melos/add-generic-main.patch | 4 ++--
 pkgs/by-name/me/melos/package.nix            | 8 +++-----
 pkgs/by-name/me/melos/pubspec.lock.json      | 9 ---------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch
index 434683968acd..a00de578ce6d 100644
--- a/pkgs/by-name/me/melos/add-generic-main.patch
+++ b/pkgs/by-name/me/melos/add-generic-main.patch
@@ -1,7 +1,7 @@
 diff --git a/bin/melos.dart b/bin/melos.dart
 index 0db7013..218276f 100644
---- a/bin/melos.dart
-+++ b/bin/melos.dart
+--- a/packages/melos/bin/melos.dart
++++ b/packages/melos/bin/melos.dart
 @@ -1,11 +1,37 @@
 +import 'dart:io';
  import 'package:cli_launcher/cli_launcher.dart';
diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix
index 9226e1b2eed5..791b674f1cda 100644
--- a/pkgs/by-name/me/melos/package.nix
+++ b/pkgs/by-name/me/melos/package.nix
@@ -16,8 +16,6 @@ buildDartApplication {
   pname = "melos";
   inherit version src;
 
-  sourceRoot = "${src.name}/packages/melos";
-
   patches = [
     # This patch (created a melos 6.1.0) modify the method melos use to find path to the root of the projects.
     # It is needed because when melos is in the nixstore, it break it and fail to find the projects root with melos.yaml
@@ -28,12 +26,12 @@ buildDartApplication {
 
   # hard code the path to the melos templates
   preBuild = ''
-    substituteInPlace lib/src/common/utils.dart \
+    substituteInPlace packages/melos/lib/src/common/utils.dart \
       --replace-fail "final melosPackageFileUri = await Isolate.resolvePackageUri(melosPackageUri);" "return \"$out\";"
-    substituteInPlace lib/src/common/utils.dart \
+    substituteInPlace packages/melos/lib/src/common/utils.dart \
       --replace-fail "return p.normalize('\''${melosPackageFileUri!.toFilePath()}/../..');" " "
     mkdir --parents $out
-    cp --recursive templates $out/
+    cp --recursive packages/melos/templates $out/
   '';
 
   meta = {
diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json
index e1905f3789ca..35aba4873f96 100644
--- a/pkgs/by-name/me/melos/pubspec.lock.json
+++ b/pkgs/by-name/me/melos/pubspec.lock.json
@@ -709,15 +709,6 @@
       },
       "source": "hosted",
       "version": "2.2.2"
-    },
-    "conventional_commit": {
-      "dependency": "direct main",
-      "description": {
-        "path": "../conventional_commit",
-        "relative": true
-      },
-      "source": "path",
-      "version": "0.6.1"
     }
   },
   "sdks": {

From b483a6f02120dd6e2c2bea3996b1d64feec5012a Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 22 Oct 2025 09:37:06 +0800
Subject: [PATCH 008/101] protoc-gen-dart: use workspace

---
 pkgs/by-name/pr/protoc-gen-dart/package.nix   | 30 +++++++-
 .../pr/protoc-gen-dart/pubspec.lock.json      | 72 +++++++++----------
 pkgs/by-name/pr/protoc-gen-dart/update.sh     | 34 ---------
 3 files changed, 63 insertions(+), 73 deletions(-)
 delete mode 100755 pkgs/by-name/pr/protoc-gen-dart/update.sh

diff --git a/pkgs/by-name/pr/protoc-gen-dart/package.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix
index 34538974106d..424a548c51a1 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-dart/package.nix
@@ -2,6 +2,11 @@
   lib,
   buildDartApplication,
   fetchFromGitHub,
+  _experimental-update-script-combinators,
+  gitUpdater,
+  writeShellScript,
+  dart,
+  yq-go,
 }:
 
 buildDartApplication rec {
@@ -15,11 +20,30 @@ buildDartApplication rec {
     hash = "sha256-8pSCYlbZLqHnpetM4luyfGo1qnWgKx93JPjRVWCOX0w=";
   };
 
-  sourceRoot = "${src.name}/protoc_plugin";
-
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  passthru.updateScript = ./update.sh;
+  preBuild = ''
+    pushd protoc_plugin
+  '';
+
+  postInstall = ''
+    popd
+  '';
+
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (gitUpdater { rev-prefix = "protoc_plugin-v"; } // { supportedFeatures = [ ]; })
+    (writeShellScript "update-protoc-gen-dart" ''
+      src=$(nix build --print-out-paths --no-link .#protoc-gen-dart.src)
+      export HOME=$(mktemp -d)
+      WORKDIR=$(mktemp -d)
+      cp --recursive --no-preserve=mode $src/* $WORKDIR
+      PACKAGE_DIR=$(dirname $(EDITOR=echo nix edit --file . protoc-gen-dart))
+      pushd $WORKDIR
+      ${lib.getExe dart} pub update
+      ${lib.getExe yq-go} eval --output-format=json --prettyPrint pubspec.lock > $PACKAGE_DIR/pubspec.lock.json
+      popd
+    '')
+  ];
 
   meta = {
     description = "Protobuf plugin for generating Dart code";
diff --git a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
index bca2b17e67a0..c9f46703e9ed 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
+++ b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
+        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "85.0.0"
+      "version": "91.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b1ade5707ab7a90dfd519eaac78a7184341d19adb6096c68d499b59c7c6cf880",
+        "sha256": "a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.0"
+      "version": "8.4.0"
     },
     "args": {
       "dependency": "transitive",
@@ -40,6 +40,16 @@
       "source": "hosted",
       "version": "2.13.0"
     },
+    "benchmark_harness": {
+      "dependency": "transitive",
+      "description": {
+        "name": "benchmark_harness",
+        "sha256": "83f65107165883ba8623eb822daacb23dcf9f795c66841de758c9dd7c5a0cf28",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.1"
+    },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
@@ -61,7 +71,7 @@
       "version": "0.2.0"
     },
     "collection": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "collection",
         "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
@@ -101,14 +111,14 @@
       "version": "3.0.6"
     },
     "dart_style": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
+        "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.1.2"
     },
     "file": {
       "dependency": "transitive",
@@ -121,7 +131,7 @@
       "version": "7.0.1"
     },
     "fixnum": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "fixnum",
         "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
@@ -184,14 +194,14 @@
       "dependency": "transitive",
       "description": {
         "name": "js",
-        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.6.7"
     },
     "lints": {
-      "dependency": "direct dev",
+      "dependency": "transitive",
       "description": {
         "name": "lints",
         "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
@@ -261,7 +271,7 @@
       "version": "2.2.0"
     },
     "path": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "path",
         "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
@@ -274,24 +284,14 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
-    },
-    "protobuf": {
-      "dependency": "direct main",
-      "description": {
-        "name": "protobuf",
-        "sha256": "6153efcc92a06910918f3db8231fd2cf828ac81e50ebd87adc8f8a8cb3caff0e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.1"
+      "version": "1.5.2"
     },
     "pub_semver": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "pub_semver",
         "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
@@ -411,34 +411,34 @@
       "version": "1.2.2"
     },
     "test": {
-      "dependency": "direct dev",
+      "dependency": "transitive",
       "description": {
         "name": "test",
-        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
+        "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.26.2"
+      "version": "1.26.3"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.6"
+      "version": "0.7.7"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
+        "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.11"
+      "version": "0.6.12"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -464,11 +464,11 @@
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
@@ -522,6 +522,6 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0-0 <4.0.0"
+    "dart": ">=3.9.0 <4.0.0"
   }
 }
diff --git a/pkgs/by-name/pr/protoc-gen-dart/update.sh b/pkgs/by-name/pr/protoc-gen-dart/update.sh
deleted file mode 100755
index 81ca066de57c..000000000000
--- a/pkgs/by-name/pr/protoc-gen-dart/update.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p yq ripgrep common-updater-scripts dart
-
-set -xeu -o pipefail
-
-PACKAGE_DIR="$(realpath "$(dirname "$0")")"
-cd "$PACKAGE_DIR/.."
-while ! test -f flake.nix; do cd ..; done
-NIXPKGS_DIR="$PWD"
-
-version="$(
-  list-git-tags --url=https://github.com/google/protobuf.dart |
-    rg '^protoc_plugin-v(.*)' -r '$1' |
-    sort --version-sort |
-    tail -n1
-)"
-
-cd "$NIXPKGS_DIR"
-update-source-version protoc-gen-dart "$version"
-
-TMPDIR="$(mktemp -d)"
-cd "$TMPDIR"
-
-src="$(nix-build --no-link "$NIXPKGS_DIR" -A protoc-gen-dart.src)/protoc_plugin"
-cp $src/pubspec.* .
-
-if ! test -f pubspec.lock; then
-  sed -i '/resolution: workspace/d' pubspec.yaml
-  dart pub update
-fi
-
-yq . pubspec.lock >"$PACKAGE_DIR/pubspec.lock.json"
-
-rm -rf "$TMPDIR"

From a590702ecd1ed37e78d4d2329a3e8f62d3270292 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 07:37:33 -0300
Subject: [PATCH 009/101] luastatus: fix build with cmake4

---
 pkgs/by-name/lu/luastatus/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix
index 4f28dbad3945..40fb644ff715 100644
--- a/pkgs/by-name/lu/luastatus/package.nix
+++ b/pkgs/by-name/lu/luastatus/package.nix
@@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
     docutils
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     wrapProgram $out/bin/luastatus-stdout-wrapper \
       --prefix LUASTATUS : $out/bin/luastatus

From 7bede7dd99b04ddfc02e94bf0c495253ae5be21d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 19:32:23 -0300
Subject: [PATCH 010/101] opl3bankeditor: fix build with cmake4

---
 pkgs/tools/audio/opl3bankeditor/common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix
index 8c0ce9eabfee..63af82790a03 100644
--- a/pkgs/tools/audio/opl3bankeditor/common.nix
+++ b/pkgs/tools/audio/opl3bankeditor/common.nix
@@ -55,6 +55,11 @@ mkDerivation rec {
     rtmidi
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/{bin,Applications}
     mv "${binname}.app" $out/Applications/

From 60ea37771541df0383159b5c6f59cdc14934b02d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 08:47:39 -0300
Subject: [PATCH 011/101] wdt: fix build with cmake4

---
 pkgs/by-name/wd/wdt/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix
index 42ff4f8d080d..b4cd2c1e59ef 100644
--- a/pkgs/by-name/wd/wdt/package.nix
+++ b/pkgs/by-name/wd/wdt/package.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation {
     };
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Warp speed Data Transfer";
     homepage = "https://github.com/facebook/wdt";

From 89420eeaa15c6b5cab9d4058166db6020fbbbe56 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 14:36:20 -0300
Subject: [PATCH 012/101] monosat: fix build with cmake4

---
 pkgs/by-name/mo/monosat/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/monosat/package.nix b/pkgs/by-name/mo/monosat/package.nix
index c5fbc9824ebe..02a828ceb247 100644
--- a/pkgs/by-name/mo/monosat/package.nix
+++ b/pkgs/by-name/mo/monosat/package.nix
@@ -47,7 +47,10 @@ let
   core = stdenv.mkDerivation {
     name = "${pname}-${version}";
     inherit src patches;
-    postPatch = commonPostPatch;
+    postPatch = commonPostPatch + ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.02)" "cmake_minimum_required(VERSION 3.10)"
+    '';
     nativeBuildInputs = [ cmake ];
     buildInputs = [
       zlib

From 7ac7b3e3a8b484f7312cf83e6dd17f951471425a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 19:48:29 +0000
Subject: [PATCH 013/101] fsautocomplete: 0.79.2 -> 0.80.1

---
 pkgs/by-name/fs/fsautocomplete/deps.json   | 28 +++++++++++-----------
 pkgs/by-name/fs/fsautocomplete/package.nix |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index a2725fb90ca0..af2f65f1f53d 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -61,8 +61,8 @@
   },
   {
     "pname": "fantomas",
-    "version": "7.0.1",
-    "hash": "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI="
+    "version": "7.0.3",
+    "hash": "sha256-0XlfV7SxXPDnk/CjkUesJSaH0cxlNHJ+Jj86zNUhkNA="
   },
   {
     "pname": "Fantomas.Client",
@@ -76,8 +76,8 @@
   },
   {
     "pname": "fsharp-analyzers",
-    "version": "0.32.1",
-    "hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
+    "version": "0.33.0",
+    "hash": "sha256-inPKPeLTaImrj4uiEy/vpru1cestNr/s/qgyRsgvwPc="
   },
   {
     "pname": "FSharp.Analyzers.Build",
@@ -86,8 +86,8 @@
   },
   {
     "pname": "FSharp.Analyzers.SDK",
-    "version": "0.32.1",
-    "hash": "sha256-JOqyzBUVMm1wx9g0YZmAZghj3/9f7nh9YenVt4mQI0M="
+    "version": "0.33.1",
+    "hash": "sha256-bx4DTUakeLlwbAUxZZpNK8E0sGa7B6UvN1rX6nFOZf0="
   },
   {
     "pname": "FSharp.Compiler.Service",
@@ -206,8 +206,8 @@
   },
   {
     "pname": "Ionide.Analyzers",
-    "version": "0.14.7",
-    "hash": "sha256-capdHUKfY3W8QYgg5Q6/dRggEF6w/yQ9rEKIh+VQLlc="
+    "version": "0.14.9",
+    "hash": "sha256-41vXbwlwWbM/iwbrqA+lhsxpMochokM9xsOsgKlKqXg="
   },
   {
     "pname": "Ionide.KeepAChangelog.Tasks",
@@ -221,18 +221,18 @@
   },
   {
     "pname": "Ionide.ProjInfo",
-    "version": "0.71.2",
-    "hash": "sha256-mQM7nVZL/rwFKlt+esfygistjilIDfySMnZmHS5IFv0="
+    "version": "0.72.0",
+    "hash": "sha256-zu9ssScreEgwFQb0YOgVfAFxTEoGLjsLiMbWIdf2zkg="
   },
   {
     "pname": "Ionide.ProjInfo.FCS",
-    "version": "0.71.2",
-    "hash": "sha256-TJCBJpv6OEsT/3enqjsW7JaSd0P+idlqJR5UR3jhaSI="
+    "version": "0.72.0",
+    "hash": "sha256-udtCva1gKPo6rJpsCCVI+DCY2ilUwSFQ9P9XCysNcto="
   },
   {
     "pname": "Ionide.ProjInfo.ProjectSystem",
-    "version": "0.71.2",
-    "hash": "sha256-Agja7VwF/MbOOieLVJWv42z+l6hWhVw1V0dNrVAJ0Ks="
+    "version": "0.72.0",
+    "hash": "sha256-ilUr29oAONpGm76Dc1ocSfu33p0Gyr9VhiNfMoxyKfI="
   },
   {
     "pname": "LinkDotNet.StringBuilder",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 0aad9b17f73c..faefd3877c28 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.79.2";
+  version = "0.80.1";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GJ2ld2RF7utrgHszgrG8RCWimPJ2Za+kZzQOOu/qUqA=";
+    hash = "sha256-ad589R2SXOvnXcNAEhwjOpITv5ptnIR7BUamFgTLF+k=";
   };
 
   nugetDeps = ./deps.json;

From abe4b2cb6b81879bacb84c4ad9e9a2315ca65efa Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Tue, 28 Oct 2025 00:06:31 +0100
Subject: [PATCH 014/101] matrix-commander: 8.0.4 -> 8.0.5

---
 .../instant-messengers/matrix-commander/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 2ed07af8eeb3..2c215062250f 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonApplication rec {
   pname = "matrix-commander";
-  version = "8.0.4";
+  version = "8.0.5";
 
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander";
     rev = "v${version}";
-    hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
+    hash = "sha256-eNgnjErPi5q9yA/2iEg3+CoN2xbopmFOpbgU/7GhoAQ=";
   };
 
   format = "pyproject";

From bc10e7b12f1955dd6d7368319b7f2a5871ac670d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 02:25:40 +0000
Subject: [PATCH 015/101] debian-devscripts: 2.25.21 -> 2.25.22

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

diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index a9ec8c5e9203..6f920a4dd69a 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.21";
+  version = "2.25.22";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "devscripts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5X3bhtUSCBUzIZ3EScppnK+VS2IxnmDwqt2BwQG4fMA=";
+    hash = "sha256-FiqM2n33tbzHgwZGZ2CaAvNTrAUgTuwMtNbXbn6EYJ4=";
   };
 
   patches = [

From 4a940eb14af40e824f541e6e71d5906172b26708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 1 Nov 2025 17:41:40 +0100
Subject: [PATCH 016/101] dia: unstable-2023-09-28 -> 0-unstable-2025-10-26

---
 pkgs/by-name/di/dia/package.nix | 99 ++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix
index 2f6671196bfe..296096a060c3 100644
--- a/pkgs/by-name/di/dia/package.nix
+++ b/pkgs/by-name/di/dia/package.nix
@@ -1,14 +1,16 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  appstream-glib,
+  appstream,
   dblatex,
   desktop-file-utils,
+  docbook-xsl-nons,
+  docbook_xml_dtd_45,
+  fetchFromGitLab,
+  gdk-pixbuf,
   graphene,
-  gtk3,
   gtk-mac-integration-gtk3,
-  intltool,
+  gtk3,
   libxml2,
   libxslt,
   meson,
@@ -17,62 +19,91 @@
   poppler,
   python3,
   wrapGAppsHook3,
-  # Building with docs are still failing in unstable-2023-09-28
-  withDocs ? false,
 }:
 
+let
+  xpm-pixbuf = stdenv.mkDerivation {
+    pname = "xpm-pixbuf";
+    version = "0-unstable-2024-05-24";
+
+    src = fetchFromGitLab {
+      domain = "gitlab.gnome.org";
+      owner = "ZanderBrown";
+      repo = "xpm-pixbuf";
+      rev = "d290a0c846687b22d2a8c5aaec83a6689f30e1c3";
+      hash = "sha256-LU6nKe7IIecF/3wwhlwR1hyABBvfwvujVW5zJJSzkqo=";
+    };
+
+    nativeBuildInputs = [
+      meson
+      ninja
+      pkg-config
+    ];
+
+    buildInputs = [ gdk-pixbuf ];
+
+    meta = {
+      license = lib.licenses.lgpl21;
+      homepage = "https://gitlab.gnome.org/ZanderBrown/xpm-pixbuf";
+    };
+  };
+in
 stdenv.mkDerivation {
   pname = "dia";
-  version = "unstable-2023-09-28";
+  version = "unstable-2025-10-26";
 
   src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "dia";
-    domain = "gitlab.gnome.org";
-    rev = "bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322";
-    hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q=";
+    rev = "efdf829e8afdbbeb371820932769e35415ebe886";
+    hash = "sha256-VFFU5iJnVJdZ2tkNszZ2ooBD+GiCL6MqanzpEWIJerk=";
   };
 
-  # Required for the PDF plugin
-  CXXFLAGS = "-std=c++20";
-
-  preConfigure = ''
-    patchShebangs .
+  postPatch = ''
+    # Fix build with poppler 25.10.0
+    substituteInPlace plug-ins/pdf/pdf-import.cpp \
+      --replace-fail 's->getLength();' 's->size();'
   '';
 
+  strictDeps = true;
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    appstream
+    dblatex
+    dblatex.tex
+    desktop-file-utils
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    libxml2 # xmllint
+    libxslt
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
+
   buildInputs = [
     graphene
     gtk3
-    (libxml2.override { zlibSupport = true; })
+    libxml2
+    libxslt
     python3
     poppler
-  ]
-  ++ lib.optionals withDocs [
-    libxslt
+    xpm-pixbuf
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     gtk-mac-integration-gtk3
   ];
 
-  nativeBuildInputs = [
-    appstream-glib
-    desktop-file-utils
-    intltool
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook3
-  ]
-  ++ lib.optionals withDocs [
-    dblatex
-  ];
-
   meta = with lib; {
     description = "Gnome Diagram drawing software";
     mainProgram = "dia";
-    homepage = "http://live.gnome.org/Dia";
+    homepage = "https://wiki.gnome.org/Apps/Dia";
     maintainers = with maintainers; [ raskin ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
 }

From 37f37f59b59d38a9ad8044f8074edd1ac9785e85 Mon Sep 17 00:00:00 2001
From: Reuben Ferabend <63928521+railwhale@users.noreply.github.com>
Date: Wed, 29 Oct 2025 23:08:11 +1300
Subject: [PATCH 017/101] nixos/facter: fix conflict with `readOnlyPkgs`

---
 nixos/modules/hardware/facter/system.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/hardware/facter/system.nix b/nixos/modules/hardware/facter/system.nix
index 02e329f8e162..ef51b0e44f1d 100644
--- a/nixos/modules/hardware/facter/system.nix
+++ b/nixos/modules/hardware/facter/system.nix
@@ -5,11 +5,11 @@
   ...
 }:
 {
-  # Skip setting hostPlatform in test VMs where it's read-only
-  # Tests have virtualisation.test options and import read-only.nix
-  config.nixpkgs = lib.optionalAttrs (!(options ? virtualisation.test)) {
-    hostPlatform = lib.mkIf (
-      config.hardware.facter.report.system or null != null && !options.nixpkgs.pkgs.isDefined
-    ) (lib.mkDefault config.hardware.facter.report.system);
-  };
+  # Skip setting hostPlatform if it's read-only
+  nixpkgs =
+    lib.optionalAttrs
+      (config.hardware.facter.report.system or null != null && !options.nixpkgs.hostPlatform.readOnly)
+      {
+        hostPlatform = lib.mkDefault config.hardware.facter.report.system;
+      };
 }

From 55b946d737964789380587175d14dea658ecdaee Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 1 Nov 2025 16:51:10 -0400
Subject: [PATCH 018/101] nodePackages.create-cycle-app: drop

unmaintained and throws errors.
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 466 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 5 files changed, 2 insertions(+), 469 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 26007a2ff79c..2db1f0c61a26 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -93,6 +93,7 @@ mapAliases {
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   copy-webpack-plugin = throw "copy-webpack-plugin was removed because it is a JS library, so your project should lock it with a JS package manager instead."; # Added 2024-12-16
   inherit (pkgs) cordova; # added 2023-08-18
+  create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
   create-react-native-app = throw "create-react-native-app was removed because it was deprecated. Upstream suggests using a framework for React Native."; # added 2024-12-08
   inherit (pkgs) cspell;
   dat = throw "dat was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index d52b3f54164c..636c48917790 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -58,7 +58,6 @@
 , "code-theme-converter"
 , "conventional-changelog-cli"
 , "cpy-cli"
-, "create-cycle-app"
 , "csslint"
 , "dhcp"
 , "diff2html-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 68a3997d4b52..68919b112fb7 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2064,60 +2064,6 @@ let
         sha512 = "UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==";
       };
     };
-    "@cycle/dom-18.3.0" = {
-      name = "_at_cycle_slash_dom";
-      packageName = "@cycle/dom";
-      version = "18.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/dom/-/dom-18.3.0.tgz";
-        sha512 = "f0/+Hk/fCiODGlCDIcs3O5Gv4AZ8vehs/BbL8EnYB07M/H3sECxox2iYeC/1yVhiUY6kTxyF5ms5bpzJHi8jEQ==";
-      };
-    };
-    "@cycle/http-14.10.0" = {
-      name = "_at_cycle_slash_http";
-      packageName = "@cycle/http";
-      version = "14.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/http/-/http-14.10.0.tgz";
-        sha512 = "FhGyDGraqIUpsBSiqgv6FJNaEJ2MVg/8oJ5obgwQgdrheSIiviXYSq+NQ6PtHfuThes/Z16aY/LrvsqLF5hJMw==";
-      };
-    };
-    "@cycle/isolate-3.4.0" = {
-      name = "_at_cycle_slash_isolate";
-      packageName = "@cycle/isolate";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.4.0.tgz";
-        sha512 = "mOAlwLeTr6wTdHwKWAfaFeuKeD540kKcJlLVKsqLhbfLp6orF1B3CzMfFNlmqNY30t6o6TORCFfV+0EATK9Y7Q==";
-      };
-    };
-    "@cycle/run-3.4.0" = {
-      name = "_at_cycle_slash_run";
-      packageName = "@cycle/run";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz";
-        sha512 = "YUZyPu0nC4YDC31mLH5PGxbMoPEH5dNEV+nmgt34GgGgJ0ykDd4PrY7/ph5MAEpQE6rOfov0VN44qQRs6beQow==";
-      };
-    };
-    "@cycle/run-4.4.0" = {
-      name = "_at_cycle_slash_run";
-      packageName = "@cycle/run";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/run/-/run-4.4.0.tgz";
-        sha512 = "vVxnTqKKlgasE+we9X2z3og8z5KouO2RMiIgHWkVek+NomsdaeZwfvbutqzm3VToEImaz0DE2Iln9AxtCOVjpQ==";
-      };
-    };
-    "@cycle/time-0.10.1" = {
-      name = "_at_cycle_slash_time";
-      packageName = "@cycle/time";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/time/-/time-0.10.1.tgz";
-        sha512 = "BGzQLeZGA1PtwEkbwgItUEOEgE7kDZL151DuqMRaH172dY4NIMpFoLc6OghiGdtNBJGVkbfJ/UTKiM0iRsApIg==";
-      };
-    };
     "@dabh/diagnostics-2.0.3" = {
       name = "_at_dabh_slash_diagnostics";
       packageName = "@dabh/diagnostics";
@@ -5873,15 +5819,6 @@ let
         sha512 = "7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ==";
       };
     };
-    "@types/cookiejar-2.1.5" = {
-      name = "_at_types_slash_cookiejar";
-      packageName = "@types/cookiejar";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz";
-        sha512 = "he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==";
-      };
-    };
     "@types/cors-2.8.17" = {
       name = "_at_types_slash_cors";
       packageName = "@types/cors";
@@ -6368,15 +6305,6 @@ let
         sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==";
       };
     };
-    "@types/superagent-3.8.2" = {
-      name = "_at_types_slash_superagent";
-      packageName = "@types/superagent";
-      version = "3.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/superagent/-/superagent-3.8.2.tgz";
-        sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA==";
-      };
-    };
     "@types/supports-color-8.1.3" = {
       name = "_at_types_slash_supports-color";
       packageName = "@types/supports-color";
@@ -12408,15 +12336,6 @@ let
         sha512 = "Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==";
       };
     };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==";
-      };
-    };
     "cross-spawn-6.0.6" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
@@ -12534,15 +12453,6 @@ let
         sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
       };
     };
-    "cssauron-1.4.0" = {
-      name = "cssauron";
-      packageName = "cssauron";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz";
-        sha512 = "Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==";
-      };
-    };
     "cssesc-3.0.0" = {
       name = "cssesc";
       packageName = "cssesc";
@@ -12669,15 +12579,6 @@ let
         sha512 = "TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA==";
       };
     };
-    "cycle-onionify-4.0.0" = {
-      name = "cycle-onionify";
-      packageName = "cycle-onionify";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cycle-onionify/-/cycle-onionify-4.0.0.tgz";
-        sha512 = "DJxoCbxU8lNxtTUx/q6Xzb+uTVn+MZcq8FgbFzMQlEQyH9+C1HmAPliBjmtHx40BRVE9wIqV7lGR681u2s1sHQ==";
-      };
-    };
     "cyclist-0.1.1" = {
       name = "cyclist";
       packageName = "cyclist";
@@ -13038,15 +12939,6 @@ let
         sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
-    "debug-3.2.7" = {
-      name = "debug";
-      packageName = "debug";
-      version = "3.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
-      };
-    };
     "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
@@ -16764,15 +16656,6 @@ let
         sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
       };
     };
-    "form-data-2.5.3" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.5.3.tgz";
-        sha512 = "XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==";
-      };
-    };
     "form-data-4.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -17790,15 +17673,6 @@ let
         sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
       };
     };
-    "globalthis-1.0.4" = {
-      name = "globalthis";
-      packageName = "globalthis";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz";
-        sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==";
-      };
-    };
     "globby-11.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -19599,15 +19473,6 @@ let
         sha512 = "p9+jcDKhFHKTunvpffCk7I9eKt8+NPNWO8hMSSoLPv5vahP5Vhr78qWzDtA+6FBWQtFTuLFUWmxTyhC6G2Xz/Q==";
       };
     };
-    "inquirer-3.3.0" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz";
-        sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==";
-      };
-    };
     "inquirer-5.2.0" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -23577,15 +23442,6 @@ let
         sha512 = "WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==";
       };
     };
-    "lru-cache-4.1.5" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
-      };
-    };
     "lru-cache-5.1.1" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -29609,15 +29465,6 @@ let
         sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==";
       };
     };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
-      };
-    };
     "psl-1.15.0" = {
       name = "psl";
       packageName = "psl";
@@ -29879,15 +29726,6 @@ let
         sha512 = "AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==";
       };
     };
-    "quicktask-1.1.0" = {
-      name = "quicktask";
-      packageName = "quicktask";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/quicktask/-/quicktask-1.1.0.tgz";
-        sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g==";
-      };
-    };
     "quotation-2.0.3" = {
       name = "quotation";
       packageName = "quotation";
@@ -29897,15 +29735,6 @@ let
         sha512 = "yEc24TEgCFLXx7D4JHJJkK4JFVtatO8fziwUxY4nB/Jbea9o9CVS3gt22mA0W7rPYAGW2fWzYDSOtD94PwOyqA==";
       };
     };
-    "raf-3.3.2" = {
-      name = "raf";
-      packageName = "raf";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raf/-/raf-3.3.2.tgz";
-        sha512 = "1s5BQAy643nfjtnZZrH8V2fhj3snKrKkwp8cDaf2KfjW4/auwB+qffSEsvs1/iOuKiOr5vK7R0HQ0dQ1zituiQ==";
-      };
-    };
     "ramda-0.27.2" = {
       name = "ramda";
       packageName = "ramda";
@@ -32039,24 +31868,6 @@ let
         sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==";
       };
     };
-    "rx-lite-4.0.8" = {
-      name = "rx-lite";
-      packageName = "rx-lite";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz";
-        sha512 = "Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==";
-      };
-    };
-    "rx-lite-aggregates-4.0.8" = {
-      name = "rx-lite-aggregates";
-      packageName = "rx-lite-aggregates";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz";
-        sha512 = "3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==";
-      };
-    };
     "rxjs-5.5.12" = {
       name = "rxjs";
       packageName = "rxjs";
@@ -33137,24 +32948,6 @@ let
         sha512 = "c3iQfVBeHIqsPW2vD7x3UcYuCl7QDNtQm+HLV3jB434hoi2A/jOOPqi1nLSuWQKX51v4j9+aMA0VN8LIOObTNw==";
       };
     };
-    "snabbdom-0.7.0" = {
-      name = "snabbdom";
-      packageName = "snabbdom";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snabbdom/-/snabbdom-0.7.0.tgz";
-        sha512 = "LCg6lH9p2OD5n52SI4LlpYmDW2bscxsyN7rhnGJB/R3LQy/FdJfqNBM5aVST+zOfM4OdKFl8pxVUhjGsPtQA1w==";
-      };
-    };
-    "snabbdom-selector-1.2.1" = {
-      name = "snabbdom-selector";
-      packageName = "snabbdom-selector";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snabbdom-selector/-/snabbdom-selector-1.2.1.tgz";
-        sha512 = "g0w2Ft4RJl+F/1/tQvA4BUsH09s+RNd0RRa+So24Inv5yzce5xUnPzxlEWNUBG5TwQjfKDZSFWrf2rXz+e1Q2g==";
-      };
-    };
     "snake-case-3.0.4" = {
       name = "snake-case";
       packageName = "snake-case";
@@ -33380,15 +33173,6 @@ let
         sha512 = "2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==";
       };
     };
-    "sorted-immutable-list-1.1.0" = {
-      name = "sorted-immutable-list";
-      packageName = "sorted-immutable-list";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-immutable-list/-/sorted-immutable-list-1.1.0.tgz";
-        sha512 = "TJBqEU5iFISlA9lfaGKK44sDo7FTLqKvGOIQh8PN/JO1uJQOL3PeAitec2sNTzVe4FiLbBpa3XNlMrd+HglkjA==";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -34577,15 +34361,6 @@ let
         sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==";
       };
     };
-    "superagent-3.8.3" = {
-      name = "superagent";
-      packageName = "superagent";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
-        sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==";
-      };
-    };
     "superagent-7.1.6" = {
       name = "superagent";
       packageName = "superagent";
@@ -34721,15 +34496,6 @@ let
         sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==";
       };
     };
-    "symbol-observable-2.0.3" = {
-      name = "symbol-observable";
-      packageName = "symbol-observable";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz";
-        sha512 = "sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==";
-      };
-    };
     "symbol-observable-4.0.0" = {
       name = "symbol-observable";
       packageName = "symbol-observable";
@@ -37349,15 +37115,6 @@ let
         sha512 = "aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==";
       };
     };
-    "variable-diff-1.1.0" = {
-      name = "variable-diff";
-      packageName = "variable-diff";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/variable-diff/-/variable-diff-1.1.0.tgz";
-        sha512 = "0Jk/MsCNtL/fCuVIbsLxwXpABGZCzN57btcPbSsjOOAwkdHJ3Y58fo8BoUfG7jghnvglbwo+5Hk1KOJ2W2Ormw==";
-      };
-    };
     "vary-1.1.2" = {
       name = "vary";
       packageName = "vary";
@@ -39023,15 +38780,6 @@ let
         sha512 = "SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw==";
       };
     };
-    "xstream-11.14.0" = {
-      name = "xstream";
-      packageName = "xstream";
-      version = "11.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz";
-        sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==";
-      };
-    };
     "xtend-2.1.2" = {
       name = "xtend";
       packageName = "xtend";
@@ -39077,15 +38825,6 @@ let
         sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==";
       };
     };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==";
-      };
-    };
     "yallist-3.1.1" = {
       name = "yallist";
       packageName = "yallist";
@@ -45277,211 +45016,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  create-cycle-app = nodeEnv.buildNodePackage {
-    name = "create-cycle-app";
-    packageName = "create-cycle-app";
-    version = "5.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-5.0.0.tgz";
-      sha512 = "Ic10lxNqRXWtO9CUbvsWcOWEigWuGApKEiRo0DNybhrsCuUQBeGhxfdVRYb3TD+keK+2LVCBFCdVbWb4UqqcdA==";
-    };
-    dependencies = [
-      sources."@cycle/dom-18.3.0"
-      sources."@cycle/http-14.10.0"
-      (
-        sources."@cycle/isolate-3.4.0"
-        // {
-          dependencies = [
-            sources."@cycle/run-4.4.0"
-          ];
-        }
-      )
-      sources."@cycle/run-3.4.0"
-      sources."@cycle/time-0.10.1"
-      sources."@types/cookiejar-2.1.5"
-      sources."@types/node-22.13.10"
-      sources."@types/superagent-3.8.2"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."asynckit-0.4.0"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      (
-        sources."chalk-2.4.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."supports-color-5.5.0"
-          ];
-        }
-      )
-      sources."chardet-0.4.2"
-      sources."cli-cursor-2.1.0"
-      sources."cli-width-2.2.1"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."combine-errors-3.0.3"
-      sources."combined-stream-1.0.8"
-      sources."component-emitter-1.3.1"
-      sources."cookiejar-2.1.4"
-      sources."core-util-is-1.0.3"
-      sources."cross-spawn-5.1.0"
-      sources."cssauron-1.4.0"
-      sources."custom-error-instance-2.1.1"
-      sources."cycle-onionify-4.0.0"
-      sources."d-1.0.2"
-      sources."debug-3.2.7"
-      sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
-      sources."delayed-stream-1.0.0"
-      sources."dunder-proto-1.0.1"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."es5-ext-0.10.64"
-      sources."es6-iterator-2.0.3"
-      sources."es6-map-0.1.5"
-      sources."es6-set-0.1.6"
-      sources."es6-symbol-3.1.4"
-      sources."escape-string-regexp-1.0.5"
-      sources."esniff-2.0.1"
-      sources."event-emitter-0.3.5"
-      sources."ext-1.7.0"
-      sources."extend-3.0.2"
-      sources."external-editor-2.2.0"
-      sources."figures-2.0.0"
-      sources."form-data-2.5.3"
-      sources."formidable-1.2.6"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."globalthis-1.0.4"
-      sources."gopd-1.2.0"
-      sources."has-ansi-2.0.0"
-      sources."has-flag-3.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."iconv-lite-0.4.24"
-      sources."inherits-2.0.4"
-      (
-        sources."inquirer-3.3.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash._baseiteratee-4.7.0"
-      sources."lodash._basetostring-4.12.0"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."lodash._stringtopath-4.8.0"
-      sources."lodash.uniqby-4.5.0"
-      sources."lru-cache-4.1.5"
-      sources."math-intrinsics-1.1.0"
-      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-1.2.0"
-      sources."minimist-1.2.8"
-      sources."ms-2.1.3"
-      sources."mute-stream-0.0.7"
-      sources."next-tick-1.1.0"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."object-keys-1.1.1"
-      sources."onetime-2.0.1"
-      sources."os-tmpdir-1.0.2"
-      sources."performance-now-2.1.0"
-      sources."process-nextick-args-2.0.1"
-      sources."pseudomap-1.0.2"
-      sources."qs-6.14.0"
-      sources."quicktask-1.1.0"
-      sources."raf-3.3.2"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."restore-cursor-2.0.0"
-      sources."run-async-2.4.1"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."setimmediate-1.0.5"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."snabbdom-0.7.0"
-      sources."snabbdom-selector-1.2.1"
-      sources."sorted-immutable-list-1.1.0"
-      (
-        sources."string-width-2.1.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."strip-ansi-3.0.1"
-      sources."superagent-3.8.3"
-      sources."supports-color-2.0.0"
-      sources."symbol-observable-2.0.3"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."type-2.7.3"
-      sources."undici-types-6.20.0"
-      sources."util-deprecate-1.0.2"
-      (
-        sources."variable-diff-1.1.0"
-        // {
-          dependencies = [
-            sources."chalk-1.1.3"
-          ];
-        }
-      )
-      sources."which-1.3.1"
-      sources."xstream-11.14.0"
-      sources."yallist-2.1.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Create Cycle.js with no build configuration";
-      homepage = "https://github.com/cyclejs-community/create-cycle-app#readme";
-      license = "ISC";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 843dfc5fb3d7..77c358aefd4b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -448,6 +448,7 @@ mapAliases {
   cosmic-tasks = throw "'cosmic-tasks' has been renamed to/replaced by 'tasks'"; # Converted to throw 2025-10-27
   cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26
   cpp-ipfs-api = throw "'cpp-ipfs-api' has been renamed to/replaced by 'cpp-ipfs-http-client'"; # Converted to throw 2025-10-27
+  create-cycle-app = throw "'create-cycle-app' has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
   crispyDoom = throw "'crispyDoom' has been renamed to/replaced by 'crispy-doom'"; # Converted to throw 2025-10-27
   critcl = throw "'critcl' has been renamed to/replaced by 'tclPackages.critcl'"; # Converted to throw 2025-10-27
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8fd9d837a60..2005703e9a1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2512,8 +2512,6 @@ with pkgs;
     singleBinary = false;
   };
 
-  create-cycle-app = nodePackages.create-cycle-app;
-
   cron = isc-cron;
 
   # Top-level fix-point used in `cudaPackages`' internals

From 93b0edf10f18bdcdac96e00919e171ecd8743f47 Mon Sep 17 00:00:00 2001
From: Greaka <git@greaka.de>
Date: Sun, 2 Nov 2025 19:49:26 +0100
Subject: [PATCH 019/101] factorio: 2.0.69 -> 2.0.72

---
 pkgs/by-name/fa/factorio/versions.json | 74 +++++++++++++-------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 5f8e931e9abc..1702d1eb7f2a 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,38 +3,38 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.69.tar.xz"
+          "factorio_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.69.tar.xz",
+        "name": "factorio_alpha_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
+        "sha256": "87d9f593569cbdf2f7a160f6a573f4939cbf01206209fbcdbaebf0385c2c7331",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/alpha/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.69.tar.xz"
+          "factorio_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.69.tar.xz",
+        "name": "factorio_alpha_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
+        "sha256": "87d9f593569cbdf2f7a160f6a573f4939cbf01206209fbcdbaebf0385c2c7331",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/alpha/linux64",
+        "version": "2.0.72"
       }
     },
     "demo": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-demo_linux_2.0.69.tar.xz"
+          "factorio-demo_linux_2.0.70.tar.xz"
         ],
-        "name": "factorio_demo_x64-2.0.69.tar.xz",
+        "name": "factorio_demo_x64-2.0.70.tar.xz",
         "needsAuth": false,
-        "sha256": "a670a4cd2fa59cb8dc6db10d969867266080f171e47ebed78880ccd5ed42356c",
+        "sha256": "3be56bbfde644a3a97ab925a1fc2a32f9620e595fa14700bdcfbb127bc528bc8",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/demo/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.70/demo/linux64",
+        "version": "2.0.70"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -51,51 +51,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.69.tar.xz"
+          "factorio-space-age_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.69.tar.xz",
+        "name": "factorio_expansion_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
+        "sha256": "9a667dd899ad4c8c410739a1da3a9318b46a5f34ee190e8b75ec22beac708249",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/expansion/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.69.tar.xz"
+          "factorio-space-age_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.69.tar.xz",
+        "name": "factorio_expansion_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
+        "sha256": "9a667dd899ad4c8c410739a1da3a9318b46a5f34ee190e8b75ec22beac708249",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/expansion/linux64",
+        "version": "2.0.72"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.69.tar.xz",
-          "factorio_headless_x64_2.0.69.tar.xz"
+          "factorio-headless_linux_2.0.72.tar.xz",
+          "factorio_headless_x64_2.0.72.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.69.tar.xz",
+        "name": "factorio_headless_x64-2.0.72.tar.xz",
         "needsAuth": false,
-        "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
+        "sha256": "cf3057340dbc9d82bd5161949ae3e7b8fad912ec7ca07b8a3151e0424a5568cd",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/headless/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.69.tar.xz",
-          "factorio_headless_x64_2.0.69.tar.xz"
+          "factorio-headless_linux_2.0.72.tar.xz",
+          "factorio_headless_x64_2.0.72.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.69.tar.xz",
+        "name": "factorio_headless_x64-2.0.72.tar.xz",
         "needsAuth": false,
-        "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
+        "sha256": "cf3057340dbc9d82bd5161949ae3e7b8fad912ec7ca07b8a3151e0424a5568cd",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/headless/linux64",
+        "version": "2.0.72"
       }
     }
   }

From c4cafe7a3808e1fb29fbb8dfb30945211a511f3a Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:10:53 +0100
Subject: [PATCH 020/101] csdr: fix build with cmake 4

---
 pkgs/by-name/cs/csdr/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index a5c5d6a7ea5d..a3773541426a 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # function is not defined in any headers but used in libcsdr.c
     echo "int errhead();" >> src/predefined.h
+
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From 02506d0ca369b39c02adfd0c592c75924c14d6e0 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:39:59 +0100
Subject: [PATCH 021/101] csdr: add version check

---
 pkgs/by-name/cs/csdr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index a3773541426a..12c8453819b5 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   fftwFloat,
   libsamplerate,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -46,6 +47,10 @@ stdenv.mkDerivation rec {
       --replace '=''${exec_prefix}//' '=/'
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
   meta = with lib; {
     homepage = "https://github.com/jketterl/csdr";
     description = "Simple DSP library and command-line tool for Software Defined Radio";

From adca6f14cf626df43c68cbcf6d7c28feb3b9ef30 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:40:24 +0100
Subject: [PATCH 022/101] digiham: fix build with cmake 4

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

diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix
index e373f97e082e..889b19698e2b 100644
--- a/pkgs/by-name/di/digiham/package.nix
+++ b/pkgs/by-name/di/digiham/package.nix
@@ -26,6 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
     ./cpp-17.patch
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
   ];

From 71ceecf997f7547d134e8cbf44bd78014666afa3 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:40:53 +0100
Subject: [PATCH 023/101] openwebrx: fix build with cmake 4

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

diff --git a/pkgs/by-name/op/openwebrx/package.nix b/pkgs/by-name/op/openwebrx/package.nix
index 000f783f70bc..2e3a61b205e7 100644
--- a/pkgs/by-name/op/openwebrx/package.nix
+++ b/pkgs/by-name/op/openwebrx/package.nix
@@ -54,6 +54,12 @@ let
       hash = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc=";
     };
 
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace-fail \
+        "cmake_minimum_required (VERSION 3.0)" \
+        "cmake_minimum_required (VERSION 3.10)"
+    '';
+
     nativeBuildInputs = [
       cmake
       pkg-config

From 38fff9c03943a891b2d993557adc49f1c7cc6ff0 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 2 Nov 2025 13:33:56 -0800
Subject: [PATCH 024/101] gradle: pass through wrapper override arguments to
 unwrapped Gradle

Comments on #436358 and #402297 indicated a desire to have a more
controllable Gradle wrapper derivation. We were previously hiding the
Gradle being wrapped in the closure of wrapGradle, forcing us to expose
wrapGradle and use makeOverridable. Simply use callPackage to make it
easier for consumers to override things without us needing to expose gradleGen.
---
 .../tools/build-managers/gradle/default.nix   | 143 +++++++++---------
 1 file changed, 72 insertions(+), 71 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index e2ef742c7217..fe426f145f7f 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -16,79 +16,76 @@ let
       symlinkJoin,
       concatTextFile,
       makeSetupHook,
-
+      gradle-unwrapped,
       runCommand,
-    }:
-    this-gradle-unwrapped:
-    lib.makeOverridable (
-      args:
-      let
-        gradle = this-gradle-unwrapped.override args;
-      in
-      symlinkJoin {
-        pname = "gradle";
-        inherit (gradle) version;
+      ...
+    }@args:
+    let
+      gradle = gradle-unwrapped.override args;
+    in
+    symlinkJoin {
+      pname = "gradle";
+      inherit (gradle) version;
 
-        paths = [
-          (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
-            name = "setup-hook.sh";
-            files = [
-              (mitm-cache.setupHook)
-              (replaceVars ./setup-hook.sh {
-                # jdk used for keytool
-                inherit (gradle) jdk;
-                init_script = "${./init-build.gradle}";
-              })
-            ];
-          }))
-          gradle
-          mitm-cache
-        ];
+      paths = [
+        (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
+          name = "setup-hook.sh";
+          files = [
+            (mitm-cache.setupHook)
+            (replaceVars ./setup-hook.sh {
+              # jdk used for keytool
+              inherit (gradle) jdk;
+              init_script = "${./init-build.gradle}";
+            })
+          ];
+        }))
+        gradle
+        mitm-cache
+      ];
 
-        passthru = {
-          fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
-          inherit (gradle) jdk;
-          unwrapped = gradle;
-          tests = {
-            toolchains =
-              let
-                javaVersion = lib.getVersion jdk11;
-                javaMajorVersion = lib.versions.major javaVersion;
-              in
-              runCommand "detects-toolchains-from-nix-env"
-                {
-                  # Use JDKs that are not the default for any of the gradle versions
-                  nativeBuildInputs = [
-                    (gradle.override {
-                      javaToolchains = [
-                        jdk11
-                      ];
-                    })
-                  ];
-                  src = ./tests/toolchains;
-                }
-                ''
-                  cp -a $src/* .
-                  substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
-                  env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
-                  gradle run --no-daemon --quiet --console plain > $out
-                  actual="$(<$out)"
-                  if [[ "${javaVersion}" != "$actual"* ]]; then
-                    echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
-                    exit 1
-                  fi
-                '';
-          }
-          // gradle.tests;
-        };
+      passthru = {
+        fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
+        inherit (gradle) jdk;
+        unwrapped = gradle;
+        tests = {
+          toolchains =
+            let
+              javaVersion = lib.getVersion jdk11;
+              javaMajorVersion = lib.versions.major javaVersion;
+            in
+            runCommand "detects-toolchains-from-nix-env"
+              {
+                # Use JDKs that are not the default for any of the gradle versions
+                nativeBuildInputs = [
+                  (gradle.override {
+                    javaToolchains = [
+                      jdk11
+                    ];
+                  })
+                ];
+                src = ./tests/toolchains;
+              }
+              ''
+                cp -a $src/* .
+                substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
+                env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
+                gradle run --no-daemon --quiet --console plain > $out
+                actual="$(<$out)"
+                if [[ "${javaVersion}" != "$actual"* ]]; then
+                  echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
+                  exit 1
+                fi
+              '';
+        }
+        // gradle.tests;
+      };
 
-        meta = gradle.meta // {
-          # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
-          # and passthru
-          priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
-        };
-      }
-    ) { };
+      meta = gradle.meta // {
+        # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
+        # and passthru
+        priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
+      };
+    };
 
   gen =
     {
@@ -146,8 +143,10 @@ let
       # Additional JDK/JREs to be registered as toolchains.
       # See https://docs.gradle.org/current/userguide/toolchains.html
       javaToolchains ? [ ],
-    }:
 
+      # Ignored arguments from calling .override on the wrapper.
+      ...
+    }:
     stdenv.mkDerivation (finalAttrs: {
       pname = "gradle";
       inherit version;
@@ -275,7 +274,9 @@ let
         };
       };
       passthru.jdk = defaultJava;
-      passthru.wrapped = callPackage wrapGradle { } (gen' genArgs);
+      passthru.wrapped = callPackage wrapGradle {
+        gradle-unwrapped = gen' genArgs;
+      };
       passthru.updateScript =
         if enableUpdateScript then
           nix-update-script {

From 32eb09cad7cc48a14a73316422a974d6ac384449 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:47:51 +0100
Subject: [PATCH 025/101] openwebrx: add version checks

---
 pkgs/by-name/op/openwebrx/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/op/openwebrx/package.nix b/pkgs/by-name/op/openwebrx/package.nix
index 2e3a61b205e7..4707d53e4e27 100644
--- a/pkgs/by-name/op/openwebrx/package.nix
+++ b/pkgs/by-name/op/openwebrx/package.nix
@@ -14,6 +14,7 @@
   sox,
   wsjtx,
   codecserver,
+  versionCheckHook,
 }:
 
 let
@@ -73,6 +74,10 @@ let
       soapysdr-with-plugins
     ];
 
+    nativeInstallCheckInputs = [ versionCheckHook ];
+    versionCheckProgram = "${placeholder "out"}/bin/rtl_connector";
+    doInstallCheck = true;
+
     meta = {
       homepage = "https://github.com/jketterl/owrx_connector";
       description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware";
@@ -119,6 +124,9 @@ python3Packages.buildPythonApplication rec {
     "test"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
     inherit js8py owrx_connector;
   };

From 2788f37f6476561100ce33b76c771a8540855f52 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 2 Nov 2025 15:03:21 -0800
Subject: [PATCH 026/101] gradle: expose gradle-packages.mkGradle and
 gradle-packages.wrapGradle

Users may want to use a completely custom version of Gradle. Add
mkGradle and wrapGradle as non-toplevel APIs for this.
---
 .../tools/build-managers/gradle/default.nix    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index fe426f145f7f..2d340c9bca3c 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -87,7 +87,8 @@ let
       };
     };
 
-  gen =
+  # Creates a Gradle without calling the package.
+  mkGradle' =
     {
       version,
       hash,
@@ -275,7 +276,7 @@ let
       };
       passthru.jdk = defaultJava;
       passthru.wrapped = callPackage wrapGradle {
-        gradle-unwrapped = gen' genArgs;
+        gradle-unwrapped = mkGradle genArgs;
       };
       passthru.updateScript =
         if enableUpdateScript then
@@ -324,26 +325,31 @@ let
     });
 
   # Calls the generated Gradle package with default arguments.
-  gen' = args: callPackage (gen args) { };
+  mkGradle = args: callPackage (mkGradle' args) { };
 in
 rec {
+  # Keep these exposed (but not at toplevel) so users can call
+  # `gradle-packages.mkGradle` as we do below,
+  # and still have wrapGradle available if necessary.
+  inherit mkGradle wrapGradle;
+
   # NOTE: Default JDKs that are hardcoded below must be LTS versions
   # and respect the compatibility matrix at
   # https://docs.gradle.org/current/userguide/compatibility.html
 
-  gradle_9 = gen' {
+  gradle_9 = mkGradle {
     version = "9.1.0";
     hash = "sha256-oX3dhaJran9d23H/iwX8UQTAICxuZHgkKXkMkzaGyAY=";
     defaultJava = jdk21;
   };
-  gradle_8 = gen' {
+  gradle_8 = mkGradle {
     version = "8.14.3";
     hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
     defaultJava = jdk21;
     # Only enable this on *one* version to avoid duplicate PRs.
     enableUpdateScript = true;
   };
-  gradle_7 = gen' {
+  gradle_7 = mkGradle {
     version = "7.6.6";
     hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A=";
     defaultJava = jdk17;

From 637ff94be0425de180a86b1f124f9ed912a318d6 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 2 Nov 2025 15:10:53 -0800
Subject: [PATCH 027/101] aliases: add gradleGen and wrapGradle

---
 pkgs/top-level/aliases.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..d2e24c4b6c43 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -675,6 +675,7 @@ mapAliases {
   graalvm-oracle = throw "'graalvm-oracle' has been renamed to/replaced by 'graalvmPackages.graalvm-oracle'"; # Converted to throw 2025-10-27
   graalvmCEPackages = throw "'graalvmCEPackages' has been renamed to/replaced by 'graalvmPackages'"; # Converted to throw 2025-10-27
   gradience = throw "`gradience` has been removed because it was archived upstream."; # Added 2025-09-20
+  gradleGen = throw "'gradleGen' has been moved to `gradle-packages.mkGradle`."; # Added 2025-11-02
   grafana_reporter = throw "'grafana_reporter' has been renamed to/replaced by 'grafana-reporter'"; # Converted to throw 2025-10-27
   graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
@@ -1586,6 +1587,7 @@ mapAliases {
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   wpa_supplicant_ro_ssids = throw "'wpa_supplicant_ro_ssids' has been renamed to/replaced by 'wpa_supplicant'"; # Converted to throw 2025-10-27
   wrapGAppsHook = throw "'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'"; # Converted to throw 2025-10-27
+  wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02
   write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28

From 71b0bb479fdcaa5c72e0fddd362ada16d0abea61 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 3 Nov 2025 00:34:54 +0100
Subject: [PATCH 028/101] libreoffice: hide rhino behind withJava option

This should not meaningfully change the build without Java,
but it prevents eval from complaining about nonSource packages
related to rhino.
---
 pkgs/applications/office/libreoffice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c177eae425c6..1ef286791917 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -617,9 +617,6 @@ stdenv.mkDerivation (finalAttrs: {
     # cannot find headers, no idea why
     "--without-system-boost"
 
-    "--with-system-rhino"
-    "--with-rhino-jar=${rhino}/share/java/js.jar"
-
     "--without-system-java-websocket"
   ]
   ++ optionals kdeIntegration [
@@ -627,6 +624,9 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-qt6"
   ]
   ++ optionals withJava [
+    "--with-system-rhino"
+    "--with-rhino-jar=${rhino}/share/java/js.jar"
+
     "--with-system-beanshell"
     "--with-ant-home=${ant.home}"
     "--with-beanshell-jar=${bsh}"

From 63c98b9ea26e4928f7ca37e540135227016d6880 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 00:52:40 +0000
Subject: [PATCH 029/101] ravedude: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix
index 8248e7be72c1..3a19616ec8cd 100644
--- a/pkgs/by-name/ra/ravedude/package.nix
+++ b/pkgs/by-name/ra/ravedude/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ravedude";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-LYHWUVREnGNR/vqtj+VklV3o74KUJu+Yi8ftulCJt9s=";
+    hash = "sha256-Ar2oQx7dKKfzkM3FMcJXiPHxNa0KcMRht38q+NgowfU=";
   };
 
-  cargoHash = "sha256-rD8rFs3zfWjQXm3mLvY2tpVS6X8wHJka2qs4D3/pa4E=";
+  cargoHash = "sha256-ME9egPOMTv/nEsmuxI+gJ6Tqa1Vqc/enlPttHXfTdBg=";
 
   nativeBuildInputs = [
     pkg-config

From d69f435a774ab7381fb51c0717843b00f386c14e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 16:59:01 -0800
Subject: [PATCH 030/101] python3Packages.torf: cleanup

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

diff --git a/pkgs/development/python-modules/torf/default.nix b/pkgs/development/python-modules/torf/default.nix
index 6d4a9c159201..2ae49857288b 100644
--- a/pkgs/development/python-modules/torf/default.nix
+++ b/pkgs/development/python-modules/torf/default.nix
@@ -2,13 +2,19 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   flatbencode,
+
+  # test
   pytest-cov-stub,
   pytest-httpserver,
   pytest-mock,
   pytest-xdist,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -48,10 +54,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "torf" ];
 
-  meta = with lib; {
+  meta = {
     description = "Create, parse and edit torrent files and magnet links";
     homepage = "https://github.com/rndusr/torf";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ambroisie ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 }

From f266dedd51ce0541da00070ab4a8ab7a4b946953 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 01:02:05 +0000
Subject: [PATCH 031/101] nb: 7.22.1 -> 7.23.0

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

diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix
index b8ad06aba369..cf69d9776b35 100644
--- a/pkgs/by-name/nb/nb/package.nix
+++ b/pkgs/by-name/nb/nb/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nb";
-  version = "7.22.1";
+  version = "7.23.0";
 
   src = fetchFromGitHub {
     owner = "xwmx";
     repo = "nb";
     rev = version;
-    hash = "sha256-WYOU4ybcuZa45P68r6NlhMYii1YUvCTmYicpVuGg7BM=";
+    hash = "sha256-n94ZEQtkTXItZ3T6T3W181IH3wU8xWznGqsizTdu4a8=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From f5cd34557da716361057d7a2bba7c6122f3cde0f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 16:55:46 -0800
Subject: [PATCH 032/101] python3Packages.torf: disable failing tests

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

diff --git a/pkgs/development/python-modules/torf/default.nix b/pkgs/development/python-modules/torf/default.nix
index 2ae49857288b..c467e3b373de 100644
--- a/pkgs/development/python-modules/torf/default.nix
+++ b/pkgs/development/python-modules/torf/default.nix
@@ -50,10 +50,17 @@ buildPythonPackage rec {
     "test_getting_info__xs_fails__as_fails"
     "test_getting_info__xs_returns_invalid_bytes"
     "test_getting_info__as_returns_invalid_bytes"
+    "test_file_in_singlefile_torrent_has_wrong_size"
+    "test_file_in_singlefile_torrent_doesnt_exist"
+    # Broken assertion
+    # AssertionError: assert 1000 < 1000
+    "test_callback_raises_exception"
   ];
 
   pythonImportsCheck = [ "torf" ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Create, parse and edit torrent files and magnet links";
     homepage = "https://github.com/rndusr/torf";

From 5ee5c9d9149b7b96802059cc28cf6c301e354c2c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 17:32:39 -0800
Subject: [PATCH 033/101] python3Packages.aiobtclientapi: disable cpu
 speed-sensitive test

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

diff --git a/pkgs/development/python-modules/aiobtclientapi/default.nix b/pkgs/development/python-modules/aiobtclientapi/default.nix
index 49242150d55d..22926e017b13 100644
--- a/pkgs/development/python-modules/aiobtclientapi/default.nix
+++ b/pkgs/development/python-modules/aiobtclientapi/default.nix
@@ -48,6 +48,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiobtclientapi" ];
 
+  disabledTests = [
+    # Timing-sensitive, e.g. "AssertionError: assert 9 <= 7"
+    "test_Monitor_block_until_timeout"
+  ];
+
   disabledTestPaths = [
     # AttributeError
     "tests/clients_test/rtorrent_test/rtorrent_api_test.py"

From 81d54e780fc3989e6fd0af22307b97e3875c766d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 17:55:34 -0800
Subject: [PATCH 034/101] upsies: disable failing tests due to Darwin
 differences

---
 pkgs/by-name/up/upsies/package.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix
index 70a99363ef04..c849af8737c7 100644
--- a/pkgs/by-name/up/upsies/package.nix
+++ b/pkgs/by-name/up/upsies/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitea,
   fetchpatch,
   ffmpeg-headless,
@@ -72,10 +73,32 @@ python3Packages.buildPythonApplication rec {
     ]
     ++ runtimeDeps;
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fail during object comparisons on Darwin
+    "test_group"
+    "test_has_commentary"
+    "test_special_case"
+    "test_set_release_info"
+    "test_Query_from_release"
+    # Depend on directory format
+    "test_home_directory_property"
+    # Depends on specific cocdecs not available on Darwin
+    "test_generate_episode_queries"
+    # Assert false == true
+    "test_is_mixed_scene_release"
+    # Fails due to expecting a non-darwin path format
+    "test_search"
+  ];
+
   disabledTestPaths = [
     # DNS resolution errors in the sandbox on some of the tests
     "tests/utils_test/http_test/http_test.py"
     "tests/utils_test/http_test/http_tls_test.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fail due to the different set of codecs on Darwin
+    "tests/utils_test/predbs_test/predbs_integration_test.py"
+    "tests/utils_test/release_info_test.py"
   ];
 
   preCheck = ''
@@ -90,6 +113,8 @@ python3Packages.buildPythonApplication rec {
     (lib.makeBinPath runtimeDeps)
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Toolkit for collecting, generating, normalizing and sharing video metadata";
     homepage = "https://upsies.readthedocs.io/";

From 5531dee1827d19d90e460b0113d628a5b1534898 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 18:13:45 -0800
Subject: [PATCH 035/101] upsies: remove 'with lib;'

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

diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix
index c849af8737c7..4720b0db79d2 100644
--- a/pkgs/by-name/up/upsies/package.nix
+++ b/pkgs/by-name/up/upsies/package.nix
@@ -115,11 +115,11 @@ python3Packages.buildPythonApplication rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Toolkit for collecting, generating, normalizing and sharing video metadata";
     homepage = "https://upsies.readthedocs.io/";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "upsies";
-    maintainers = with maintainers; [ ambroisie ];
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 }

From 5c1b1881ac7831fb69d75820b2fabd96ab1090dc Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 08:43:01 -0500
Subject: [PATCH 036/101] hyperfine: add mdaniels5757 as maintainer

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

diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index f8cd0c88aaa7..9fa0cddc0fb1 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
+      mdaniels5757
       thoughtpolice
     ];
     mainProgram = "hyperfine";

From f6d87aa81ec3c1296dab4fb0bdce8a589f54ca61 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 08:44:22 -0500
Subject: [PATCH 037/101] hyperfine: set updateScript

---
 pkgs/by-name/hy/hyperfine/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index 9fa0cddc0fb1..e6e9d487dc0c 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec {
       --zsh $releaseDir/build/hyperfine-*/out/_hyperfine
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command-line benchmarking tool";
     homepage = "https://github.com/sharkdp/hyperfine";

From 872a0e5a1be234bc99a1e5303d872e0519fa4687 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 3 Nov 2025 19:22:50 +0100
Subject: [PATCH 038/101] warmux: drop

The package fails to build since July and the upstream repo was last
updated 6 years ago.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/wa/warmux/package.nix | 83 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 pkgs/by-name/wa/warmux/package.nix

diff --git a/pkgs/by-name/wa/warmux/package.nix b/pkgs/by-name/wa/warmux/package.nix
deleted file mode 100644
index c3115ad02d7e..000000000000
--- a/pkgs/by-name/wa/warmux/package.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  zlib,
-  curl,
-  gnutls,
-  fribidi,
-  libpng,
-  SDL,
-  SDL_gfx,
-  SDL_image,
-  SDL_mixer,
-  SDL_net,
-  SDL_ttf,
-  libunwind,
-  libX11,
-  xorgproto,
-  libxml2,
-  pkg-config,
-  gettext,
-  intltool,
-  libtool,
-  perl,
-}:
-
-stdenv.mkDerivation {
-  pname = "warmux";
-  version = "unstable-2017-10-20";
-
-  src = fetchFromGitHub {
-    owner = "fluxer";
-    repo = "warmux";
-    rev = "8f81d4fc309a548ae89a068c2dde27b7e7ef8851";
-    sha256 = "1hvzglsmp75xiqqb0k75qjz4jwi8kl3fhn8zfsz53hhhqmbw6wkr";
-  };
-
-  __structuredAttrs = true;
-
-  preConfigure = "patchShebangs autogen.sh && ./autogen.sh";
-  configureFlags = [ "CFLAGS=-include ${zlib.dev}/include/zlib.h" ];
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    gettext
-    intltool
-    libtool
-    pkg-config
-  ];
-  buildInputs = [
-    zlib
-    curl
-    gnutls
-    fribidi
-    libpng
-    SDL
-    SDL_gfx
-    SDL_image
-    SDL_mixer
-    SDL_net
-    SDL_ttf
-    libunwind
-    libX11
-    xorgproto
-    libxml2
-    perl
-  ];
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "Ballistics turn-based battle game between teams - unofficial copy";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = with licenses; [
-      gpl2Plus
-      ufl
-    ];
-    homepage = "https://github.com/fluxer/warmux";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..4a3fb6287a49 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1564,6 +1564,7 @@ mapAliases {
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   wakatime = throw "'wakatime' has been renamed to/replaced by 'wakatime-cli'"; # Converted to throw 2025-10-27
   wapp = throw "'wapp' has been renamed to/replaced by 'tclPackages.wapp'"; # Converted to throw 2025-10-27
+  warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03
   warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_104;

From 841e8f923163436422e4f6bdac67aaf20dc6e438 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:25:53 +0530
Subject: [PATCH 039/101] fx: add phanirithvij as maintainer

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/fx/fx/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index 8dcc65af790c..a94c58e97caa 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -36,6 +36,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/antonmedv/fx";
     license = lib.licenses.mit;
     mainProgram = "fx";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
 })

From ae803875fa0c82970b1c8c54aaecd84f246e1445 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:10:03 +0530
Subject: [PATCH 040/101] fx: add versionCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/fx/fx/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index a94c58e97caa..fce5491fa6ac 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -4,6 +4,8 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -30,6 +32,15 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/fx --comp zsh)
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+
   meta = {
     changelog = "https://github.com/antonmedv/fx/releases/tag/${finalAttrs.src.tag}";
     description = "Terminal JSON viewer";

From b6a5b915270525a58ff7a4825bc26949801daff6 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 3 Nov 2025 20:00:49 +0000
Subject: [PATCH 041/101] linux_xanmod: 6.12.56 -> 6.12.57

- Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.57-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.56-xanmod1..6.12.57-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index d928f71c757d..4f54d409ef74 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.56";
-      hash = "sha256-+uMzNrX97n16vuMJU2J4l9gNwge46LQDVrPxSftpvyA=";
+      version = "6.12.57";
+      hash = "sha256-4TEz29I/GEvDXJd8WEMZAiPyKYbVl7gB8OCYr+bJm0Q=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From e7c06ffb3e99f450bebe6045303f31f03dc6f427 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:32:52 +0530
Subject: [PATCH 042/101] tui-journal: add phanirithvij as maintainer

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/tu/tui-journal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 2b7fc3d46765..cc9c946c469b 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/AmmarAbouZor/tui-journal";
     changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
     license = licenses.mit;
-    maintainers = [ ];
     mainProgram = "tjournal";
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
 }

From 335d354e71a5f82ecc22fd5ea87b9c5b01a24a6b Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 3 Nov 2025 20:04:39 +0000
Subject: [PATCH 043/101] linux_xanmod_latest: 6.17.6 -> 6.17.7

- Changelog: https://dl.xanmod.org/changelog/6.17/ChangeLog-6.17.7-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.17.6-xanmod1..6.17.7-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 4f54d409ef74..31efe591f324 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.17.6";
-      hash = "sha256-SGaM42dN+pl0GAQRDmCR6QB0ET1loqfFwC7kUxTXEjw=";
+      version = "6.17.7";
+      hash = "sha256-MEAKPUcUmWJCvEf5DNG8JA4jJfQtitMVv/Fc/KNEz2Y=";
     };
   };
 

From 9018e6f9d9d854267fdffe815ed1e4ca7f958460 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:33:09 +0530
Subject: [PATCH 044/101] tui-journal: refactor

remove with lib
rev -> tag
rec -> finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/tu/tui-journal/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index cc9c946c469b..222361ba6588 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -7,14 +7,14 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tui-journal";
   version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-crrh7lV5ZMKaxsrFmhXsUgBMbN5nmbf8wQ6croTqUKI=";
   };
 
@@ -29,12 +29,12 @@ rustPlatform.buildRustPackage rec {
     zlib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Your journal app if you live in a terminal";
     homepage = "https://github.com/AmmarAbouZor/tui-journal";
-    changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
-    license = licenses.mit;
+    changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${finalAttrs.src.rev}/CHANGELOG.ron";
+    license = lib.licenses.mit;
     mainProgram = "tjournal";
     maintainers = with lib.maintainers; [ phanirithvij ];
   };
-}
+})

From 3a5a23e618fd594bd6824e3c3c091a7e98fbd464 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:56:52 +0530
Subject: [PATCH 045/101] tui-journal: add versionCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/tu/tui-journal/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 222361ba6588..5c377cc73405 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -5,6 +5,7 @@
   pkg-config,
   libgit2,
   zlib,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -29,6 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     zlib
   ];
 
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "Your journal app if you live in a terminal";
     homepage = "https://github.com/AmmarAbouZor/tui-journal";

From 27df018c93b09ada3ca39d628478c575b866558c Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Mon, 3 Nov 2025 21:32:26 +0100
Subject: [PATCH 046/101] ungoogled-chromium: 142.0.7444.59-1 ->
 142.0.7444.59-2

https://github.com/ungoogled-software/ungoogled-chromium/releases/tag/142.0.7444.59-2
---
 pkgs/applications/networking/browsers/chromium/info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b33c225dde59..1725526143ae 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -825,8 +825,8 @@
         "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
       },
       "ungoogled-patches": {
-        "rev": "142.0.7444.59-1",
-        "hash": "sha256-WlrUSUcV1kN2xWbOJO+VshELAgGhXInIDvZswrWYfsQ="
+        "rev": "142.0.7444.59-2",
+        "hash": "sha256-Cjcy6ohVNt2eAD+m4ZTbeoHH9i4znkdgN0ZaysU8Whk="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },

From 82afaae81e475efe013f8369f9faf287a2bb1f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 12:59:12 -0800
Subject: [PATCH 047/101] python3Packages.marisa-trie: 1.2.1 -> 1.3.1

Diff: https://github.com/pytries/marisa-trie/compare/1.2.1...1.3.1

Changelog: https://github.com/pytries/marisa-trie/blob/1.3.1/CHANGES.rst
---
 .../python-modules/marisa-trie/default.nix    |  8 ++---
 .../marisa-trie/unvendor-marisa.patch         | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix
index c7a9c123b044..d7d9fb0a63e1 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/pkgs/development/python-modules/marisa-trie/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "marisa-trie";
-  version = "1.2.1";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytries";
     repo = "marisa-trie";
     tag = version;
-    hash = "sha256-aWfm13nrASAaD+bcMpv85emXnCFyVtZTdhl79yJuOss=";
+    hash = "sha256-7T0V5levh9xjWmjJdFix0p8L3lZhfurikSWMI7Hotbs=";
   };
 
   patches = [
@@ -42,10 +42,6 @@ buildPythonPackage rec {
     hypothesis
   ];
 
-  preBuild = ''
-    ./update_cpp.sh
-  '';
-
   disabledTestPaths = [
     # Don't test packaging
     "tests/test_packaging.py"
diff --git a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
index 26ac8156a06b..69c0ee46678b 100644
--- a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
+++ b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
@@ -1,30 +1,26 @@
 diff --git a/setup.py b/setup.py
-index c0c5c03..6373a2a 100755
+index 133ba37..1026947 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -71,15 +71,6 @@ setup(
-     license=LICENSE,
-     url="https://github.com/pytries/marisa-trie",
-     classifiers=CLASSIFIERS,
+@@ -26,19 +26,11 @@ extensions = [
+         "marisa_trie",
+         sources=["src/*.pyx"],
+         language="c++",
+-        include_dirs=[str(MARISA_INCLUDE_DIR)],
++        include_dirs=["@marisa@/include"],
++        libraries=["marisa"],
+     ),
+ ]
+ 
+ setup(
 -    libraries=[
 -        (
 -            "libmarisa-trie",
 -            {
 -                "sources": MARISA_FILES,
--                "include_dirs": [MARISA_SOURCE_DIR, MARISA_INCLUDE_DIR],
+-                "include_dirs": [str(MARISA_SOURCE_DIR), str(MARISA_INCLUDE_DIR)],
 -            },
 -        )
 -    ],
-     ext_modules=[
-         Extension(
-             "marisa_trie",
-@@ -94,7 +85,8 @@ setup(
-                 "src/std_iostream.cpp",
-                 "src/trie.cpp",
-             ],
--            include_dirs=[MARISA_INCLUDE_DIR],
-+            include_dirs=["@marisa@/include"],
-+            libraries=["marisa"],
-         )
-     ],
-     python_requires=">=3.8",
+     ext_modules=cythonize(extensions, language_level="3"),
+ )

From f425a4300a1715a860c3306dc01a4a35c46cc4b9 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:30:19 +0100
Subject: [PATCH 048/101] blint: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/by-name/bl/blint/package.nix b/pkgs/by-name/bl/blint/package.nix
index d8a975996666..d5cb89843651 100644
--- a/pkgs/by-name/bl/blint/package.nix
+++ b/pkgs/by-name/bl/blint/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "blint";
-  version = "3.0.4";
+  version = "3.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "owasp-dep-scan";
     repo = "blint";
     tag = "v${version}";
-    hash = "sha256-6dBNzBjhcBMX+PQ4NbjM18APqFuURH9/MYxHFZ/x7J8=";
+    hash = "sha256-RloxQlnhl4zCto6QO09UZs+29QRCpL0/PJCzYrVi8ng=";
   };
 
   build-system = [

From 31b3ab59a4e4337069ed19ac27d178420ed71765 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:42:18 +0100
Subject: [PATCH 049/101] gnunet: 0.25.1 -> 0.25.2

---
 pkgs/by-name/gn/gnunet/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gn/gnunet/package.nix b/pkgs/by-name/gn/gnunet/package.nix
index 2c5d643a1c5b..b9e3204ca23a 100644
--- a/pkgs/by-name/gn/gnunet/package.nix
+++ b/pkgs/by-name/gn/gnunet/package.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnunet";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ITNsFs1X+R+dX9U1lILZFRp83w1jlvi2GCjBfMxmj1w=";
+    hash = "sha256-6rdvw105OrFfrbY0T4Q1JcFlYZQAc1qm3eCWb2omwuY=";
   };
 
   enableParallelBuilding = true;
@@ -94,12 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     # builds.
     find . \( -iname \*test\*.c -or -name \*.conf \) | \
       xargs sed -i -e "s|/tmp|$TMPDIR|g"
-
-    # fix error: conflicting types for `GNUNET_TESTING_cmd_{exec,finish}`
-    for name in exec finish; do
-      substituteInPlace src/lib/testing/testing_api_cmd_$name.c \
-        --replace-fail 'const struct GNUNET_TESTING_Command' 'struct GNUNET_TESTING_Command'
-    done
   '';
 
   # unfortunately, there's still a few failures with impure tests

From 1f4d088ef1258df8c309073f6b98d710bec5c819 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 22:56:54 +0000
Subject: [PATCH 050/101] python3Packages.snakemake-interface-report-plugins:
 1.2.0 -> 1.3.0

---
 .../snakemake-interface-report-plugins/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
index 6e6be26ae102..ea74d2b18d18 100644
--- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-interface-report-plugins";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-report-plugins";
     tag = "v${version}";
-    hash = "sha256-wyDJa8Pahe+ANSNqZ1BZRmljpabyXhLodMJhupjd3pY=";
+    hash = "sha256-3ugEmdO1dcusKXXBZBRszlZXX5fhJyYSSF5Uj5CKJkQ=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 5b8fd344821875e897d0367ddd59a3e09bcddfab Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 18:59:44 -0500
Subject: [PATCH 051/101] nixpkgs-review: add mdaniels5757 as maintainer

---
 pkgs/by-name/ni/nixpkgs-review/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index ef6966de0d62..4759c8248966 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -86,6 +86,7 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.mit;
     mainProgram = "nixpkgs-review";
     maintainers = with lib.maintainers; [
+      mdaniels5757
       mic92
     ];
   };

From 622bfea52b3ae979351233907a0548c8dc449236 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 19:00:36 -0500
Subject: [PATCH 052/101] nix-update: add mdaniels5757 as maintainer

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

diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index 0f266bb8c1a3..d005fd639f5c 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -52,6 +52,7 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
+      mdaniels5757
       mic92
     ];
     mainProgram = "nix-update";

From d7896d5ebde38399e9822cd3f4cb170c8246e904 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 19:24:01 -0500
Subject: [PATCH 053/101] regex-cli: adopt, add updateScript

---
 pkgs/by-name/re/regex-cli/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix
index a9c7cb48e967..69f421f491a7 100644
--- a/pkgs/by-name/re/regex-cli/package.nix
+++ b/pkgs/by-name/re/regex-cli/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchCrate,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-7fPoH6I8Okz8Oby45MIDdKBkbPgUPsaXd6XS3r3cRO8=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions";
     mainProgram = "regex-cli";
@@ -23,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
 }

From b57f7c5f41ba23d0adaa0413a54ec38627e4d565 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 02:09:45 +0000
Subject: [PATCH 054/101] sidplayfp: 2.15.1 -> 2.15.2

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

diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 09e2b32ec66e..b35bd76e1cce 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.15.1";
+  version = "2.15.2";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IUyXkHs8QfWhuTVYrPbmMU/mhfGwGminypLmGYimcLg=";
+    hash = "sha256-XUf4lqWwNC0bYSb1AdX2zZ46+0Ki1001XAjFOh7EAJ0=";
   };
 
   strictDeps = true;

From dca7209c8238ab47321dcab7bc3ef2b612d874f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 04:04:19 +0000
Subject: [PATCH 055/101] stu: 0.7.4 -> 0.7.5

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

diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix
index ef95636772c7..7d10d60e8120 100644
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stu";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "stu";
     rev = "v${version}";
-    hash = "sha256-To1x65UuYSdkjIghy0UOA70LULGZZcC5waxYh99qXbs=";
+    hash = "sha256-zjfIBYFlEG6OQ+vWOJhVuek30uG1R28wJpUhRIMcYks=";
   };
 
-  cargoHash = "sha256-YmEzjbGIvgpPlMJln42Q9m/v3HhfsjLMHvES/4S1928=";
+  cargoHash = "sha256-CrliGsShW6wDkCpOVlK9m24BXr3lyxtU12GAdD/2dWE=";
 
   passthru.tests.version = testers.testVersion { package = stu; };
 

From 8e5de42030fb08b71079581516971460be896260 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 05:24:20 +0000
Subject: [PATCH 056/101] python3Packages.scipy-stubs: 1.16.2.4 -> 1.16.3.0

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

diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix
index 20f5438df541..9c5d7f197456 100644
--- a/pkgs/development/python-modules/scipy-stubs/default.nix
+++ b/pkgs/development/python-modules/scipy-stubs/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "scipy-stubs";
-  version = "1.16.2.4";
+  version = "1.16.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scipy";
     repo = "scipy-stubs";
     tag = "v${version}";
-    hash = "sha256-cmX9uS055kHvmCmsILEyTxW0p9C8xfD3N7HPBVCmIVI=";
+    hash = "sha256-TLqLJirbOGIm718cLhWcEi4VHms9imIJZadGfYphXBk=";
   };
 
   postPatch = ''

From c2a2795a183b820c0ec0f6ebe053c8e7fccf0f24 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 3 Nov 2025 22:49:08 -0700
Subject: [PATCH 057/101] ollama: 0.12.6 -> 0.12.9

https://github.com/ollama/ollama/releases/tag/v0.12.9
Diff: https://github.com/ollama/ollama/compare/v0.12.6...v0.12.9
---
 pkgs/by-name/ol/ollama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index ddea0bfafb76..da1c19d15004 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -118,13 +118,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.12.6";
+  version = "0.12.9";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ttwcpg2bgz7D8IqPRTNeZUQFA/HsGc8gCOiXRs7onBg=";
+    hash = "sha256-D61jCyOUYXyPgztgEAFHd2oL5IXsO5TnE2AGEHOnows=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";

From 0117f57128e6cd8a176e5e80646ab97832c1919f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 06:33:23 +0000
Subject: [PATCH 058/101] opa-envoy-plugin: 1.9.0-envoy -> 1.10.0-envoy

---
 pkgs/by-name/op/opa-envoy-plugin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index 2710fd3f7482..b63bca544378 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -14,16 +14,16 @@ assert
 
 buildGoModule rec {
   pname = "opa-envoy-plugin";
-  version = "1.9.0-envoy";
+  version = "1.10.0-envoy";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa-envoy-plugin";
     tag = "v${version}";
-    hash = "sha256-Arc0aVDcGZqCrrUrAB9yVXSXzdtOlXEFGZ8pJ578oKk=";
+    hash = "sha256-qKLeSpVy/ImeJ2WPLa3uQSHA/6Y4Visb9lgC4PkURkI=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-l/0IaHz1wTNqX/Im8g0fjTqVOtMHSdqSpl0Oo1ByyxA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From dd9c28dcf0ed1f2f460d0e67fb8523f83b5f6b08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 07:27:25 +0000
Subject: [PATCH 059/101] teamviewer: 15.70.6 -> 15.71.4

---
 pkgs/applications/networking/remote/teamviewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 4531ae3d7f36..ea7e86b4295e 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
     "out"
     "dev"
   ];
-  version = "15.70.6";
+  version = "15.71.4";
 
   src =
     let
@@ -39,11 +39,11 @@ mkDerivation rec {
     {
       x86_64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_amd64.deb";
-        hash = "sha256-39hJPR9rS5EAaNc0jaBndwYAkSE7r2dz0H1vQDfUhK8=";
+        hash = "sha256-DztZRVBIFdLkZX1a89tVwJvJicgsm5YTux0ezyWL1+w=";
       };
       aarch64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_arm64.deb";
-        hash = "sha256-mXJObC8KFjRkw6IbSOpL1MxL58Bk4QovA8zDalPi56g=";
+        hash = "sha256-lKEAuMsScbnEkgR6VFykEyar55u/Fdt5VcCWnKPwJLU=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From 7b85dc3633eb9bd2bfecf436d4a86f44c35a35d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 08:29:41 +0000
Subject: [PATCH 060/101] git-spice: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index ec428011fdc7..18c66b955409 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-spice";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LFzu7EeH6veambFHou7leJgrJU4L/iYyl5H6IaM3afs=";
+    hash = "sha256-G4GnqasZkvwHviR+Bj81dRp/oOT4dxPDmIvJA9I5tCg=";
   };
 
-  vendorHash = "sha256-hr4t3VseLxV3xFWFtpTTiG+2XK7kFxxYrfzCwCU/zx8=";
+  vendorHash = "sha256-JtgXF4Qd4+zknl3DAQihe11dPFLiz8pQRa+apPSYb18=";
 
   subPackages = [ "." ];
 

From fef26c52e94184f64bd746181cf757d370ecc1bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 09:42:28 +0000
Subject: [PATCH 061/101] labymod-launcher: 2.1.12 -> 2.1.13

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

diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix
index 6c6134dbd57a..04de4423d6d8 100644
--- a/pkgs/by-name/la/labymod-launcher/package.nix
+++ b/pkgs/by-name/la/labymod-launcher/package.nix
@@ -6,12 +6,12 @@
 
 let
   pname = "labymod-launcher";
-  version = "2.1.12";
+  version = "2.1.13";
 
   src = fetchurl {
     name = "labymod-launcher";
     url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
-    hash = "sha256-n0ipNxtmVSG/Do5UcFpWhGH+4SO3ZljsUXPW4hYzkZU=";
+    hash = "sha256-MntANnDKN4JZwQdixqxR7SbXd5pxQzC5R+RzJYel2oM=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From e5b84fbba34587bd1225a4f07359feb47789fa95 Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@gmail.com>
Date: Tue, 4 Nov 2025 10:57:28 +0100
Subject: [PATCH 062/101] maintainers: add letgamer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f918b5c8eddf..b762a72a9a2e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14442,6 +14442,12 @@
     githubId = 737767;
     name = "Thomas Gerbet";
   };
+  letgamer = {
+    github = "Letgamer";
+    githubId = 62446107;
+    matrix = "@letgamer:tchncs.de";
+    name = "Alex Stephan";
+  };
   lethalman = {
     email = "lucabru@src.gnome.org";
     github = "lucabrunox";

From ac1360117bda08a8a6afba8e718a13df2ffdfaea Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 11:00:11 +0100
Subject: [PATCH 063/101] archi: 5.6.0 -> 5.7.0

---
 pkgs/by-name/ar/archi/package.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix
index bb28256d053e..fc055a1c11b7 100644
--- a/pkgs/by-name/ar/archi/package.nix
+++ b/pkgs/by-name/ar/archi/package.nix
@@ -15,23 +15,23 @@
   makeDesktopItem,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "Archi";
-  version = "5.6.0";
+  version = "5.7.0";
 
   src =
     {
       "x86_64-linux" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Linux64-${version}.tgz";
-        hash = "sha256-zPgsRfbhN22Sph/5AvP7y2uHdgy1cZRcsm+O1dVLNHc=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Linux64-${finalAttrs.version}.tgz";
+        hash = "sha256-MIUlWt3GP/1oQAeq4W2xnhG63a2zhGldgyoyZ9lNOiI=";
       };
       "x86_64-darwin" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-${version}.dmg";
-        hash = "sha256-NZWMQzLsPcJ7cZoYFUxXxLIu7yCIHE5pw9+UqjtG7Cc=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-${finalAttrs.version}.dmg";
+        hash = "sha256-wIlhJ6XmhL5rMb5zwHJYwamCwV13PK53wi9uEXIga5I=";
       };
       "aarch64-darwin" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-Silicon-${version}.dmg";
-        hash = "sha256-a80QyJT+mizT4bxhJ/1rXnQGbq0Zxwmqb74n2QH4H3I=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-Silicon-${finalAttrs.version}.dmg";
+        hash = "sha256-2/w4+aKfjfTGLjjl/nOouFtnv7/kjmfezkrmSa4ablc=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
       desktopName = "Archi";
       exec = "Archi";
       type = "Application";
-      comment = meta.description;
+      comment = finalAttrs.meta.description;
       icon = "archi";
       categories = [
         "Development"
@@ -107,20 +107,20 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) archi; };
 
-  meta = with lib; {
+  meta = {
     description = "ArchiMate modelling toolkit";
     longDescription = ''
       Archi is an open source modelling toolkit to create ArchiMate
       models and sketches.
     '';
     homepage = "https://www.archimatetool.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
       earldouglas
       paumr
     ];
     mainProgram = "Archi";
   };
-}
+})

From 9aeb1359701b0e904de7a29511610aa12de169b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 10:43:21 +0000
Subject: [PATCH 064/101] ananicy-rules-cachyos: 0-unstable-2025-10-17 ->
 0-unstable-2025-11-03

---
 pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 515a4190aab6..bfd5a058b881 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-10-17";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "53b0c689faaa4bb7edcb9dae799602c417634351";
-    hash = "sha256-awGCaVl0m1IqADeQW53wFSEAeUYR6677oc0Z2ZfZ898=";
+    rev = "aa23ab23e6847c77a39fe9e8ebc274ab87c391d7";
+    hash = "sha256-cSpqwzTT4Nx7PK7mLUF13w/JgPlfvRdqZW0EsuY1b8M=";
   };
 
   dontConfigure = true;

From e19484f06d9babd0e11f3132ad1c92f7550dda67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 11:02:26 +0000
Subject: [PATCH 065/101] n8n: 1.116.2 -> 1.117.3

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

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index ad76b10d9ed7..bdeed4d7195c 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -17,19 +17,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.116.2";
+  version = "1.117.3";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-pHrJ/l3L+asf0ZXcWVvOzzdoDYnAUvaR9GxB/m/jvzU=";
+    hash = "sha256-zCwQ+f0BklDBKQrdxZqE7mlG3gzZ78rQeHUKpDrd8EU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-uBnb781B84Rm9gbco7p5iDp18sfjbULbedaRIk7kaLE=";
+    hash = "sha256-GJ8lKqfsVoA/znPU7r4AsDZdnP+VqmzJpFVLV8RvBps=";
   };
 
   nativeBuildInputs = [

From 7e90063954b757eeb994dbd2b07d93832aab9320 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 4 Nov 2025 12:33:44 +0100
Subject: [PATCH 066/101] lsp-plugins: 1.2.24 -> 1.2.25

---
 pkgs/by-name/ls/lsp-plugins/package.nix | 35 ++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index 5c5e0ecbd65b..006ca5f0e8e5 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -21,7 +21,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lsp-plugins";
-  version = "1.2.24";
+  version = "1.2.25";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rDKf3PqRa+lLZcHGQNRXBGkcnhkMNdE9Jok4n3/btGM=";
+    hash = "sha256-qCm3DfRF7LR6wk5TtC/r1GIA2ZI7YrrZTKNHjLDjJnM=";
   };
 
   # By default, GStreamer plugins are installed right alongside GStreamer itself
@@ -93,49 +93,70 @@ stdenv.mkDerivation (finalAttrs: {
       Contains the following plugins (https://lsp-plug.in/?page=plugins)
 
       Equalizers:
-      - Fliter
+      - Filter
       - Graphic Equalizer
       - Parametric Equalizer
+
       Dynamic Processing:
+      - Beat Breather
+      - Clipper
       - Compressor
-      - Dynamic Processor
+      - Dynamics Processor
       - Expander
       - Gate
       - Limiter
+
       Multiband Dynamic Processing:
       - GOTT Compressor
+      - Multiband Clipper
       - Multiband Compressor
       - Multiband Dynamics Processor
       - Multiband Expander
       - Multiband Gate
       - Multiband Limiter
-      Convolution / Reverb processing:
+
+      Convolution / Reverb Processing:
       - Impulse Responses
       - Impulse Reverb
       - Room Builder
+
       Delay Effects:
       - Artistic Delay
       - Compensation Delay
       - Slap-back Delay
+
+      Modulation Effects:
+      - Chorus
+      - Flanger
+      - Phaser
+
       Analyzers:
       - Oscilloscope
       - Phase Detector
       - Spectrum Analyzer
+
       Multiband Processing:
       - Crossover
+
       Samplers:
       - Multisampler
       - Sampler
+
       Generators / Oscillators:
       - Noise Generator
       - Oscillator
-      Utilitary Plugins:
+
+      Utility Plugins:
       - A/B Test Plugin
-      - Flanger
+      - Automatic Gain Control
       - Latency Meter
       - Loudness Compensator
       - Mixer
       - Profiler
+      - Referencer
+      - Return
+      - Ring Modulated Sidechain
+      - Send
       - Surge Filter
       - Trigger
     '';

From 90d42598f5cdbd5ed1dec569ab3009dc1a67bd3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:26:00 +0000
Subject: [PATCH 067/101] osmo-bsc: 1.13.2 -> 1.13.3

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

diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix
index 5a25b604eda8..82f8a239f51f 100644
--- a/pkgs/by-name/os/osmo-bsc/package.nix
+++ b/pkgs/by-name/os/osmo-bsc/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "osmo-bsc";
-  version = "1.13.2";
+  version = "1.13.3";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bsc";
     rev = version;
-    hash = "sha256-YSCbVqELh/id9sK4G5xF8riYXhwFtXU/lXMlH6XxvXY=";
+    hash = "sha256-2Go+93h1Z4FV9sESfjwCaee1m4jUq2eO8fxlZAwZVfM=";
   };
 
   postPatch = ''

From 3ffa107eee8566bf428de02c833e395669532d21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:31:04 +0000
Subject: [PATCH 068/101] sherpa: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix
index 21d69093ec48..3367c42ec113 100644
--- a/pkgs/by-name/sh/sherpa/package.nix
+++ b/pkgs/by-name/sh/sherpa/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sherpa";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitLab {
     owner = "sherpa-team";
     repo = "sherpa";
     tag = "v${version}";
-    hash = "sha256-zrtu4LJIzNdUGmnQlvZytYgzESo8eYQIdfxBABgUbzs=";
+    hash = "sha256-VlC5MnbrXp2fdO2EtBjtw45Gx6PhF/hcLy0ajlKp10E=";
   };
 
   postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''

From 17050398fb656c63490c028d7c3ea7317967b123 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:36:15 +0000
Subject: [PATCH 069/101] linuxPackages.tt-kmd: 2.4.1 -> 2.5.0

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

diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix
index b04d64ed63f7..68381cf302d7 100644
--- a/pkgs/os-specific/linux/tt-kmd/default.nix
+++ b/pkgs/os-specific/linux/tt-kmd/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tt-kmd";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-kmd";
     tag = "ttkmd-${finalAttrs.version}";
-    hash = "sha256-m4XZdgOHQOWNoZlV2VqN6yhLcQuZxam22JKpOGXbjwI=";
+    hash = "sha256-edpBUXhWAtcmHAgNPMAomexXfuIIqRvGipnr30VvsPE=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 6ae3df31464615ee0d4d39bcebc9a443d2e270d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:47:17 +0000
Subject: [PATCH 070/101] tomat: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/by-name/to/tomat/package.nix b/pkgs/by-name/to/tomat/package.nix
index b08eed1802e9..e2f842e5ebc3 100644
--- a/pkgs/by-name/to/tomat/package.nix
+++ b/pkgs/by-name/to/tomat/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tomat";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "jolars";
     repo = "tomat";
     tag = "v${version}";
-    hash = "sha256-lkNBcTn7uXWifIVNoXmggPy+UjozL5YqVYorH9XAejo=";
+    hash = "sha256-xIIkyPcW/gIOS28efGR8ausBdnIj0/OkWLEM0MMTJLI=";
   };
 
-  cargoHash = "sha256-jBpZyNfsJKchJnKwWJQeVavj0Yog83QrCM8kOJFVugg=";
+  cargoHash = "sha256-Ij91tU31fPUapxwCjpP0ASw96OGs/D/RzmDA1pKmrgQ=";
 
   nativeBuildInputs = [
     pkg-config

From 6d3b460ed262500aff5140a6eb9f7247c657dddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 13:22:49 +0000
Subject: [PATCH 071/101] simple-binary-encoding: 1.36.0 -> 1.36.1

---
 .../si/simple-binary-encoding/deps.json       | 88 ++++++++++---------
 .../si/simple-binary-encoding/package.nix     |  4 +-
 2 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/si/simple-binary-encoding/deps.json b/pkgs/by-name/si/simple-binary-encoding/deps.json
index a5d6de6710ac..490af168c51d 100644
--- a/pkgs/by-name/si/simple-binary-encoding/deps.json
+++ b/pkgs/by-name/si/simple-binary-encoding/deps.json
@@ -259,9 +259,9 @@
    "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
    "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
   },
-  "com/puppycrawl/tools#checkstyle/11.1.0": {
-   "jar": "sha256-AdLE4WAjVbKjTd4UCI5lqv9OvhZ4FciGmQi1u/Cn88k=",
-   "pom": "sha256-CtCVc7hBSEy0ade4xc7J4onVgk2cv8WzlhhefWkK5A4="
+  "com/puppycrawl/tools#checkstyle/12.1.1": {
+   "jar": "sha256-bFeVVVOsrx+n0vuZZogE8b37aN6ROLM5nqN/NGlPEOw=",
+   "pom": "sha256-G7+5ywT3BF9vCW03d7IFICtYfbxgqF1UUKKooJWTXlY="
   },
   "commons-beanutils#commons-beanutils/1.11.0": {
    "jar": "sha256-nkS6aOyaPyEob6Kou7ADtzXA9pEBu0MUS3n0+KqnRwk=",
@@ -323,10 +323,10 @@
    "jar": "sha256-jzqSFqU3NnEyKT6su6nfBi6s6PixahhK9Z4uSDnUzUE=",
    "pom": "sha256-+IDp0dQAyZwYkvWWTl/JIN0d7wViI1m5sFjzK1tCaXU="
   },
-  "org/agrona#agrona/2.3.0": {
-   "jar": "sha256-8mIblkMT6G6sRqvz6CL3VyFYO0bjssgDuS5HZaoD8+k=",
-   "module": "sha256-2wb7uwExy7cFsAgm6itku9binI/bGC7Zcejo4kBU+D0=",
-   "pom": "sha256-7KN5DcPZVKrXneWuqueAkKE5xrRNs0vCaLAhxwke+VY="
+  "org/agrona#agrona/2.3.1": {
+   "jar": "sha256-1c6VoTOazhPd0tAxVUMsalMonoN4E/aTIVpsq/AeZvg=",
+   "module": "sha256-d72z4nnWH8K9nGf46cf0HB6+sAeQNZL7wZlizuQmDro=",
+   "pom": "sha256-4kiqvmvUW54FQjK8jRMrV94UTxGFw65oFv84HYzF7bk="
   },
   "org/antlr#antlr4-master/4.13.2": {
    "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
@@ -443,10 +443,10 @@
    "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
    "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
   },
-  "org/checkerframework#checker-qual/3.51.0": {
-   "jar": "sha256-jpFnbckWgEvRL3kJ5/XcB2RsyYIgFHqLX+p/9CvW/0o=",
-   "module": "sha256-MNCupC4IPfcNa/P5WAA0Mhj4nPn6G8MkN6XqcHrvg+w=",
-   "pom": "sha256-VyZA+ycbWVVBeR7+2+Ch8reFA3M8t1/BglkO3QcbxMs="
+  "org/checkerframework#checker-qual/3.51.1": {
+   "jar": "sha256-FTrv/lbKJPOpuLbG/4E+rOliDM81rfq5HUkWguVs1c4=",
+   "module": "sha256-sU5zwFoeM/ddSLfYBDH5QqpLIQ/Pc/YKQkXMP91p/yI=",
+   "pom": "sha256-dQgGzZygmZ5L8vel1lfSNqNrtzYm7mpI8p9VXiB0UVA="
   },
   "org/codehaus/plexus#plexus-classworlds/2.6.0": {
    "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=",
@@ -492,44 +492,48 @@
    "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
    "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
   },
-  "org/junit#junit-bom/5.13.4": {
-   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
-   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
+  "org/junit#junit-bom/6.0.0": {
+   "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
+   "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.13.4": {
-   "jar": "sha256-0buBq/2eA0GDBrTmozkMjbUsWDcudJwpgKwp8MCCePE=",
-   "module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=",
-   "pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls="
+  "org/junit#junit-bom/6.0.1": {
+   "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=",
+   "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.13.4": {
-   "jar": "sha256-AnQEqS/mGLckZXkqJXlRSVxQOn1XUeJ5Hg9RyH9n9bw=",
-   "module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=",
-   "pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc="
+  "org/junit/jupiter#junit-jupiter-api/6.0.1": {
+   "jar": "sha256-o8qMflZ0Ngk+SmcD1dSqwC2+o2EG6jL9E2e1beINTgI=",
+   "module": "sha256-zK14mBan6wSIQ0ad+9pkHonhhJ5juCSS8kvGCzBQu5s=",
+   "pom": "sha256-NjNXApnLjlv8KBYedmHSEfODqx4QndQNBWbGr6FDlxo="
   },
-  "org/junit/jupiter#junit-jupiter-params/5.13.4": {
-   "jar": "sha256-OoxjZXFtu2mMDUmgVFbB4a0FxAZhPFUPndUAN4cu/EE=",
-   "module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=",
-   "pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw="
+  "org/junit/jupiter#junit-jupiter-engine/6.0.1": {
+   "jar": "sha256-dHalb0qqtX/C9FmEfNa/txKzvQSprAuJ7ZVz963CxVA=",
+   "module": "sha256-DNBLxyt1p94NOMErkbE3PcQ3OgP+Iv/3oV6MvRyfXfk=",
+   "pom": "sha256-w0n6QNgPtJ/b+0TyYlR2zSa4vpWQQP+or4in/bHiSPY="
   },
-  "org/junit/jupiter#junit-jupiter/5.13.4": {
-   "jar": "sha256-uWD3khfdAchjAxtnjwffRzC78erGUMdK1rDGH6rXg3k=",
-   "module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=",
-   "pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4="
+  "org/junit/jupiter#junit-jupiter-params/6.0.1": {
+   "jar": "sha256-lWbiSbTUx9U6bIkI9XeIXOLUxjE8kWvfv3/7xSa4o28=",
+   "module": "sha256-p9p+0ICwGl76I7bWB/qxxmMhEYc0EXoaVkde/DU7HMA=",
+   "pom": "sha256-sfUTKYkKt1oPR+kBQNZOJf6z57dM5KEHRZg9YViQbnM="
   },
-  "org/junit/platform#junit-platform-commons/1.13.4": {
-   "jar": "sha256-HCXKZB66rkT/OtIcobLvaNDdhL/rB8SAW6eECJm3dAg=",
-   "module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=",
-   "pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM="
+  "org/junit/jupiter#junit-jupiter/6.0.1": {
+   "jar": "sha256-vXrygd/vjcwdCKUDzpMEWXtl4YUKDbgsmattjLEDGxQ=",
+   "module": "sha256-iuvBy0oYWd7uRjDJq3S2/KKMAdpl0h6Z7XgEp7ibGMo=",
+   "pom": "sha256-VICrz2YRG4YweP/+OFMKTcrtJoK9gCtO2VBdrzVleTM="
   },
-  "org/junit/platform#junit-platform-engine/1.13.4": {
-   "jar": "sha256-OQxfd7hCg6ZLZE+IJRs5fgsN67gL3MUPiZiBrs/0Olo=",
-   "module": "sha256-NeT9aOvzFOYmYBSJNkNrOa4QXTVb6qwapU65HCBmync=",
-   "pom": "sha256-lYOVQk9rRhK9edgWXte9+vWmWU9GmbjviTmVyljDwKU="
+  "org/junit/platform#junit-platform-commons/6.0.1": {
+   "jar": "sha256-+IU/RcEPOA3bFXz0KrupsHNHTwXMQDNbWFBV+FU43K0=",
+   "module": "sha256-mS8uNl3Y24i+YC+eXFwI+B/USwxbj6HPFzTzb8fh8f0=",
+   "pom": "sha256-E6l3Y7CJ0P0kyrrGE/d5pyEmm+5VHz5cHbr+mhzQ6tI="
   },
-  "org/junit/platform#junit-platform-launcher/1.13.4": {
-   "jar": "sha256-Cwvq62iAoxFJZB0thIuGNxKIVGlnDBIJlYbX95hSJWQ=",
-   "module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=",
-   "pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I="
+  "org/junit/platform#junit-platform-engine/6.0.1": {
+   "jar": "sha256-9JV3Bzp64YTHGNm0OuDY7cuKv8Wsc4c17jM51GUukr8=",
+   "module": "sha256-2aXeq5puUhW79Aw5/+2pCwZXdPjNAY5Xuyod7OI0VKQ=",
+   "pom": "sha256-oiRe8nBlLAfVls5x2NZw0KipklHNzvRU85ZRmaycTpo="
+  },
+  "org/junit/platform#junit-platform-launcher/6.0.1": {
+   "jar": "sha256-7nWN2wb6sf0aiQwLrkqs+NwATE82fhONv/yxE80J66w=",
+   "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=",
+   "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho="
   },
   "org/mockito#mockito-core/5.20.0": {
    "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
diff --git a/pkgs/by-name/si/simple-binary-encoding/package.nix b/pkgs/by-name/si/simple-binary-encoding/package.nix
index b463e3926b1d..07a577fd5191 100644
--- a/pkgs/by-name/si/simple-binary-encoding/package.nix
+++ b/pkgs/by-name/si/simple-binary-encoding/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "simple-binary-encoding";
-  version = "1.36.0";
+  version = "1.36.1";
 
   src = fetchFromGitHub {
     owner = "aeron-io";
     repo = "simple-binary-encoding";
     tag = finalAttrs.version;
-    hash = "sha256-xqfsJq86qIFBG1542GDWNP0ayGaOzfIZ1KR0s0m8vf0=";
+    hash = "sha256-BP4JsxW1kTmS7yoqe1FdBDKy5bEzr3VYdfoNy9jTDEA=";
   };
 
   nativeBuildInputs = [

From 75d0f2f221e0ef6257ee97e3406f7b2c67580746 Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@gmail.com>
Date: Tue, 4 Nov 2025 11:28:52 +0100
Subject: [PATCH 072/101] ligolo-ng: refactor

---
 pkgs/by-name/li/ligolo-ng/package.nix | 49 +++++++++++++++++++++------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix
index 85f863763255..d7571b1435ce 100644
--- a/pkgs/by-name/li/ligolo-ng/package.nix
+++ b/pkgs/by-name/li/ligolo-ng/package.nix
@@ -2,38 +2,67 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
+  pkgsCross ? { },
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "ligolo-ng";
   version = "0.8.2";
 
   src = fetchFromGitHub {
-    owner = "tnpitsecurity";
+    owner = "nicocha30";
     repo = "ligolo-ng";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ND0SFB0xj4WK6okNzChZWfK5bhNc4PTWuZoq/PodTW0=";
   };
 
   vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk=";
 
-  postConfigure = ''
-    export CGO_ENABLED=0
-  '';
+  env.CGO_ENABLED = 0;
+
+  subPackages = [
+    "cmd/agent"
+    "cmd/proxy"
+  ];
 
   ldflags = [
     "-s"
     "-w"
     "-extldflags '-static'"
+    "-X main.version=${finalAttrs.version}"
   ];
 
+  # This will prefix all the binaries with ligolo-
+  postInstall = ''
+    for f in $out/bin/*; do
+      mv "$f" "$(dirname "$f")/ligolo-$(basename "$f")"
+    done
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/ligolo-agent";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    tests = {
+      win = pkgsCross.mingwW64.ligolo-ng or null;
+      linux64 = pkgsCross.gnu64.ligolo-ng or null;
+    };
+    updateScript = nix-update-script { };
+  };
+
   # Tests require network access
   doCheck = false;
 
   meta = {
-    description = "Tunneling/pivoting tool that uses a TUN interface";
-    homepage = "https://github.com/tnpitsecurity/ligolo-ng";
-    changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/v${version}";
+    description = "Advanced TUN-based tunneling/pivoting tool";
+    homepage = "https://github.com/nicocha30/ligolo-ng";
+    changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ letgamer ];
+    platforms = lib.platforms.linux ++ lib.platforms.windows;
   };
-}
+})

From 15d849e26e55b34c3b4a1a18853c304786857b22 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:56:36 +0100
Subject: [PATCH 073/101] taplo: use finalAttrs pattern

---
 pkgs/by-name/ta/taplo/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 6594a78872ae..e93c892d6cbd 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -9,12 +9,12 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "taplo";
   version = "0.10.0";
 
   src = fetchCrate {
-    inherit version;
+    inherit (finalAttrs) version;
     pname = "taplo-cli";
     hash = "sha256-iKc4Nu7AZE1LSuqXffi3XERbOqZMOkI3PV+6HaJzh4c=";
   };
@@ -26,9 +26,7 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs = [
-    openssl
-  ];
+  buildInputs = [ openssl ];
 
   buildFeatures = lib.optional withLsp "lsp";
 
@@ -54,4 +52,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "taplo";
   };
-}
+})

From 92671b275b4d3f369abc1838856954dbb80cfdad Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 14:47:34 +0100
Subject: [PATCH 074/101] taplo: remove `with lib;`

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

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index e93c892d6cbd..5380ba690547 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -45,10 +45,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
           --zsh <($out/bin/taplo completions zsh)
       '';
 
-  meta = with lib; {
+  meta = {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "taplo";
   };

From 9437f10f613d32eae8dff0f9c76adaadf7ca6185 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 14:48:15 +0100
Subject: [PATCH 075/101] taplo: add versionCheckHook

---
 pkgs/by-name/ta/taplo/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 5380ba690547..7ef4800ba1c3 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -7,6 +7,7 @@
   openssl,
   withLsp ? true,
   installShellFiles,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -45,6 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
           --zsh <($out/bin/taplo completions zsh)
       '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";

From 533e31e26b1fac6f751996476b41dd28f3d68b8a Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 14:48:48 +0100
Subject: [PATCH 076/101] taplo: add updateScript

---
 pkgs/by-name/ta/taplo/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 7ef4800ba1c3..b0d1e2a22329 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -8,6 +8,7 @@
   withLsp ? true,
   installShellFiles,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -50,6 +51,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";

From c8b6a04378e7634daa2307f93daf246697cda870 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 077/101] taplo: add defelo to maintainers

---
 pkgs/by-name/ta/taplo/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index b0d1e2a22329..c50de7ee18ca 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "taplo";
   };
 })

From 5f62afdbc265ea7ef31c49a82cbba7309c17bbb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 14:04:43 +0000
Subject: [PATCH 078/101] gotlsaflare: 2.7.4 -> 2.8.0

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

diff --git a/pkgs/by-name/go/gotlsaflare/package.nix b/pkgs/by-name/go/gotlsaflare/package.nix
index 789593ea0d84..4061de8a3808 100644
--- a/pkgs/by-name/go/gotlsaflare/package.nix
+++ b/pkgs/by-name/go/gotlsaflare/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gotlsaflare";
-  version = "2.7.4";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "Stenstromen";
     repo = "gotlsaflare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yf3Z+qO3nF1XgDC0ocbNpUJUvwfhw60F5Y5yG55LsJs=";
+    hash = "sha256-1CvPQdaJJbh+Dsibgwan9T7yLiH+fTfAYtv1Rkuo8E4=";
   };
 
   vendorHash = "sha256-d+79m6K1+fy3vyXLKvwNx6mFiO3UO9lHJ07364jVJYM=";

From 583db869be08689b4356ac0d3cefca57a7ce8fa4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 10:52:00 -0300
Subject: [PATCH 079/101] telepathy-haze: drop

---
 pkgs/by-name/te/telepathy-haze/package.nix | 42 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/te/telepathy-haze/package.nix

diff --git a/pkgs/by-name/te/telepathy-haze/package.nix b/pkgs/by-name/te/telepathy-haze/package.nix
deleted file mode 100644
index 56ff4ef9c293..000000000000
--- a/pkgs/by-name/te/telepathy-haze/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pidgin,
-  telepathy-glib,
-  python3,
-  glib,
-  dbus-glib,
-  pkg-config,
-  libxslt,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "telepathy-haze";
-  version = "0.8.1";
-
-  src = fetchurl {
-    url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-${version}.tar.gz";
-    hash = "sha256-cEvvpC7sIXPspLrAH/0AQBRmXyutRtyJSOVCM2TN4wo=";
-  };
-
-  buildInputs = [
-    glib
-    telepathy-glib
-    dbus-glib
-    pidgin
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    libxslt
-    python3
-  ];
-
-  meta = {
-    description = "Telepathy connection manager based on libpurple";
-    homepage = "https://telepathy.freedesktop.org/components/telepathy-haze/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e4071c5bcc9..9a0291c32612 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1467,6 +1467,7 @@ mapAliases {
   teamspeak5_client = throw "'teamspeak5_client' has been renamed to/replaced by 'teamspeak6-client'"; # Converted to throw 2025-10-27
   teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27
   tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
+  telepathy-haze = throw "'telepathy-haze' has been removed due to being unmaintained and broken since 2023"; # Added 2025-11-04
   temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26
   temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
   temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04

From f1d61d9f309249fd1cab4cf029276d38aeff80cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 14:47:37 +0000
Subject: [PATCH 080/101] cocoon: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix
index 35948e1380cb..4bc273b76ee9 100644
--- a/pkgs/by-name/co/cocoon/package.nix
+++ b/pkgs/by-name/co/cocoon/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cocoon";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "haileyok";
     repo = "cocoon";
     tag = finalAttrs.version;
-    hash = "sha256-9gJj+edTGkQsHH72F2f7A6EWDet+k38+8UZ1KN2UGT0=";
+    hash = "sha256-2zvbPhvYoKlQTZDjpo6LRr9DLKzSmcH0qnU1oJ+7k04=";
   };
 
   ldflags = [

From 69295e32f8cb571aaff9466842a4dc5c55397eb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 15:02:09 +0000
Subject: [PATCH 081/101] olympus-unwrapped: 25.10.25.02 -> 25.11.02.03

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

diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index 4845f0abbc9e..b49bc930d789 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -31,9 +31,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "25.10.25.02";
-  buildId = "5257"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "026231884815cdda170157b8006852a10c2bd361";
+  version = "25.11.02.03";
+  buildId = "5271"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "79673980d47003d9756b373001a9f57c267acbfb";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -44,7 +44,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-YfFRi8vWGLJcXrVvYRfokgdFXSys3lRZDK6ggAxxllA=";
+    hash = "sha256-KMGSAIYNlzWK9jvn7QTmxUQRNjn0VQU5kLVzTc9mzf8=";
   };
 
   nativeBuildInputs = [

From 2ae599d7863e5793a44388957c0a63addfb823a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:09:30 -0800
Subject: [PATCH 082/101] python3Packages.aiohomematic: 2025.10.5 -> 2025.11.5

Diff: https://github.com/SukramJ/aiohomematic/compare/2025.10.5...2025.11.5

Changelog: https://github.com/SukramJ/aiohomematic/blob/2025.11.5/changelog.md
---
 .../python-modules/aiohomematic/default.nix        | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index 363dbf4fc3ce..b5c0f4bf18fb 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -16,21 +16,16 @@
 
 buildPythonPackage rec {
   pname = "aiohomematic";
-  version = "2025.10.5";
+  version = "2025.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "aiohomematic";
     tag = version;
-    hash = "sha256-DgLeshxPo2ZwQXe8pSg81kFLviEWKakOY8DtdQH/H58=";
+    hash = "sha256-bqhuh+9rcqKreZCc3WJPFR1i3Y8mjtLER/bLlbMp6xc=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==80.9.0" "setuptools"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -50,11 +45,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiohomematic" ];
 
-  disabledTests = [
-    # AssertionError: assert 548 == 555
-    "test_central_full"
-  ];
-
   meta = {
     description = "Module to interact with HomeMatic devices";
     homepage = "https://github.com/SukramJ/aiohomematic";

From 2d8969c8c1c1adee2de15b507beef834cf99b93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:09:51 -0800
Subject: [PATCH 083/101] home-assistant-custom-components.homematicip_local:
 1.89.1 -> 1.90.0

Diff: https://github.com/SukramJ/custom_homematic/compare/1.89.1...1.90.0

Changelog: https://github.com/SukramJ/custom_homematic/blob/1.90.0/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 27863dcaf353..c0d5320eb45b 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.89.1";
+  version = "1.90.0";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-40t64RAJy/isLfcP71pKiqh3cFXy/s1Mv35NosPnh48=";
+    hash = "sha256-tdOxZWofsb2loN1ItQNeEwjIR4divLidyiyAgze6hqw=";
   };
 
   postPatch = ''

From 810b9ba51da5c95f1adde03f8b96be140c017d48 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 10:59:03 +0100
Subject: [PATCH 084/101] ci/github-script/bot: improve parallelism

We used to employ the worst strategy for parallelism possibly: The rate
limiter capped us at one concurrent request per second, while 100+ items
were handled in parallel. This lead to every item taking the full
duration of the job to proceed, making the data fetched at the beginning
of the job stale at the end. This leads to smaller hiccups when
labeling, or to the merge-bot posting comments after the PR has already
been closed.

GitHub allows 100 concurrent requests, but considers it a best practice
to serialize them. Since serializing all of them causes problems for us,
we should try to go higher.

Since other jobs are running in parallel, we use a conservative value of
20 concurrent requests here. We also introduce the same number of
workers going through the list of items, to make sure that each item is
handled in the shortest time possible from start to finish, before
proceeding to the next. This gives us roughly 2.5 seconds per individual
item - but speeds up the overall execution of the scheduled job to 20-30
seconds from 3-4 minutes before.
---
 ci/github-script/bot.js           | 28 ++++++++++++++++++++++------
 ci/github-script/withRateLimit.js |  4 ++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index fb5e79e54239..fd5d4fa6df31 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -496,7 +496,11 @@ module.exports = async ({ github, context, core, dry }) => {
     }
   }
 
-  await withRateLimit({ github, core }, async (stats) => {
+  // Controls level of parallelism. Applies to both the number of concurrent requests
+  // as well as the number of concurrent workers going through the list of PRs.
+  const maxConcurrent = 20
+
+  await withRateLimit({ github, core, maxConcurrent }, async (stats) => {
     if (context.payload.pull_request) {
       await handle({ item: context.payload.pull_request, stats })
     } else {
@@ -625,11 +629,23 @@ module.exports = async ({ github, context, core, dry }) => {
             arr.findIndex((firstItem) => firstItem.number === thisItem.number),
         )
 
-      ;(await Promise.allSettled(items.map((item) => handle({ item, stats }))))
-        .filter(({ status }) => status === 'rejected')
-        .map(({ reason }) =>
-          core.setFailed(`${reason.message}\n${reason.cause.stack}`),
-        )
+      // Instead of handling all items in parallel we set up some workers to handle the queue
+      // with more controlled parallelism. This avoids problems with `pull_request` fetched at
+      // the beginning getting out of date towards the end, because it took the whole job 20
+      // minutes or more to go through 100's of PRs.
+      await Promise.all(
+        Array.from({ length: maxConcurrent }, async () => {
+          while (true) {
+            const item = items.pop()
+            if (!item) break
+            try {
+              await handle({ item, stats })
+            } catch (e) {
+              core.setFailed(`${e.message}\n${e.cause.stack}`)
+            }
+          }
+        }),
+      )
     }
   })
 }
diff --git a/ci/github-script/withRateLimit.js b/ci/github-script/withRateLimit.js
index efc63057beb7..d1b1c756ea09 100644
--- a/ci/github-script/withRateLimit.js
+++ b/ci/github-script/withRateLimit.js
@@ -1,4 +1,4 @@
-module.exports = async ({ github, core }, callback) => {
+module.exports = async ({ github, core, maxConcurrent = 1 }, callback) => {
   const Bottleneck = require('bottleneck')
 
   const stats = {
@@ -13,7 +13,7 @@ module.exports = async ({ github, core }, callback) => {
   //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
   const allLimits = new Bottleneck({
     // Avoid concurrent requests
-    maxConcurrent: 1,
+    maxConcurrent,
     // Will be updated with first `updateReservoir()` call below.
     reservoir: 0,
   })

From 1197fe48da1d45506a3e95702ce5fb6437368598 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 11:02:32 +0100
Subject: [PATCH 085/101] wprkflows/bot: increase frequency to every 5 minutes

This makes reactions to merge comments and all the labeling a bit
quicker. Lower the number of backlog items to process per run
accordingly, so that we don't really need more API requests for it.
---
 .github/workflows/bot.yml | 4 +++-
 ci/github-script/bot.js   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index beb79b82c941..b60e9d5c2ed6 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -7,7 +7,9 @@ name: Bot
 
 on:
   schedule:
-    - cron: '05,15,25,35,45,55 * * * *'
+    # Run every 5m
+    # i.e., at each of the listed minutes, every hour
+    - cron: '02,07,12,17,22,27,32,37,42,47,52,57 * * * *'
   workflow_call:
     inputs:
       headBranch:
diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index fd5d4fa6df31..783d59ab51f4 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -587,7 +587,7 @@ module.exports = async ({ github, context, core, dry }) => {
         state: 'open',
         sort: 'created',
         direction: 'asc',
-        per_page: 100,
+        per_page: 50,
         after: cursor,
       })
 

From 5f2b97539d1ce581d6b3eb92a711ca5d6a1865e7 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 12:14:37 -0300
Subject: [PATCH 086/101] niftyseg: fix build with cmake4

---
 pkgs/by-name/ni/niftyseg/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix
index 1c7d59328a45..f2b415277c3f 100644
--- a/pkgs/by-name/ni/niftyseg/package.nix
+++ b/pkgs/by-name/ni/niftyseg/package.nix
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 2.8)" "cmake_policy(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg";
     description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation";

From 7163a78890fed8cf9c09cf48d0fe6d1b2acab30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 4 Nov 2025 16:20:06 +0100
Subject: [PATCH 087/101] breitbandmessung: update to electron_38

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

diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix
index f85c107c54db..f52dfb233f9b 100644
--- a/pkgs/by-name/br/breitbandmessung/package.nix
+++ b/pkgs/by-name/br/breitbandmessung/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   asar,
   dpkg,
-  electron_36,
+  electron_38,
   makeWrapper,
   nixosTests,
   undmg,
@@ -13,7 +13,7 @@
 let
   inherit (stdenv.hostPlatform) system;
 
-  electron = electron_36;
+  electron = electron_38;
 
   sources = import ./sources.nix;
 

From a46a61e39caa9736fbff66cf9f2437028b6217f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:27:58 -0800
Subject: [PATCH 088/101] python3Packages.aiohomematic-test-support: init at
 2025.11.5

---
 .../aiohomematic-test-support/default.nix     | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/aiohomematic-test-support/default.nix

diff --git a/pkgs/development/python-modules/aiohomematic-test-support/default.nix b/pkgs/development/python-modules/aiohomematic-test-support/default.nix
new file mode 100644
index 000000000000..4121f93725a2
--- /dev/null
+++ b/pkgs/development/python-modules/aiohomematic-test-support/default.nix
@@ -0,0 +1,28 @@
+{
+  aiohomematic,
+  buildPythonPackage,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohomematic-test-support";
+  inherit (aiohomematic) version src;
+  pyproject = true;
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  sourceRoot = "${src.name}/aiohomematic_test_support";
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "aiohomematic_test_support" ];
+
+  meta = {
+    description = "Support-only package for AioHomematic (tests/dev)";
+    homepage = "https://github.com/SukramJ/aiohomematic/tree/devel/aiohomematic_test_support";
+    inherit (aiohomematic.meta) license maintainers;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 41059f238981..f22805eed7cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -296,6 +296,8 @@ self: super: with self; {
 
   aiohomematic = callPackage ../development/python-modules/aiohomematic { };
 
+  aiohomematic-test-support = callPackage ../development/python-modules/aiohomematic-test-support { };
+
   aiohttp = callPackage ../development/python-modules/aiohttp { };
 
   aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { };

From 0727d46778dad622a807e5fa98047ed10542cf52 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 12:28:51 -0300
Subject: [PATCH 089/101] niftyseg: mark as broken on darwin

---
 pkgs/by-name/ni/niftyseg/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix
index f2b415277c3f..4be9dd5fe895 100644
--- a/pkgs/by-name/ni/niftyseg/package.nix
+++ b/pkgs/by-name/ni/niftyseg/package.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
     license = licenses.bsd3;
+    # last successful hydra build on darwin was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 
 }

From 6b21cd238dba101d156803226e4ea31c310ec946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:31:40 -0800
Subject: [PATCH 090/101] home-assistant-custom-components.homematicip_local:
 run tests

---
 .../homematicip_local/package.nix                | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index c0d5320eb45b..f0a178c08d2b 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -1,9 +1,13 @@
 {
   lib,
+  async-upnp-client,
   buildHomeAssistantComponent,
   fetchFromGitHub,
   aiohomematic,
+  aiohomematic-test-support,
   home-assistant,
+  pytest-homeassistant-custom-component,
+  pytestCheckHook,
 }:
 
 buildHomeAssistantComponent rec {
@@ -29,6 +33,18 @@ buildHomeAssistantComponent rec {
     aiohomematic
   ];
 
+  nativeCheckInputs = [
+    aiohomematic-test-support
+    async-upnp-client
+    pytest-homeassistant-custom-component
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # custom_components.homematicip_local.support.InvalidConfig: C
+    "test_async_validate_config_and_get_system_information"
+  ];
+
   meta = {
     changelog = "https://github.com/SukramJ/custom_homematic/blob/${src.tag}/changelog.md";
     description = "Custom Home Assistant Component for HomeMatic";

From a0fbb8805d231c73a25170966958dd33d9663396 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 15:44:47 +0000
Subject: [PATCH 091/101] vscode-extensions.signageos.signageos-vscode-sops:
 0.9.2 -> 0.9.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c942f4b79abc..69bedeaef989 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4217,8 +4217,8 @@ let
         mktplcRef = {
           name = "signageos-vscode-sops";
           publisher = "signageos";
-          version = "0.9.2";
-          hash = "sha256-qlFD8sMvdKpLkXiYT9UybgCvxUJrbXpAcnmPxk91Tbs=";
+          version = "0.9.3";
+          hash = "sha256-fOSLlszr6yLkRC9gy+MCnL+Y/1TXrmVWAWavpvXHj4U=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog";

From d64d5f8aff14bb66279ca45a6bf99d9b1148b229 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 16:05:54 +0100
Subject: [PATCH 092/101] hurl: use finalAttrs pattern

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

diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 107a5a22de31..a4e4f73b97a9 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -10,14 +10,14 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hurl";
   version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "Orange-OpenSource";
     repo = "hurl";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-dmPXI2RHEi/wcdVVwBRtBgNXyBXFnm44236pqYjxgBs=";
   };
 
@@ -55,11 +55,11 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command line tool that performs HTTP requests defined in a simple plain text format";
     homepage = "https://hurl.dev/";
-    changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/Orange-OpenSource/hurl/blob/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       eonpatapon
     ];
     license = lib.licenses.asl20;
     mainProgram = "hurl";
   };
-}
+})

From 07dae33bbda0339e0c08b6c80cd2ffd1a8e8a3f4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 16:08:59 +0100
Subject: [PATCH 093/101] hurl: add updateScript

---
 pkgs/by-name/hu/hurl/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index a4e4f73b97a9..9c3c9a701f9d 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -8,6 +8,7 @@
   openssl,
   curl,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -52,6 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh completions/_hurlfmt
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command line tool that performs HTTP requests defined in a simple plain text format";
     homepage = "https://hurl.dev/";

From 7eb110755b69ae6abe0dafdd81c275e25af2ce10 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 094/101] hurl: add defelo to maintainers

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

diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 9c3c9a701f9d..cd2a3c0c6de4 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -61,6 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/Orange-OpenSource/hurl/blob/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       eonpatapon
+      defelo
     ];
     license = lib.licenses.asl20;
     mainProgram = "hurl";

From ef981af9a9a3c5a5f6185d9c274a948cc6f8fd07 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:40:58 -0500
Subject: [PATCH 095/101] cargo-auditable: RossSmyth adopts

---
 pkgs/development/compilers/rust/cargo-auditable.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 4e253946a456..ea637477cc76 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -38,7 +38,7 @@ let
         mit # or
         asl20
       ];
-      maintainers = [ ];
+      maintainers = with maintainers; [ RossSmyth ];
       broken = stdenv.hostPlatform != stdenv.buildPlatform;
     };
   };

From 685e3a6176136693758d0aa9d8ae5203618cf50f Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 1 Nov 2025 16:28:27 -0400
Subject: [PATCH 096/101] uppy-companion: migrate from nodePackages

This has internal API breaking changes, but has no breaking changes for
users of the standalone server, which is what this package ships.
Therefore we do not have breaking changes, despite bumping the major
version.
---
 .../up/uppy-companion/missing-hashes.json     |  355 ++++
 pkgs/by-name/up/uppy-companion/package.nix    |   76 +
 pkgs/by-name/up/uppy-companion/update.sh      |   28 +
 pkgs/development/node-packages/aliases.nix    |    2 +
 .../node-packages/main-programs.nix           |    1 -
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 1556 -----------------
 pkgs/development/node-packages/overrides.nix  |    4 -
 pkgs/top-level/all-packages.nix               |    2 -
 9 files changed, 461 insertions(+), 1564 deletions(-)
 create mode 100644 pkgs/by-name/up/uppy-companion/missing-hashes.json
 create mode 100644 pkgs/by-name/up/uppy-companion/package.nix
 create mode 100755 pkgs/by-name/up/uppy-companion/update.sh

diff --git a/pkgs/by-name/up/uppy-companion/missing-hashes.json b/pkgs/by-name/up/uppy-companion/missing-hashes.json
new file mode 100644
index 000000000000..b95352dbd3c1
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/missing-hashes.json
@@ -0,0 +1,355 @@
+{
+  "@biomejs/cli-darwin-arm64@npm:2.0.5": "a15bc3bd3ceaaaa65adf6afd29538be7ecaacfa2d7fa798154241de8f38a087b2c1a5fc103f43d3e49381a2b7f13501d829776213263984f580b8599af9b3259",
+  "@biomejs/cli-darwin-x64@npm:2.0.5": "10d3bf203a16de1d91b45419c97146552e07f47654073fc1dfff3cc0bb761561a61ff44b4943e3b46f3beff8a14497e87f33ab18c0a52734cd7ec15691f054e3",
+  "@biomejs/cli-linux-arm64-musl@npm:2.0.5": "d3f9067e186fefcd154325c06d40d52a06b80347024825eba5eb03432d1ad7287d9dced6dc3dc085a82a5f46e8490b39826f77ce847a27d3e2e7a413149e410f",
+  "@biomejs/cli-linux-arm64@npm:2.0.5": "bd2121689d4dab98ad3a7cd01542ec1556feed795e7326f33c1c54dcb0d3043f6a22b5f9a3b1d897c781a2b096cc1b71b7c00cd60e45af6ef486b3c6d4d41c09",
+  "@biomejs/cli-linux-x64-musl@npm:2.0.5": "88e9d8dce4b5240ed85197cdd44af13f2685527af68359f1eccb050f737e29bcd4ea6fa453561b08fea91f6d216c5fafaebf8c33611d1e597cc2cdd18118c55d",
+  "@biomejs/cli-linux-x64@npm:2.0.5": "f5df56a3296bdde562f89b3b637b3238d15ae40701d29a18603686f231f2c3def9ec82ac47c86f290f0504eb0634065e053e268466b99787e622e80b864e850b",
+  "@biomejs/cli-win32-arm64@npm:2.0.5": "5a93662a6e5ce3eded50f4ba8bb3fb38be5df630ac6cbb3a61e6086a05e3d554aaaccc9b709b8f75b573b42d48015a1318efa3b4cce8f82fa261bf09b17dcf32",
+  "@biomejs/cli-win32-x64@npm:2.0.5": "5fbb511151b6d642a7c34a207fb3985eda16a8f11f748e4217336ec99f6bcb99a85eae737ae1dd74ddacc00a60b998bd43cd5701295b2af613ffc2b54e7eeaae",
+  "@esbuild/aix-ppc64@npm:0.25.0": "f9a1263789c799c54255f102aa7e5eb92ff2938e5f1e28d7270ae9388d7f0b07a89c6928201089e9917da3531c3370675cbdf3ee213dbb46c219168826dcbf07",
+  "@esbuild/aix-ppc64@npm:0.25.1": "b7b13c0ba1ad3251586c094b8a62620f3d47ff5b7037ece162a6be0b6219ef7e7af54dd723172f997188433ab767f375ad213cad3d515ea41ab09390d84e726c",
+  "@esbuild/aix-ppc64@npm:0.25.4": "c3d5aaf00899940960a27f93a63d9169efc4ff317f10bc3608291678ce71255d657129061dbfa016a0d16fd7b6bfbeb9d37558e9113432f8ff5d04b8b8e54b2f",
+  "@esbuild/aix-ppc64@npm:0.25.9": "3a1a51a11958a1899d83530f381bc4d8ffc62fd3a2d500392f28dd701650c738a994bdc8df862f6b8666b267f5f91adffcb909be1673bae1277040b6a34b92ea",
+  "@esbuild/android-arm64@npm:0.25.0": "b935e4909cfecaf6166268edb337ac481eb79760230efe9893d09dfffc242915307edc890220ff1fe6378f9a6dc88043971a8282929e21ee92d5bb32d1ff33ad",
+  "@esbuild/android-arm64@npm:0.25.1": "88003e0f79cf75f4d034b3bdf2c0e9e44ad90aa10b6b75b7241e468fb751f5de5610afd4ed9fdc2febf1ddbad16b20bd376cd5aaef694f46a62763ba164e5ea3",
+  "@esbuild/android-arm64@npm:0.25.4": "aa5285109d86607c973ee8d20b582cb444bae31457982dbd3b004feaa4776d145d48a6692537defd8477f2bd0bdf06ff8c7e688dd07fe30b5d031c6dd434c580",
+  "@esbuild/android-arm64@npm:0.25.9": "cd20fb34e2223d404a1710715e3fc259e901e61cf594a4bb0c692525d5bbf91d52a906b9c9e7d7f0292fddffb4d76ec31989fb1cfaf732e6b779d06e728aab8b",
+  "@esbuild/android-arm@npm:0.25.0": "109a800ac79c78770cbc5f76c6ba8d2c3a3324c408748016429b5c8aad211463e33d8c0ed7a740f55d8df7a1bac4e78bc5029521f07e740731b7564c688c2206",
+  "@esbuild/android-arm@npm:0.25.1": "ef86951b4b247fc530180607da8d67671586f02859cd8b6ba922658c34c48135a1729df352308051efb4fd7856e01f60a90f921f4159a56fe9ae9d422ed948fc",
+  "@esbuild/android-arm@npm:0.25.4": "8c5c306e03044527fb2f4eaaeda255d7f40d6a3d02aa9abd1334d67a9ea1a5ab2ab654df77eb7e17e64947c5893e1ba53fc9d3bbefa15f0692e6b56823c47abc",
+  "@esbuild/android-arm@npm:0.25.9": "2b4e144cd6817407d748800548183b7bfee9feac7b77e70d22438c0ee51970d600865f9757f21c2e7adc7289fedf28a7805aa9456ef0a262b606f2fe0f8f5649",
+  "@esbuild/android-x64@npm:0.25.0": "033e21f87df0b0a50b6f54de5ba2dc20c232f008fc62c377c8a359dc27c6d96eaaf57fab8c87c829e36fb49249811bcb0dfb0df958fc2cd1a2311fe443db7a2c",
+  "@esbuild/android-x64@npm:0.25.1": "eb6e9285ea5e629983b065d6cc2bfe882337861fd4491cf497291cb9628b95d498e86bd0ea440e2e3aa9cd0bcb913cdfce6bd75c947b6d0e22bc0ae549ca6d89",
+  "@esbuild/android-x64@npm:0.25.4": "aa8665b302b65ca62e15a34e72e43d1ce7a253a354d8684cbe5ea1a04a79d1323416b46c727d6ab73a76a4ec047fb2859b054f8f80fe9ac1d286a4d00ed754e6",
+  "@esbuild/android-x64@npm:0.25.9": "d9c522016432d1aba5fe248c373f6cc0479685ef08cdb1b002b910393b9a7b178e52a6efede98dff8836ea7595557a2b289090a907ed5346d2643a7554d59703",
+  "@esbuild/darwin-arm64@npm:0.25.0": "d82d5f8b724a77ee7d65b7d47159930015135c7fb0fc7dc3ad056203bb97a1a933f516fd91f0213420a80c0a9ddfec954c952c554edf00629d9bc964313a3836",
+  "@esbuild/darwin-arm64@npm:0.25.1": "34c125754c2103eb497937df842eadf32acd2bc074de0918db43f51913688651003457e8d837cb2aea371db47aefa162a73bcbed7529efb3fce41e162236ea9c",
+  "@esbuild/darwin-arm64@npm:0.25.4": "81b4d0482813ccff8c783035317d78220a4ec3eee3798e50b804a781a071f5790c7903c2f9216a25f5c167becd4c3d78fcf0a13e454b3973eb7d82b7ce1d4688",
+  "@esbuild/darwin-arm64@npm:0.25.9": "61f3de9f8bb8fb67515365ea320d26bb1f1a7e497dc1cd22e2a9ffb1f04cf9b71017ca60b6ff979ec7a854abdda2b58b281bd3070aef3a0fe13bf5831af121b4",
+  "@esbuild/darwin-x64@npm:0.25.0": "ae029503666bfa48c6cbcbc991ac9d841e1f03f056f71782b78e57ac4083022eb505deab330651ee05deab76688cf3139bdbea84caea6491fcaf5caa2b912946",
+  "@esbuild/darwin-x64@npm:0.25.1": "0920b1622909f001028fa9c8978edd53ee3ec3cb6321a50f0b20ce67d5d82ed55a4acdb459800a4fe374bd70b953b51366026756d169a26982bbc3f1a7131f16",
+  "@esbuild/darwin-x64@npm:0.25.4": "633d97f18c299c8da3730ae04831895779b5f1271020cc924e06c6a5f0c5aac9f0653d60cca7d6ac23926797368301cd6ce2059b25f432aa2f1f378fcb34530d",
+  "@esbuild/darwin-x64@npm:0.25.9": "6e7dd258a63eabc10ea93c79b0d33867b19f40d74d8279f81ed67554e39a845d1c4688cbe661f4ef0b7600995537cd7279d0c5e681fe6a71245bd53648eeaf3c",
+  "@esbuild/freebsd-arm64@npm:0.25.0": "9f72aaa0c1845f3ada5a6a1cffa43c7683c25313455aa997ca8b233316a87d163722d8c26a0e86663c5ebbdca6ab91cf1975f0c0e7fbe062087cbef92c666b04",
+  "@esbuild/freebsd-arm64@npm:0.25.1": "5f30c81b55eb9586778e4f832616b2f66d8aaade864ac46e605d33c2b7daa83ef04485830e96cd138375b5b79bd9b765386c3d8abe7d88c2bbecc0ca19a628a7",
+  "@esbuild/freebsd-arm64@npm:0.25.4": "4d52cf4e18e1f4ab2fd80c4c4a9ab9c20658c77d832d33603b5d19b3ed4565ad7186b86e30a92b78aa11694d884201d0914dba649d6277737574896a897a2af7",
+  "@esbuild/freebsd-arm64@npm:0.25.9": "31cea93710c6835c6eaf8db5a6b90295bc6cd570b450773e14afdb06d7eaafa65a85d5687d0e742201c0e1791c6c8d7ad44be8589519d9c2e84cd2995de5eb8e",
+  "@esbuild/freebsd-x64@npm:0.25.0": "b96749a6d7da71fff98309655eb85b09de84416ae5c09a02e803342bba25c81e0ac181212bac49fa8d8cc28bfa5e1fbb8d349f2b4722e2ca2df2e4a383d17935",
+  "@esbuild/freebsd-x64@npm:0.25.1": "9b5086c0ba8a1c8bd19eeb4536f3efdee186dfbc954821e5d8e041d38e4698c2eed46ac95d72018a9914b994f1de12be9f5dbe054994a0a72e4f0dabf9f1a6f7",
+  "@esbuild/freebsd-x64@npm:0.25.4": "af75d6724969c4d831bb09209f4ddb46532516932db98a3e4c5c5dcc7f3cd0fe0930f2875fa901b8bb9c0ecfe0a65313da6127ea9387c63859e5d58cff975e68",
+  "@esbuild/freebsd-x64@npm:0.25.9": "b257a2a3f4bc4de4bb82e630856eb43bfeea858efcf89e585680c385b048df06c05cc320fe3417af80a142c392764af2e21c2c106453a0c9519bd0130885d378",
+  "@esbuild/linux-arm64@npm:0.25.0": "1dbf78595fed87287eccde8fb9a5e35d448ab3b7cd84c03fdfa47c250701a62160d7aa45b4de9ca5e11039975680829644529636bbe254e1627836c5227efca2",
+  "@esbuild/linux-arm64@npm:0.25.1": "202515560459ecb05044e0ae6079c0fbecbe863f35dfa5d2adc2f9e830a543ed6412aa277a79fd1e94d33c499ca5b5984bdc25124268950d8f95375f76999810",
+  "@esbuild/linux-arm64@npm:0.25.4": "72b7e3b8fe3bd27206577f8eceea1e0c289dc01fa2f5b03fe22f4ea27931ca664a9b93b35f9ae424e78552caec76330383fe7dc5afeeaffa0e00645ec143a49b",
+  "@esbuild/linux-arm64@npm:0.25.9": "773aa296a2bdab2274de049ae4d1daf4f556914231a9de06e96e9e9808e5428853aef9271aa3a866a075204b4c71590a5ba5bf3e6183ac4806c59b70ae2c6443",
+  "@esbuild/linux-arm@npm:0.25.0": "b1a165678166d006b32f965cb51719403fdea18c9ec2e498807f0b273b46a3a555b214d5d5f832393471180e1d39ca9f06e7bfe3c2c97c0cbc30314a38b422c0",
+  "@esbuild/linux-arm@npm:0.25.1": "c6fe6372e4870ad2d232c4bfe926c41be76cbd67143df8377320ae38971bc1cea50f342f88a31e54a43c4ca0a84e2c3a1accf780ba630b356b87eb51dc5ee5a2",
+  "@esbuild/linux-arm@npm:0.25.4": "407dcf9e8fc4ebc75689b6257be576047c03285067b5b22db74dd07ae067f8dd9126936dedfeb27934e09d0d700ecb3f8d70876fe61b90d92355f35c2a5d6540",
+  "@esbuild/linux-arm@npm:0.25.9": "564067cc9f949805834bf9a3dd071fc9d4ed77ffa1dda188106fb5b86383a9ff0be567610642f8b778cce90d575a28593db68589f4d9c6b69b7d3feab7a343c2",
+  "@esbuild/linux-ia32@npm:0.25.0": "21a136d8301fac7f23724061832426efddc2f9769b29b37e88443245ed0406f0b1f9bc05a02b6d0cf7b3e2e8ec2c8e1e8d99b3178a01ace6974369930f0020f6",
+  "@esbuild/linux-ia32@npm:0.25.1": "2719e82d4d6718ad034856e1588e9946e7390d8c4e2dbe61cfb6feec15464a999ebee477fa5189fef31517b27816b312fb68f0a496c6e8895989db2c0cbcd96b",
+  "@esbuild/linux-ia32@npm:0.25.4": "47b13c9952c893e749380551dfa3580eb562a0394911a9ced68b23c0cafe116614b30ffd6744dc71ec312fab8bc7115f856f078fe29f1253a1dd99d3215a1424",
+  "@esbuild/linux-ia32@npm:0.25.9": "a29cfea7fe73ad910e40971c82824f7df766c790967cad99aaa459be87333e7d964ff09741af4a52465b26e6a606f54686b394f73dc736ee78b769b43166886a",
+  "@esbuild/linux-loong64@npm:0.25.0": "f87baa1534a52b24198d9d845821f37bec9c4afb08307ee66c3f1d223d3c684151749f4a0eeb96f3905d365bea9f6256787256ff35b9f80fdd51ed7d4f8356b6",
+  "@esbuild/linux-loong64@npm:0.25.1": "ae79c5760e03418100376dbbd89ba21b85b31b5959035ac127c927c09acc097e3f24747e56496ce63f5b4a94a2d5e0aa538ad74060c2a21f4b5d6dfc69bbd7ae",
+  "@esbuild/linux-loong64@npm:0.25.4": "75222fb808060b3f2507aee40c6ee877a1ed768c593dd8f192e1ea640bddf3b414080407ddaccac6d0cde35750a7f92c434e04af2c142075dc810c5b7a7ce5eb",
+  "@esbuild/linux-loong64@npm:0.25.9": "16c020192d6bb3aadc208b5ed84e3e06d79c27f889af1c7be0ec2b876f59b5e868e77e976fe89bd8bb4261eea7fc53a38b9d67a5879773d11b5cba18d3a9f33d",
+  "@esbuild/linux-mips64el@npm:0.25.0": "2bfdec2d2730879795f6884d8f8a38a0297f0cd46bc3357c568fc59432d49d7e26c723d9b8111c799517628cafb469e30fa968387105079aa4b4b4d4192638bf",
+  "@esbuild/linux-mips64el@npm:0.25.1": "00bfc596edb4e20d0c267f6c8874a0e99960ecc24a8f1755ddfa31f472a35dd58de835982e0721a7641ce494b6947cfd271cf933580674c6e4451a371d0723ba",
+  "@esbuild/linux-mips64el@npm:0.25.4": "3f129931a6973a4fa470ddc46e3e3fa150aca64029951fe7a8d9616f41ddf8422d3744a30b0c5f36a35bff19b32b25c85bf1e5760537b329f18558e289213eea",
+  "@esbuild/linux-mips64el@npm:0.25.9": "3c58927449a856c92895591d797224135327cb97cc115dc794fef98b65b7d1fec98f7fedbf71374bc31f045921cb851bcc103f12358047c22be67f7d3ea9c103",
+  "@esbuild/linux-ppc64@npm:0.25.0": "bca7b660b91939b5d9f4942b4f2e404efad88fa166c51ba49474b3b5ba200213e1c44499c419d2b13c5afe01b560f361b46d201acc146d76515b953be497bd4f",
+  "@esbuild/linux-ppc64@npm:0.25.1": "cfab66cdb8ad5fe15ea74ce19b945ef7a9291f252f7f063095e0d718d3be36abcc85f9cac26463865dfa03970c28e7e4e6a93fc75adb405cea492ca6f22ead4e",
+  "@esbuild/linux-ppc64@npm:0.25.4": "6f84018eda99c3f06d519abbdbdf15700707236b8643ba24150d5168062ba310ee3c972645554b05d4b768438697a9a04014bc884a1beb15bf05bbe1b29e34ca",
+  "@esbuild/linux-ppc64@npm:0.25.9": "8479e472067788a0942c662c47a107190284cb1dcb08006c4b548430b99f88eb144447a5a67165443c0816284eb458f2c1344ed887bc00a875614fd6e0719449",
+  "@esbuild/linux-riscv64@npm:0.25.0": "dfb00cd66f717315b9afab667a484c67a69a7a3f6bb9e4662cd3dd0b7465da3feb5182bca414ce0ad0f7a95d0a1fd248c792561c63008d483146eff8af6e678c",
+  "@esbuild/linux-riscv64@npm:0.25.1": "ef46ca2ef7ae0f3f96a795317297ceac2a08d4a4052a133d30722666de8bbae20029ad1ef79c63adce5f66b7afc017bd4611c71ae22d8db34b60170c2b45c637",
+  "@esbuild/linux-riscv64@npm:0.25.4": "c5b674c2f48c5292f594141a4739f9f266ce8a1a2514eaefacc6fac761f1fa6c208981ca4c9e774c383ca33a46cad539b1fa46af6827cf89db721f33c36093c8",
+  "@esbuild/linux-riscv64@npm:0.25.9": "4f65b7e6a7967df2e5608719bf232ef1d39da8015f5b0c090b108469426859739ce96fd0c90c97e3ee49965931a4558765145e8362ba34b7b3cd9993eb971956",
+  "@esbuild/linux-s390x@npm:0.25.0": "4c5872f244ade04c71f1d0f14bd0d3ef0cd24c5404e55e33964fa5ce7b6f2e1283e9d9adb5356db76468cd85724f6cfdb1cd9674ad630344a7d01ca614bf59e3",
+  "@esbuild/linux-s390x@npm:0.25.1": "cd9a4641369c3df48da83895a2dfa66e02170ecee190fa817f03b659732f6b20dceb02dc281cfdfb145a4407e3aea98eb2c0587ff6d161d16de8d7a502112a5c",
+  "@esbuild/linux-s390x@npm:0.25.4": "a54c0972230a2264714371f6545ff0d9b20d349b08e4837e7063378886f88c08ade0ed5b2c7ba744c4679deb2f60e8485ef475f92cdbadca9d34f462a2724cc1",
+  "@esbuild/linux-s390x@npm:0.25.9": "e5f93356bc568aaae6de618428be09dfae4e837ce9a6ef5071972181cce761d10b9c7d3a42cfa8eb3b39e5981333a8a11cf5d1d95e20e193d61d7e15b8c9e268",
+  "@esbuild/linux-x64@npm:0.25.0": "22f6bfbb856653ee8cff0a93ce63947fd3bd4565c8bc7e9d437845fc4b44a2b3954b5e412b4aa4b63e62977beca12e0214b2607c7bc8c4ce359bd10118755df4",
+  "@esbuild/linux-x64@npm:0.25.1": "c73b51929e1dc770b8eb25c93551c6f6808858623647266b49a9aacbbf0b68ecffa6cb54bebd5b8c14c498a42a7631081033de6be4a35ff049dfda37e52fda3f",
+  "@esbuild/linux-x64@npm:0.25.4": "1ba32d40895c826e6990157a141e23d68fdf00b46d60ef3572a89781f177df75e023d38b130087b167a6e38410c3af0a6bec7b2d3b1af2a37a21c1ed70dcba45",
+  "@esbuild/linux-x64@npm:0.25.9": "68f9b2a672b1dfb552b360826a6c3cf174169456f5c1d7dbd6a8aa94c9b9c286feffbe8edb5cd1e970783d58d094fbffa132f0a9d639032acfed2528e6d3a4c3",
+  "@esbuild/netbsd-arm64@npm:0.25.0": "a8286e8b687857779047d005d4a540a693a2e173893a34273773d0272e9908006e10085a52788f54775ca231ad231e8a7af9270dbd8203b9182dbe2c7fee68b6",
+  "@esbuild/netbsd-arm64@npm:0.25.1": "a094af97cb886c65034445492d0679588e66daf0317c3567da2b529816154a581944e18888d2515cf543be4c4b7a1509ebcc7871d01c2ac66b9f53f56af5ea8d",
+  "@esbuild/netbsd-arm64@npm:0.25.4": "37bc10864f14c60f995e2ef13bb53102d0ce0eab1d32dfe5f48254aafe6d791d7129cbb00c6acf9e32b561db5420c5558b84800cf6958d40d3d55a7e3f456ebb",
+  "@esbuild/netbsd-arm64@npm:0.25.9": "825f875bd799219eef2bb130cc1c70c387225851f17331143ab46834818a5331cae2d29dbab14ed7183e027c57f1472220a8a1becf27813c87b50442598e4ee9",
+  "@esbuild/netbsd-x64@npm:0.25.0": "e618540e5e086cabc260010e62110a8afb5b0dfc445e5cd6db843d8a7541403decee971265c5cf59e6f1268b03e8fb50e27b65f709faf647c4e20e0916f19621",
+  "@esbuild/netbsd-x64@npm:0.25.1": "7461fd218fc88ae4b6534573bc84af995be0faa5b5dbd8be2635c12bb0d74c7c860487fbc07fd0487d4231fc3272f02f5db180d6c79e632f6e8f33138b626462",
+  "@esbuild/netbsd-x64@npm:0.25.4": "6875cc83961e613dd28f1c1d5c3b7404dc7cd4b54071596712c56574b1a24517424483c7c363c0aefa8259cf2d621e080b8270c0c242010ad04ce367aa87e897",
+  "@esbuild/netbsd-x64@npm:0.25.9": "333f27d61b99fb2388ee9d0317089069bdc890f0a91092fcfd7012766b2ef3c0ba499057a097657fc77707e9491d647cc8f07e6b93d31f2856b09fcbd0d78fc6",
+  "@esbuild/openbsd-arm64@npm:0.25.0": "60cc4ce058e03389155dd34f777d4d5cae1fb62f9bb9659c615ce5d70e8093a58aa89a9ebb8fde4d2dba56e5771c6aaf4442db45f4a1c9d54d6c36a149b857d0",
+  "@esbuild/openbsd-arm64@npm:0.25.1": "014da561c510c2f80a2917560a0d24af8a951cbb60fc54fb8b03361ce1fb2e9c8baa361e970509db4f4690fb039a564fa5393c781042ba94a76681871e787f75",
+  "@esbuild/openbsd-arm64@npm:0.25.4": "a7981586bbfea74746aa87113089020c73677209b71fadab43e6693c141b9415c342df01694e70aa607a1e80e9e37ccf4682dc2f095cae1ffb60c740e63e7d32",
+  "@esbuild/openbsd-arm64@npm:0.25.9": "ae8ca7bed39cd8d9788e9d4c3f066ec11a51bfba534be975d24b8c64d3daf9af95c134b80143d3bfcc9ae7a0967f1ab3f06850f76ad8ea1e85c531d5b241528a",
+  "@esbuild/openbsd-x64@npm:0.25.0": "7ba16accc220c711d1bcbb17ada40de4503f9ed54b8a42957345a8a9b9a7c55eac550b234c6a5a812acf50386f2972fb6a5b0381b38f76cff4b3c44ba38ae1ac",
+  "@esbuild/openbsd-x64@npm:0.25.1": "bc500e5610f6584c2c8412e9b9f2df827b83a91f0d3c04a91b6d031a2c7f0ee45b37984b4a7d2299c54e6188e6dab551f71bb38331e7fbb91009a8bc9852ff57",
+  "@esbuild/openbsd-x64@npm:0.25.4": "7b1bf4a5032e32ed3ce33bf9373964bdf29e49b0e16179e179d7c7dd0a36dbc6ee98ba67e0ef637ed7823b3ac094e21ccde848a066deb091bacc6ea4726a2ede",
+  "@esbuild/openbsd-x64@npm:0.25.9": "e6f601057b127cc2f168248071fc5cce3663b0ade4d8603f75e7e9660e5a2aeb307d786593fcd9572e7577211ab3e7b839e7e572b7cc55d41cd5dd8d46d86942",
+  "@esbuild/openharmony-arm64@npm:0.25.9": "c75a51c729b67314c6ea9b7388b1bc510d1a8353da965c5703669accb4718017202ca8695a1583f42a6761c873ee04f986e038cca54d9ce57e49bd7118b959b8",
+  "@esbuild/sunos-x64@npm:0.25.0": "e6cbfb0a93b9f78ef991ff43af2ab33faacf382d9b8db44bf53a80b3fc27a9d0f598061b9a77de1db9481d69fd43a3fd4b20a40a2938923fa52cabdcac84e972",
+  "@esbuild/sunos-x64@npm:0.25.1": "d915f595373916b96c6f531a45bfb04297ce199d4c8d86e1c980e6508af157b25e5e6d19a7b4bc05a657d08bdfbac099457bccd624c6da574e8f5dbbff9f0ce6",
+  "@esbuild/sunos-x64@npm:0.25.4": "e1807f6dbd3bdf2f1ff9dc404fe0b667dea3bb03825344728de264c4f15323e99e3f1d8125b5c39e2aae94d2c1cad344e3b8a77b5e8c8e0004f09aa12daa82d9",
+  "@esbuild/sunos-x64@npm:0.25.9": "22216cfed4d97193531a44b8db408081c210ce8366fda7c087f5c2f353b00236e9404ec6beac76685d422a6e971310c7185f8c8ab704414849f902ef32c1e426",
+  "@esbuild/win32-arm64@npm:0.25.0": "47bd8e32c90da8472515ddc625e6284cf745b1b9eeecf16e2e699b94b3d11c2d773b16944c8de33d857a8e59426601063a3df04433cb670ed3e8421def07d96b",
+  "@esbuild/win32-arm64@npm:0.25.1": "be20428d1e4bdd2a3e77e30127f8fb24fe073f7317b9aa3474d8a59a6e832bb93c323128a8f10841ba2d3838d7d8f8bb2bebf90ef196087f766d5a32f81c642d",
+  "@esbuild/win32-arm64@npm:0.25.4": "0422de25c136f407bc223e1a9a65a6f528e64201a1b06b7ddcf3190045914c6d68f550a8190d18e58c4e22231acc4c7982d45bd5ceab6a739e2c539d135376fe",
+  "@esbuild/win32-arm64@npm:0.25.9": "bb6e3e9c5acb2a2e5136c9af730f9171c83ca322add74aba54f960b0def02413f3f61d40d4cc86fa5cf867ebed7d9e9517eb50e5d7d7d407c5bcf213546d66ab",
+  "@esbuild/win32-ia32@npm:0.25.0": "072874686fe049446bba0ec18285414275ac74e8232307a856966ede8a822e72ab9f6119f7352f8feb51c629a20065dbc88f4412120480fe5bcc039dd439d0a7",
+  "@esbuild/win32-ia32@npm:0.25.1": "7f3fa011cc38ba05c31d07e89eb19aa1587720d8dc44df727e5d14b02d5b2a238297e88597cbcbba4fa2b8c9d4f2f96124020114b4981e533fedd8a8e2fe27bb",
+  "@esbuild/win32-ia32@npm:0.25.4": "5a8738ba94c72bc07bd17952cb5ba7f7f13593687cfe57792d36fcd9809082ac95ceb54b7739da68044de01f6d5d6826a2587ea2bce48b0de1c70f8de9b5257e",
+  "@esbuild/win32-ia32@npm:0.25.9": "807108b8615459830afe5a57656806641292e22ad53fbecded0d9b4113c5e6ab697f57553601defee1fec6acca0a1d0671e193ec5e396fb268e672ca6127a2f9",
+  "@esbuild/win32-x64@npm:0.25.0": "ce021c1bb895345ee30f363d89e1f3631040fb44d2e27e614b65dc697090c30c5b66b80aa9d6e5e3b3153010b37e523d6ef34c7b4f2248192b1b4bdd30701b3f",
+  "@esbuild/win32-x64@npm:0.25.1": "51a470813dd92d7ca58bfd30a2d94d7ce7a363f750df8164f359ffe28caa270d36ffae3aa8407eddfa5b214d173ada1a121ccf19c5d21fc36092634b9e5fea17",
+  "@esbuild/win32-x64@npm:0.25.4": "0bc72a7dc50b20d2cb7cd38a0d85ab3ff0c6467ba7d817a74da8c671703f97c7c7f7a7375d0069c3f0a76571dc04a1072852e711131cf4d1a62a70e7a38449db",
+  "@esbuild/win32-x64@npm:0.25.9": "8da054c6f1c7e3a0b59fc953a893b37aa32b9be22d47ef781cfc07006a8deb7c2435582608ce1a87c643c08c740f15565a9550b96a23f6c755775e9cb74cf8ed",
+  "@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f",
+  "@img/sharp-darwin-x64@npm:0.34.3": "57ccfecf25b6e21b3df16694a959200ee6d00ac150bf4c5e3787bedfa8f944cbc95c7130fb6d66b207a0bd987e30f302b67de35a7481909b9bc175581da1be6f",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "77a6a47fe9cbc1e6d1c66fd3f617bc64a8b710ed7cb44eee64409d49456dba054495e5ef8de3442e655ad11263ed19df554e9c33c2976e3226c121d826188587",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "334c823aa129365e7f71b3467fb3c37e7a0065d7cf192b08b2bf85d400a568da42cb236dd238ff35670f296ec5b81f08415e11c257e1c8b8df680923c3acd72a",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "c8e7d5641ed6d1a406d08b45536fa6a9e221024bad1b3b6e7e16942500c5ca3f5ae444ac141a61ed9b43f6f7e73ee66bf973e24a90fd94dfcf83d4617492c085",
+  "@img/sharp-libvips-linux-arm@npm:1.2.0": "9a854fff624303ed4bfdc7e936af47b3c6b07e486d0b366c8881306d49766b8e972c5a26fa53288b00f4b92a019b374bb66106c9d34f6fb23489cde5b861d2e3",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "bd4e956d5f01efc158e992047460be6b8cddb9f89cdd02f4e377a178da1703ed12125f161ec2eeb99de9d11232333bf501bf5e70b85e0e6f94f1cddf7d5fc954",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "6ed6d891c2ddae07fff09290b24c1ee3531264dcdb0d0d461279fa2168c196490874f84d5b5fa045a3063e76957fee0bfa765860db486779e3acb68ab743400d",
+  "@img/sharp-libvips-linux-x64@npm:1.2.0": "2a80a045237e56c5f4ec2b5c4febe9d95066beadff06bd936439f34bdd615205346dbbf996b5b4d1e43af6a128cdfd4b1a76d6fb36d9eb62f61a7248fb242728",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "4225b0af93ec3a600f81930bb0ac70671cb76917a033f5ac6033252a79dd04c54b1d1bf602f79877efd07d9382106d8b2058b7c9a2bfcb7beabb6861eab0879a",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "d2a47388c6d1ff90bd85fa0a93f8bf9c5855c2834736bdd78d47d12689e3bcd41c695788c6bef9a8e1c5156951a675e22dc51a0ddf35a7d56c96cae3e9f55688",
+  "@img/sharp-linux-arm64@npm:0.34.3": "a4ec64134484037e6a1583b11e39a16afb95eff963bf9c52deb17557b0a35dbc509325368040b04939e859f3b9531d64e6405fe54d13b3633628a4f77bfd8672",
+  "@img/sharp-linux-arm@npm:0.34.3": "fe4106211c93c566d3712302c081391435caaeb6ecd41e88e94e3e9780d0f27934a02a871d6280625944f625350c4f81871d92210ff6ae5511318248a4ba3ebe",
+  "@img/sharp-linux-ppc64@npm:0.34.3": "0671ccb3a25e53a665d50b2b52cd779b57a07f642686bbb7311c288c44b2d861cd1eacf6bd6883421c73cc5efc8fa8536280dd48fde9a6de8d287e4a99c9ab69",
+  "@img/sharp-linux-s390x@npm:0.34.3": "a5e2c3c14faa997616caf0a9296302c58b9565bb24f156dae7ad1770f5f984919fb34a0d1f59f0112205db060e8bc665842fd27621147786893619c51b81af45",
+  "@img/sharp-linux-x64@npm:0.34.3": "83a82d1a97b975b64be0ed6fd35fe87609ffcbfb7a068a7ea0e67dba7ecd71f32382b86a024bcfda8aceb4ed1628f4ee4a567c4e157e9cd3c9fafa0b225fe6c2",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "53f9f3f673441b21ea0a8d6d95b7ba8f051d4c2d2d4c4cb0fd83bb7593a56f854b255a1b706ddd376f8003adc6431b602afbb8a1ffe0850896147b24912a9504",
+  "@img/sharp-linuxmusl-x64@npm:0.34.3": "ebd702f0f88121b31e87db93a87839085605a02826aba5207e9ad4fed89471daf0e32276ef3e13dc289e53042baaa8244bd43c0768c0733e3a4fce02fdf30dab",
+  "@img/sharp-wasm32@npm:0.34.3": "3a64ba7dec1883eaae60925d77b04322a81d9c2d39359fa021677252df7da3be72f469a298cf2470f7350553eb30ee84e874d7032b06fa91ce27a81e1ec5f6c7",
+  "@img/sharp-win32-arm64@npm:0.34.3": "9328ef81ef6df02a8f83123f59c0addea7dd12681af3068e677ac274ed238321dd5522f2e4157b1a53ee0bc27ea22733263dddf5d4b65d2c5a2533ffb724f81e",
+  "@img/sharp-win32-ia32@npm:0.34.3": "cf08bf95ff895c831bd74c7c4567d6c4ac20100e0d1badd0a9f7100486f3f416022222e29fcbae79b379defd1f0bc13adccc16c119fd4705d00c11c35ca9988a",
+  "@img/sharp-win32-x64@npm:0.34.3": "07078e460f2749ad6422135193bacdfea1f223fab9f8442b5c0cbecb6d3e92070dd0a968219ff386a03930ec4104162627ffcad5b362ec8dc0247848deb52bbc",
+  "@lmdb/lmdb-darwin-arm64@npm:3.2.6": "24aa52f4ec93c28e0c42b4409308f04c641103e7d5378640290093c886f0d7f661b6bd0fce865898f4c81c0eec1b84dcb55151cef037ed5a003dcb821b637da1",
+  "@lmdb/lmdb-darwin-x64@npm:3.2.6": "c10346c9c46f5cbc20e37bbad94c13a152483e2252ed9c066f9cdab9fb94c3e2461cb483271bc423f538a79fff9b31053952be99ca6429c2d2f9fe61adf6ac31",
+  "@lmdb/lmdb-linux-arm64@npm:3.2.6": "1d8a8d6a3723a4337c42dbc8b331fd010bcc8ee440d5cba9ead1cd733a0fe445f30440774b0c01ac3210407fa0dbadbbbb0648ff567369161a353a129fe09598",
+  "@lmdb/lmdb-linux-arm@npm:3.2.6": "c0099392b863e0f079e0fb3cce6cbba93506531d998ace175566dfb8e828ac6938bfd84a7f076b842f1e033b1f3069a4f627391962f845f88604631d30519c70",
+  "@lmdb/lmdb-linux-x64@npm:3.2.6": "498a9c325ebb9678852b6165a5bc7ef14c399b078a390212fd90c37ae2dbfe8475c79b6e364b013dd9725391e5912a421d2fd8f035c5cf6a83c831ca6c9e7010",
+  "@lmdb/lmdb-win32-x64@npm:3.2.6": "825c811162a90f6f74ef5b66f6db256fe3ba25163594c4b4ec59e30ff5eedb2c1d993b043674984b03f46259baf364b32af8f2c3c2b12ed399cefb033549693d",
+  "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3": "ce4bfbfa35187ff8ec3c89a1cd0ee4563b811e8990d2dc2b90da7607de6a653482c780b9f7b670716850cf58834d106c1be11802a7aed45f23e80f4ec61901ad",
+  "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.3": "43cbd79892d9974070243ef89205eac56893fa5de06b6c6a6ac31692d59e53091b7b500bed7cb68920eceb4091318b2528e676de5264d1de86500da97216e82a",
+  "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.3": "d1261cc5bad94ae873f4b0b963d9025f738d04691dce542f9caa9848248ef8fca483d11dbd8a9cd318b2c41bf8dd74e63ad12dc7d187b88f912f61be3fbe3b51",
+  "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3": "5f94c97a3fb9d8a69edbd36588a4b24b11048e156489fe1160cd15d61e283759c068f510f0bde8ba5f9dffeecb2cc5e77211b8a3237fce99dfa4a5e288c0d583",
+  "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3": "f950a67e371e80de9cc2b19efbe191b027340314aa19d2384b12036cfb393de4a703845a36b27e8eb01b2eaae4d974c16dbf16d44b977f1dbb528896c555b6df",
+  "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3": "edb796b289b77f286cb3b59b794e13b67f963c04f1c1f60199365f1ab763a6fbee26d33d4bbfefdc4d6ea6bd5ed0ffb51d49e5d624b6f8233ba4fa1060d4b38a",
+  "@napi-rs/nice-android-arm-eabi@npm:1.0.1": "ad03e9ad3e47dc38be026d83fb0538f8ab5156cb0b47c2e88b029aef1d65c8b83fcdae5c8ca612ba5852bae333c379ef3f195ffe86a8e84d48696f716eda7364",
+  "@napi-rs/nice-android-arm64@npm:1.0.1": "d9283d174af5c076f13f8b08ba012b7d1e5404e681b2da5c6e51d73130a723b9dcf9de601b41524bf4ccc0e554929c9d159d92c26b5343e25b419b4c1ffec6df",
+  "@napi-rs/nice-darwin-arm64@npm:1.0.1": "d2c013a1d8d7bba15bff8554a0dd5c5cb3718ef9a9dfb7e8219e739422f1c6ea32689a17525d529bc3316217c26f16f2ac9ad8fb22eaa502b1dcd03276492e8f",
+  "@napi-rs/nice-darwin-x64@npm:1.0.1": "7bff05ac82335364cc6f0711cdb80c3e802dfc879e0aff091a2e6c8ac6d62d1b80f77daa67a0a493c9df7f239c598bdda307e1636bbf6d81d2c9bdec2632b9a7",
+  "@napi-rs/nice-freebsd-x64@npm:1.0.1": "f3c00d7dcef69b874f7e155cec696c05c481a019b8a40aa57da0ee67cf33433b30dfa2a1ec8d17d89b90992fe29b23692c0dcbfbded5a7ff6de8fbf970b1320e",
+  "@napi-rs/nice-linux-arm-gnueabihf@npm:1.0.1": "e6491e589bb5be58d8f0e2114156036fe92c34dffac9297076bec031d6738a53657b87ab8072595c36659798de57207359cdb3903703af8358934088bcf3e61c",
+  "@napi-rs/nice-linux-arm64-gnu@npm:1.0.1": "1fd7d01c10ff497d7d37749f2de8c602ed28a9145c693bb3676fa57d1789fe145fb5acefbbb46c5e386dbdc33d5f66e448a1ac4d7fcc80c46c5e2778d0119224",
+  "@napi-rs/nice-linux-arm64-musl@npm:1.0.1": "bfd1b4b02da0c5e4d71e8fd0bc8be0d1af344fabc63565d5ac6b8212cc91cc69bd980199ebf4e5ca9794bee7cf6444b9352463423cf428f2f8f4cde23a2ac319",
+  "@napi-rs/nice-linux-ppc64-gnu@npm:1.0.1": "e3ba80bb29fff1405ef925937b9c45bacc378e5a2813e983534a6f75ba495d27de4be8156ef7856179a4f65c9908b967b0af79f9a9267987a9d3f4180e132acb",
+  "@napi-rs/nice-linux-riscv64-gnu@npm:1.0.1": "5793c5a406daa97f19a0621d266a6b536ee22a797af4771d442bd9c9d90f56c875f27cbdf654d3445a5a577494e5f79bd81732a5c164079f6d5ede4bc36c4d3f",
+  "@napi-rs/nice-linux-s390x-gnu@npm:1.0.1": "7f568ac1686c2cda9bc264ee29ebd140d1d0800c9f0094675761e8043472d2c9cf53259e2e0cc39bb0f03e8c3eabf594f0462e6c2e2071bfdd999955fb611840",
+  "@napi-rs/nice-linux-x64-gnu@npm:1.0.1": "7d7f34e151c4051e72e86dd3ea58b146fabe7857c3346bceec27d312792f050b5de26f2d2b5b82435fd47ca699b28614fdf0d5bfc369da9199870a23cd6d14f3",
+  "@napi-rs/nice-linux-x64-musl@npm:1.0.1": "83cf4650e7b388dddaac728adacdc693d688712bc53b84efc1517c916e56eeaf92c5d75bdc19e7c4115533ce4a83bcae7881e437ad87f013dacac072dfcec5f1",
+  "@napi-rs/nice-win32-arm64-msvc@npm:1.0.1": "022aad4fd8f6b065f6e0516f6f99e88b9d533e86903eedeb9ce077938fb39267c7fc14fd05c43d805769259c2e293df6dffa1b585f7843a18659fe49866a6b3d",
+  "@napi-rs/nice-win32-ia32-msvc@npm:1.0.1": "d6e191dc3420c68901d5bffce332b37b6e506604a4bf21d1ebe7713950e1491ff156e9bba0be16673da293ceff3be075f975fe526b749fed82514446b5aa7662",
+  "@napi-rs/nice-win32-x64-msvc@npm:1.0.1": "bd0b5bd57fcfe879e677d9bc204582cc3896e84c2b021da52f397488aed672373bc6bd6958217744a3357ea89d62d8145fdf86953e0c75559b639c53b8f48266",
+  "@next/swc-darwin-arm64@npm:15.5.2": "46b3738c0ef12d99bfedcda6782e2a75e05606089d0d7d59e9752c56db914b932dc54ee38f821fd64dc6d0f71b72402d21d11327e83418fb9444fff03a1e7280",
+  "@next/swc-darwin-x64@npm:15.5.2": "f26625805731858319df090dae1eb8612b328846513149987bbe1e8c4bc8bb86172da89bd7684a8b055ba449ff164577d72d5245727758bda565de99ea4fd855",
+  "@next/swc-linux-arm64-gnu@npm:15.5.2": "a6c40e59d1cbc8c8ed74b1dabc8ec28a30407aaf478f05e435456b9f6a90e3b6cb045318f50b8b9e79a43f43447af2042264b4562ae2525cf5e82fe377f4059c",
+  "@next/swc-linux-arm64-musl@npm:15.5.2": "7f6ff8850667a341720a7a355bb1d838145bebf1a6f8e4dafe33a68acf0a8b0d8b53d9ba214a6020f19deeed9a95267bfe1f42cb978684626f5e3a86ac090c7e",
+  "@next/swc-linux-x64-gnu@npm:15.5.2": "6158ead4481b995b5d466ee0e3b653585ab4a077f988dcc6b1f61dc67fb230ec86c51b6b35b86e17436191387c51eca3365af98c14fa2800e25816a56f2673f8",
+  "@next/swc-linux-x64-musl@npm:15.5.2": "2c93d6cce2fba7a8a8fbd3e135638aed29d1c371a1eb35038bcac1241a9dc0e4878bde7750bfeb5e7d48680a22da17c2ede9573e68e64a355dd4a4d7cd7ff289",
+  "@next/swc-win32-arm64-msvc@npm:15.5.2": "593dc1760fcd73846b1d75aa9f8298fc170820db8191f548de9dbe8a877915cf37a49836b789060aab66c34bfbe86ef6e433f92ef6135971a7fa482da4acfbc4",
+  "@next/swc-win32-x64-msvc@npm:15.5.2": "b16645a21e6b8a8d738748636ea2b7132c96e0d2bcc77ef55baf9aa27bf167c32a9e658b17a3d9a0eaa44679fa9a62e62b65d592df2abadcc86515c7693eb958",
+  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
+  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
+  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
+  "@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
+  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
+  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
+  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
+  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
+  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
+  "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
+  "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
+  "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
+  "@rollup/rollup-android-arm-eabi@npm:4.34.8": "52c8fa00eff53e8840e017388303a7613286068133027f734000c84893dfdf1e1dd72bc005ab1d7c52a82fd1b4fe6b7cd1e73242be032ba6d680482e63ea1f70",
+  "@rollup/rollup-android-arm-eabi@npm:4.39.0": "67fa54fadd0bb5a6e9d7df15ecf8971b799cc36ebeca027fc6edb4801a3b809fbbaa127b34243dbeb95eeb4d9331f5b04827abc0b358f900fecd4696f49ac48e",
+  "@rollup/rollup-android-arm-eabi@npm:4.40.0": "4d507765ccac7532b9638121cbd01259c4e76ca2c1188fb1a44b0c454023d69548d9a8f16872bfa98053b71c90c7eb035ba1febf6cc10eefbce238573ec19bf4",
+  "@rollup/rollup-android-arm-eabi@npm:4.44.2": "d44ff495052b0185518d1c07648b3759ab520b3b6e34c052160b4e9e46d35ed9cd70e3fc6088e1f343e60d8d3d0cd28dec09cee2e25d26cca17d0e15ffb6636c",
+  "@rollup/rollup-android-arm-eabi@npm:4.50.1": "90ccd8a9ff348a7d0962dda730d3663daec1cf20798fc6011cc0c937572826c98a0baf16299206644738719cea9478396a3746ded1c9f16d426c150b6b99ec53",
+  "@rollup/rollup-android-arm64@npm:4.34.8": "49d1e177871892244abf4bf6ed5d5b3f5217ecd9de56e684b917e43f2942264d3d296a381fdd8847034065d1662a6d414087239d334fead73ea259160f8625e5",
+  "@rollup/rollup-android-arm64@npm:4.39.0": "d9a55e94274cddc4b9a52cee24cb723426632a1b759381f6f3b51ca48b90616a74642c5e0d6343176c48c8287cc2464f7b58cf225e14dac08a80da87a6cae3ae",
+  "@rollup/rollup-android-arm64@npm:4.40.0": "0b8b77ad8aa62a4a7c349dd2352ad3c7d6767a993607db28ccf8126e755257c70a356481947129995fec0974f8b92afa82890271ff459f9226dd9f166a9716aa",
+  "@rollup/rollup-android-arm64@npm:4.44.2": "f00d7f1f99fad636fdaebe38bd3fe467fb4e8c9f06793e2b02fc56b1466fbdd652413fa613e856e8c266ab87bbf374fbb30fd43d8cf3786e5efbdb8582e8441a",
+  "@rollup/rollup-android-arm64@npm:4.50.1": "7cc9a4a1b8553163cf3e94ee3afe1c8c3b036802274988741c9269ba4fceeb0b88ef70b6d5b845e1aaf570aebd0f2ecdedff668f76fcd00a635d530f2b2fa3d7",
+  "@rollup/rollup-darwin-arm64@npm:4.34.8": "a95e59580ff3e195d340dff31cbf47dfefa624295708186b7865c2d5a001f18c4b54ed849fb618d966716714a053864361d3c08c4444210b8a350617ad2a4f73",
+  "@rollup/rollup-darwin-arm64@npm:4.39.0": "e13a44b2cbd92e4bf4d4dfe44c9e3bed44f6a437c63979099942a6c6423881a707eedf0934e9c893b6a338d9f375ee2449230c33cc9c561ff39ea4c579d659eb",
+  "@rollup/rollup-darwin-arm64@npm:4.40.0": "b0a0e66b07286c50f754220951743f0db3fc7b95a5cd5abd69c7c26b89ea470ab3699698729498bd031167f1a79943be2c3d93bc696c10a4c29832ba525b0204",
+  "@rollup/rollup-darwin-arm64@npm:4.44.2": "96ce8e3cba9364f21b07389dae47ab5532ca14be4075d43c5642d337d13acc5b5e60ec721e5070b99fc6d657864988b642ddc859118112cf017b952bd3e71824",
+  "@rollup/rollup-darwin-arm64@npm:4.50.1": "746b48a675b0f93cc1a4646053d266f81b39a824859c9ecfaf042364358d9e0785a16b6044c8337a8e87c7590e5439582624ade23218a68058f1dc75274ef9f3",
+  "@rollup/rollup-darwin-x64@npm:4.34.8": "dc622672dc2778ecd4c1bd2d3b433a41da3cda161958ecce561b1cc29b1d56f21f819bc7f6403ae001ee0f2ec093cf6f064ee0733eab38888b9461f932e80093",
+  "@rollup/rollup-darwin-x64@npm:4.39.0": "ecda22160d9562330f31a68c445f8613bd2e306cdacb966574cbcb11344f1e77dce068307c9ae2da1bcf3c1353fcabdfda7f5f720e6f4247bc4c92a2ddbb9882",
+  "@rollup/rollup-darwin-x64@npm:4.40.0": "021b2ad6de640c3a2a16282bd8bed11101430690bb42e00284d4e3ce34c4ef607d5352be851d790add523136cc510cc0062a79229f39dae528521469a49014a6",
+  "@rollup/rollup-darwin-x64@npm:4.44.2": "3f610c390c05b2c2d6e4060e7e005beb3d3737323a8b4fb7879ee8b576eeabca4345bd1f7d6a29efa7fab0459a8d911c60c02222a9cafc30656f12a817a230ea",
+  "@rollup/rollup-darwin-x64@npm:4.50.1": "b6ecf737c66e6e876e84c6bdf819c20346f2f3734fb54a6c3fafbe458014c6dc750c339f19efdc88e7e340053bad57a2adf248dba489ac5935832450cf7d1022",
+  "@rollup/rollup-freebsd-arm64@npm:4.34.8": "4307691354fd6080a1092331bbeb68232c0ce0ea60619dec72edcd140c1eb9bd4620482ac7d4c38bb4aab9e3e7106eb2758f82686308b23cb17d0b5495040b72",
+  "@rollup/rollup-freebsd-arm64@npm:4.39.0": "08d734630bd862caef29713262fa9f1b913c991b269387dacb096193b6190bafd683d5fd3180f55f8d7d12cf18134871c02a62c8a2491d3cc57fdad48f2fb7c4",
+  "@rollup/rollup-freebsd-arm64@npm:4.40.0": "fce9a10a8a688257fdd365421a45d35a3fa557c100674cee6a52e90d0125785a52fe476efe58afaa3aa230bfd45e8aadc66188ad5480e4bcaa9de31dc02d58e7",
+  "@rollup/rollup-freebsd-arm64@npm:4.44.2": "1f0f7957ed02e8a758096ec03198142bca77992f0d43744fa41ebe5d7a58205d70ad3615b8d0b22b612f671a920119d0069743e596024cace0706a6fac87b013",
+  "@rollup/rollup-freebsd-arm64@npm:4.50.1": "4c37734cd74bcc6d9902be6e58a65a33e2364831b2f54a9279f71dc86fe03471b7e24e247381d28aad90c7932531777213564f2f9d5413adb0eca93b1005e253",
+  "@rollup/rollup-freebsd-x64@npm:4.34.8": "9b1c96b307040cecf29c39b914558c26f2f2f52dac4e9c4cc215a658436fa97043a606d68733180e05e0ad66d5c6632c5ffe2be32a1da97b92fb61c729486cbb",
+  "@rollup/rollup-freebsd-x64@npm:4.39.0": "1fd1945fdd39a220f4176fec68a10fac4e395290f836b43ec9ebc272d87e2aa3c917db1a813abe6c7930b3574fec6c97c0014bcb6e7e24778effec2fffcf0926",
+  "@rollup/rollup-freebsd-x64@npm:4.40.0": "38ddb05c107f622563b96f18493bc0f1ca41ffa2b7e80deb28d4735ddbb8780e2d8374b9cc740a7d9a316d8eafdf49f98f548cc993f44f03e2c400e9d750665c",
+  "@rollup/rollup-freebsd-x64@npm:4.44.2": "81c91e10d1d34372bf81bdae15653956fc8d76c6081c5aae9e37d68f0b8aa1f83a96a12081a7eb656b30f2b9474d6c36b12801ff4ca86868f84f05a4cd9c6a58",
+  "@rollup/rollup-freebsd-x64@npm:4.50.1": "985a27ce38b6544e56cf0a93b4efc378c44635958180b91ff242adc68cd9e22a312e1ecd9ca5be9aab6e5f22ab8065e7d268011d1a80b19e12f3bd53ce5bc29f",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "0d616bdbee859b081b87f6ce3faabd9580dd914e84710e6f05bbd89b1fcbeb24a756839851e0889551554e3a6f93c3579d917fb3e166b85f3f672091c0497ade",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.39.0": "7d41df315c2041dd79b2a115e26ed25c0910ee9d80c5156604a8130bf7585a09cca88cfabbd632c6f6194a472126ff57d556c89685097c5c94d5b3e7a7f221fe",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "f489082b9ba893656692362e9b1972da5f12258ed12c81fbdd910dee822cb475f7ddf754659c3331b8f754692ac33b3c530cfbb178803794339eaaa3de7f4a64",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.44.2": "d4f7b0db7e325f2b2a7af9b2d7ce95de1670299d8e6675db35a48e9e27e8e95e60187b85b710ec6e58383f726ac52785152c7261710ea2726dae27dbb44c9efa",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.50.1": "8be28c7acbca9d6948823b1b292426afb2a6ef24ec16532c2beb394b44fa225b252a19a3d570e7a8445720bfc84c0ca1e5574c9c852a9784c30f758e307f0334",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "11439a3909996147719ec4b061b7fb3b3fe77a15a2582a83b095b88f3dc428de3bb3e34a10e618b8c57aeec06c4c19a14632e36ac08dfc3c9ade3e6c55352be6",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.39.0": "8f037dd06639394c0b27f1803d32f3b27434206a401ef587af283e5a8b86b9b2e2c1f1c2cda186f6f887717558b26c1dad4cac7e9f5b5e7dd9dceaf918ab44e2",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "e98e12c8392ab38c76ce04d19ba5105abdc99e968a8cea8c98e16827b74d133899dd5fe4ab1c109719a0a32376cea86acf76840434b96fd9b8d7641eaeed2087",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.44.2": "11c2f1f56cbd7bee75ee8ee70f4b68e1cca334d314aeac421834b18a8b13657bd0a3a10489a1785a51b00f359a38cd5bd481a75058f44f7c4bcf2a07b07020df",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.50.1": "10f3caa27339af674c8dea27dc3a6ef3dcecf43f5f976d245559c3e7268dc77dde406cfa35e0f759dd66b54cc744f6925039ddb4a467f0f638d441c560b6de4a",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "c19cafa18d2a461e77f65e0a1142f362244df1cefa9bff0934514b2a55eaa0e4e64b776d30b72d3b84847be20dc14bd52d19ef189e103bd464f982d8b33c75ba",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.39.0": "94b4544f904a4321389507ecc42cd865fbe5aa83fdb8bf13bdb1c58b3a62fc0679f6c2ad10bdf8774ef17eff375f246b013e4201d3e3e458d7e21e5fb3ebdc05",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "6b78d3c657aca2331158654bf26f7b33a50f5ee69df9c40aa7ab3861cbd9f558d6fd56b538fe7f070300f81513f2f1d4f466aba3040d19f4ace35b3d274469a6",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.44.2": "31731dce4972b67e689b97d2ab695e77c2134c8adaf13e3363ce589af702c5f6e4acbcded6d302dddd2bd3abaae1686264bc8d921edb40d8fcfe811bd887ca7e",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.50.1": "7b83b6bb5e8b8634d880b273b0a62d589745b44e82ad887fb854c2544af4091a14115e13f911a29111366bb978da894418260b310fb79e04bc83f93e0601e680",
+  "@rollup/rollup-linux-arm64-musl@npm:4.34.8": "54743996070942d7ee54928ad5b4b4f00a3bad840b0886435695c0a4bcabccab42e221a33f0d17a37ecd2ee5577903585e544212d9e218aa1a5a19c77b5df5b8",
+  "@rollup/rollup-linux-arm64-musl@npm:4.39.0": "24566428c40ad7a62f11ab7917546c5b11efc7735b757895cb8930446d9ee255521b389476b4d33b3da7ea82a1f1639167698af1e845c1e63ab7f7c5f452da43",
+  "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "ad51f17187757817454520e7cf89458cfd8e062319e3fdf89f8d9d466c5df3e7e80623543cd34fd89273e9daf67b17759cc18b31d1ec9270815ffc6907357bf6",
+  "@rollup/rollup-linux-arm64-musl@npm:4.44.2": "e7c93738b807ba618d2f77edbd2e242e41a4bff20dde0d07bc498ee9a05f5aab8a1a656a2f3c6e70357a4aea5b424f0666b98424aabb99f6fd3e63c41aa687a5",
+  "@rollup/rollup-linux-arm64-musl@npm:4.50.1": "69051b3fb5615e2f99527e6d6fe5cd8375c76e8e17ae979d608f3e0e62b2c7e6b9c372132c72a3a0840febe5064ece956b8101054f300ec3e016800fa68360e1",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "ff0423d7ee90a314d75ddb4fddfe48d2b19e48ec4b99b61f7ae764c79a789ac298b20383a247a20c720fac5ce610e22c7bb567b27182e85f75f99952ae8613e7",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.39.0": "72a844cc8bd7d7ac91baa23a14fa7eb838a3335e6aa3429b08ad0beaeb73f57be4a04f033c278536f9a0c6ea8d7ef2b21e4a573ee5b9aaab84121d97a228903d",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "962e93930087e9a8cdee3db404edaaefa3353f2065b9d45700e60e475ec0a99ade169704847c0d34b2ab61568bd9f734629a3913d828c503ac17869ba01a33c7",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.44.2": "e0039176ddbe0e4b17e81a3112719ad18ca6dfb95b044f5e225f7fcb76fbd2aff8ea8dd5a20e8af7582d89b0b32ef1a36a27e43d87c3fb3f8091b5704b9f642a",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.50.1": "fb7765bc241f5456a045c61046aadc5be94cd62021a51b081f3b8819aeaa1fce12352f2b89399388fbc14cccd3f5e66baea5b9ea20a8e60f02a32a04a744ef1c",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "ffed15556313e1076465ba19db95574e794237fa385beb4fe5242ae86c4cdddf84adaa46c7459a3a22c88636334167b488f971f7fd2aabc4405edea6326d573a",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.39.0": "b758097e4a1f66f3d5e840736d69be0f2733c769832766076a9414b80d8ac2cf2dfa1c709ee1650a9424ea135fc94349c0ea35e647d88a65641e4d516eb73b1d",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "9a3b1e7765cc1de3900f0e1ed4c12d841376b28d5c364efea7c63947b6bda4b05e4569d83e73912d6890130484b9e046e9dd4e91c4632d0c74efa02187abe042",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.44.2": "2ba3325590a423e8aaad5a056a373413abffaa40898fd795794428659ff747d03c0ea8cac979e7524f9a3898faf05da783eca86b63204d3a1a4ce9eac3a2ed1a",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.50.1": "666b5634e294725f7eb6620d2f94cc2d1a116cff11d92be7ca032811c9e5a6367ce546b7a7b7affc8794fc8cbddbaa8c302efc128855a3560b8ea1553bbbe789",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "beff08ebcb7ce824a97cbb202c780e7e991c61041ee8f8ce7334f74a9f7f2b18d3901235e09a527068f3c1e8fe63e9b2e3c5e446e0f773a11714b9eaa7a835b8",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.39.0": "9136d3172cb5acba4ff416b064ef31e6fc94a112ee7f428626f6cf62e5944f02a0a2b0d355db90e7f94b3ad1e8ee9d6b862637b5ef0db601440a7b27a131b890",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "1a96bd4aaa4c9fe11d2b870542ded1758328408dd71f4dea2bbf1776d10f20970445de7ad464682d01bed3b8788de1b7f8f3b3b4fe62e88f311361e936a1fa62",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.44.2": "3090ffd9d6460c5ddf769b055bba221cc508b4f0c56b043c4453354e9a9e234ac56c4756f4d724dea9d23db59f0cc288acd0fbe276ed8b201484a83868b66454",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.50.1": "817248ae38f4ef3cab1f305ae870d0ddad8d7fc1531ada95aedcf123836d573f29cd002e9f84a2458e82b0686ccf86f762ada155258365151e304ce5166aecf6",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.39.0": "5351c41030f68324324c0a6437d2bc0b89637a5c74892a65da6d156217cb6a2b8d9c466a5c2e2e0f04fd77dbfafd0c44e6d39a2a95b20abe9bf8bba5be922fa2",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "5ffc7589905a89a69384b53bca8a25203ef208c30fbdf83739cb8277473b7567c96376898d940a871917d960fd267f878f1b35c71802139a2fbb54252b9098ad",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.44.2": "d648965919b496f5c32f74c89e0764c50cc193675445e106baa29e9cffb63f569298b923157d40d9590c4175b3640b1686c4ef9ae7a01bf9168dd3bb6d7ff89c",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.50.1": "9b10eeb7b71aed8fbe54cefe9f1fe38caf401d2f64439b26f03b15dbd95570f8a9d2154340be7c50cef5df3256eb062fe0c5ca1eb98105c2d7257fe0fc73fc81",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "ba4eb8884458a0e4a530fa2af951541c5cee1da32759bea3288a185d6a88a2cb4ba8cb79db1442cee76372cd30dbe0e84b08367832781541866a56a16af6e6d2",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.39.0": "9adf9794d4fe42bae92b247d2656528736c0df334c102a82f63bdf416667ddfb7ba1b5aa9fbf45d55771599d21453208fe9c128adee11cc799040d821fd065d7",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "0342c5f2986150d7420fc16f29105f29affe36d38422d3b2b4b821da34f65b07557ddaed4d36e0aa6599c1c6156a4489b3fe885b089c12b26bdbd002771b5e53",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.44.2": "cc1568916f1609da502e762355b835c98b383a3426a1850c762e65067a7d877a573ef11a3160a826d85c6bcbdcb8685d60c91be51cd80b0cc97412a95df0ad54",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.50.1": "84f8df6cb43001c2b22d681b08a557177aa3c62ea006ed0b2ecc69ce21727e078670d83e31b6067e639df1cc0eefb78222562bc81f128779c50c3e0b58efc3ee",
+  "@rollup/rollup-linux-x64-gnu@npm:4.34.8": "f7cd20a88c3142337fdfee312031f82970edd18579c4116a316e23f81429e73c16ee1b5f255050580cc9557790650642d26f69bd4b4b22e8703bfe4497f50c1f",
+  "@rollup/rollup-linux-x64-gnu@npm:4.39.0": "4dda8acaa1c91c715f403c5e356c71f6418f7901ce641b3854e4fc6beddde4a6d54aff1a784350e9380d2d1656dfbe1c0179187227f9aaff330323e23d148566",
+  "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "9219541d8835d2cf04688ad40b3cac0f35c6e4ca2157a651b20228e241b1749c43b65f6bccdcbbcead54aae598327f9d508a74e0465957fff12ef3024a81ae7a",
+  "@rollup/rollup-linux-x64-gnu@npm:4.44.2": "16c564a95c61ba8a36dfcf83957eb2bf59eb89a90f7de145eaf985b46aa223fe27d752f83da304ef0f7fcdbf24e5b34c95b94fd37b6cff6fba0532e2e69d3dbc",
+  "@rollup/rollup-linux-x64-gnu@npm:4.50.1": "17826a16e94636f9e8a5524a13bd52cfbc47e2dfffb5cc6744cc182fbcc76f0351850418093daf314f80d5965b09d0157d3b503a4e80ff36d040373c1b95ec7e",
+  "@rollup/rollup-linux-x64-musl@npm:4.34.8": "2c72840440062d011bcd5c1e78d693dd92270c790a59905641fdd414eadb15c7381d3def36c5b9be7f49f2fe6281bdb4461c32d792ab31020bb26138e5c38b5d",
+  "@rollup/rollup-linux-x64-musl@npm:4.39.0": "910644f9be269b1bfbe995444bf99d1123f0e78f2db2babf91cc1fd415a9f7d9052ac42e3092842ed6888544e5f788ae863d2e67b073a3494ae34ac52aaab598",
+  "@rollup/rollup-linux-x64-musl@npm:4.40.0": "d75772c17644d8522d847014b5e6284b7b7703df5564f61fc74eee4fae9d5516203f9ca5f05d6c8d64cc3d88f86ab25d4233d0b5003fd48069b8520491f4d7dd",
+  "@rollup/rollup-linux-x64-musl@npm:4.44.2": "e371bab526e48d5f7c1eb988dbf8274f0f1bd47b3da99b06e96fd078ec05ac2b66bb4484f276eeab52c6f070e1e92283b8d10b10b2c7d0ce95c1c0542d159c05",
+  "@rollup/rollup-linux-x64-musl@npm:4.50.1": "a621eec14e6bcd39dac234da8e6adf2563d41271737c20f8f6f1898f619e5ae9be65f98228e3fdfa1b88f5579214a97feca0b5221ef09f114e6797cd4eaf6d50",
+  "@rollup/rollup-openharmony-arm64@npm:4.50.1": "900bb0962ad7e5e753a03efa59e1562f0942d40fa216e741bbbf7b4cc736cdddd217aad01b0f1a3a955b182e4039d83ad90e1eccf176e9f9c439efd85dc5b384",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5ac8e7b0ebb441b2f35d3dbfec3f4def4083a33681f57dfff12b4ad5c57b54855d48f7ebf3cf719c815cf25f51af53396840896a977693b70b40f373d61684b4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.39.0": "c15dc877c35f43d6b16b3776bc0f4fffe1c761f60ccd937593ced8e7a5b73e9ffd156f078f6e820fea9d88bcbc5b15467b9afd687a686e94e28fffff1507971a",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "71fd6af68890af51653646602b23403937fd8b0bd622feb619c0f4cbee7de859af7bcc5c68771500e8e1d3f85fbf8d85a2083ffe65f9f32c1179296343e68bde",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.44.2": "f635fd978f5af0b1b594722adbca16b2c67bb3d8a5874ca13030a9d1f58f093e3d20f8cde3b8aab037fe0abb7cab3d2501496e4a90d0d014ccb8f24e36d81ef4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.50.1": "41664cb2bc8c56eb5103112988ddf4b6f73b01c0949fc9692e5998e395591d4813bdc400a736f8dea321ad1f1847ca7c096f4cd19836f43acfcfab36b00a2058",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "f21126d2b06e4c46d894c910dedcf4e10afc44b842e3c62a31c9a88c2788bc39a1cbdfc83d9747dfc769d3f1a1bb46a137e8b9e1bf4dcef47323093ca152861e",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.39.0": "ff5eff135c9a4a2f70b1c496a0f73069c17c945dbc6b0293f212f3d84b5b9f81a50628de972bb1d788521e0462af1067701e5420bfd8efe37c6f990c34b98a41",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "0c846c2a985470f85f473ca32f0757c6c5f6bc885d295770d18d56dcc56d33100ab63e2ce7d2ffb4ef8d0726fe40d3d9fa79ba05ae787f7a532b0933622c6e1e",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.44.2": "02b84dc3940ef53cee39149fc718a865d32932ac3d4ff7e29e3b9ea3355aaef25572087ed75c6b8490c42e58eb0c605d5c51c567aaf89e7a8f6b7c65fa9d2c4f",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.50.1": "fee9fd6ce9e95168949a41d24b51aabdc1f1548dd58cdaf3418f91c6e0be0718ca08905f445036a7f2c5b9487472f4870a116234456f1af5df71dfe58b1bb908",
+  "@rollup/rollup-win32-x64-msvc@npm:4.34.8": "b457c1787514e146ef8cf48ff0a142406fcee484d2e63d6b479aa9611a5fede53eaaa32b1565c2a95776aa4738832534933003304e02eb89a9fa9bbc83cb0a01",
+  "@rollup/rollup-win32-x64-msvc@npm:4.39.0": "aa6fad14d5e48286bc7f47049f1a59a58df288c5cda78883542901c3421cc2d9133a0974d49f6a46fb0129dc0c2ba21b414e084dae2f6dcaad650f63b8ef6e94",
+  "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "b725fda501efb1b7d6a2af1723a778dd46c24dee30693987a60495739766cef902d6bb106c391074445471854e55bb6317c44d2434ae24deebc2e4ef72f31e68",
+  "@rollup/rollup-win32-x64-msvc@npm:4.44.2": "5ef55ed9a502399af6c60cd3c1b0e57c19d71baec335edc6de1fe1a3c330d67ddd88881f22fab2186ef1723e83841d23027491efa432f23b5406a62a7f2e748b",
+  "@rollup/rollup-win32-x64-msvc@npm:4.50.1": "a595a1a593fad015bb6a1cd521b40c506f55efd59f195621c55d5b272bdfcdd936b8152c33fa4ba06bcdacf1c5117888c24e61cd95f8176c0f4e609b3026c4b9",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.1": "c600ada269526e164380d41354c4cdc523bfb2a899ec66812f6564fd0ef9116a03fa44f90f5a6e05fd7605c3731e047dd4cfed9aed767236c4300bc1f39571d3",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.11": "a4a57a2e0afea1546c6d863d91bf704fbedaee9c0431621b60dfc52cf5afff460c7655c412165e0a1ccc66ba3dbb1de841cfe1c14d7f44d145fbaad21f59d03e",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.12": "3c9d4e93ab9ba651d60cda3accd7a5b26485b6bfa39c1d4023142023fc68dd7c13ca7cbc7796679c74aa0847312d9487067402d4ea497141753d495ca2833d62",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.4": "fdb096ee5386b3157a3112432afe23cc133a443422939489d41416a2a3bcb18d1df3bc8ad8a719914320ed3f3fb7ea82c98a819774ff612d085bca0361589b4b",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.1": "f956535627ae4a70e863ed708a015e793555782b4cf7d8b0621229178bffa728d06084540702e94648a9a6aadab4bff359dfe8db2ba9604d52cea78df936b7cf",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.11": "98579827cd4ece72884303248746fcd921fc97ab254e3ea3f8a02687fd1ff1caee7d722c9f596cc97376979b383a135615a411498d6767812c1f5147eefef040",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.12": "d748a602c0b8685e5ce4295d64b1e37f7c1ffb936fd89c2459c52954d35adce42d76e6b1c48bc3db8347303b62c1d2314557a3fb8bd830ba3b812e99945fe3e5",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.4": "c76c2a8a50f1412da67bb3d0b53d9c41897503b209421254cb76a3262e8f4cf4b8ecea2b8c472d9283ec8eb8a7331f1e2a5f4d79af2345c601ca154814f7291c",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.1": "902714a58cb83cb7adc958b81168dc4971e167029ef9c9be6ed6977fa9003de52b94aa110b5cbdf6295c9ba3afcb60bd7412a3d5e9efabf03879b16cb0d23a9d",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.11": "d116ed080005a09829480cff79d40ff18fbae1f15299da2a7b51e68a349cbcb18c7bc8b46cb98d963f67f39a4b2acfcb20a7d5265310aefaa3f0832fac54aa4f",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.12": "89f244bfd2929e5d2633c9f54a6beca6697337fc6f91035af3ba27563a2a98185f240ebb016a2292d6c386190fd5097276a1da3b376041277af2dcc8d09412ac",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.4": "156947b3611839e09a4db6845a798150940e08df5d87cde711d2b80ddf2edef5bcd33d389191652f3f12b54fad8506faf82e50dd0e8ae4d7fb7edbff7532817c",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.1": "4f83bebf99926b709b7af37ffae49c39135cc74a4213fd66860712433a280b024589663ee988e1e16ef4cefd20146f5178bd2248a96b8e40f60ad4bf0d67aa5f",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.11": "0c1bbb535a21b0df012c6a4c4bfb5538e44f161cca5bf2f14a1defbb4d87f2a8ea45cd5661888c88085105258cdaf34b099e7d48e0d7b32fda3897025722d751",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.12": "5f416f1f097a062f9c1fae383c752344d7b9da05074c6070ee1ddb0ce1380b1ebbf603712438e75bd8fb1801c7cec0a04ae83b520c63865b1fef9ac3b322fb83",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.4": "959278204b530122ec6223d1a83b50409462dfb18777bcfdb555b12e0f004acb6a42253323c8a3f7d449121edacb071f52d0d9ac661d91d4ea8f174bd1bdb337",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.1": "bd678c19a7d55ba8e4ab6886d45b60fb09991be4a471f27cf07c7d62cfc15fd4c85d699646e2d6cbabefa00cb0fb7ca37112876696872cefbb687b3a4000ed6f",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.11": "047dc5dc59a577ffaa1ec21eafc377223a04b3f9b883fa6990ccc008846eea2bb68f04012af81d32bbd83b66861910c2c54b78adaf158cb721580df7ba9f9370",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.12": "e47a443bc60cfb6029240b36c83fce63fd47064c62a787afd1471c7ac518f4499578b5eadd378582302da48388ba15d890dad4c33b1477720149a450e4a52720",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.4": "bd736762174c6b0c8f5b038fcf752928e17735c8f7e75060afe69cda7a4be9c87f4f901aa0e699df6a77167a55a62de7e71e6d8dba3eb84dd6e51c4ee7468d10",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.1": "e9c901fc2d182b39e1c3ef248f7da0d04110179912d2c12c3d3322b411ea9399e682784f75b4c4024e9e8859fc4e77bef8c9232be6a602393fc5c9bd16d8a5b2",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.11": "ed882ffcb6356e271ae708a61e5af3b1b0306819411fdd364283488138d2e8e222deff1ae935059fffed48f9f3e2b42aca616ff2e019de1133f693eb6b75ab96",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.12": "ef15ebb5e515b1a032769e2eca28086933106d0c0a835f4dc3af25ee2426277e1cc40ff4cbcaf1e174719a9af7c600becdce38fb98b825117751551e1bb2605e",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.4": "376e5fb2b08e8b3cb393cbdea5b79df82514812d9f583675b257062b22b0ba197b945dbc4ff17015720455ba039432a978111ce961623d47de57991c153b1847",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.1": "9efec82697d9940a691f00f49ead52d42b65e6d34e395f6856267af945a35f8024468473c6a2065ba989f4d581744140c3d8f928cf9b4f6da0d31abf0b9436ec",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.11": "4705892615540b131e96256bbbffaca9f89eebcf65c76fe2d2f5e17718770b1629065828b427c1044a71c063765cbe0fbc84491494fc1dc7d6672688f365ab0c",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.12": "c36cd60bbb5b78f9ac02c151fdd319f9d7c592338e0d8ad8998b6bb4dc2b02dc28222cc00b41bdf4cf90dcb7fcb47a1b28d43e6ce6ded86be7b099ff33034cf3",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.4": "7854762a01232135fef7bca426fcb08c08b99049a2f65714a72480c01aaa73c573e6e5f0711ad9ee6d6b56e9596edee311f0ed9df216ba42d6933f9acd11e252",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.1": "61a1e8b639111ce9036933b0ffa7b6fdb7242a3cb482a7009add05449d718716f1a7879ab23eae6fc6759940c64d6a1c441245c93ab2472d42e54d5b0c1f11cd",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.11": "cc08b2ce1dfd5ad67f746ecde41bdc3d01375a97acbe15d58bc23441832fcf844a2f1cddf227132cabcefac2d6036c41875221684722eaef5b1b1e9c4cfa066e",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.12": "fc50a9a1f4f2b663f40340efa5f5335ed1c942e21f0c22d6cfb4170e48159d39952f6a3f38de4ffa8b724f341f662d4dd2457c93f50fb93ffcc026fce14be76d",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.4": "0efe0a9b4fdfa336f79e54deec18829b9c6c9219be23c7e790c1435fa472bedf80184faae96a1d26e0db920077ed7144cdac3512f02284dcfdfcd6ee330d8b16",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.1": "697de321dd0d3d0224b566660c41e723434eb1fa27d0bc16f77e46441f9703f51f682b3e6baf124d64badd374af4b1862a28096eb21865e24f250fc33e4bd69a",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.11": "489d40af4c33d56ec9bdaa7965f8ae2e1311033214cd8418e3f977cc333c923591e39e0ba82d55f1179de442fb61aad09d5318685bd7020a4bd6fb15d9fad1f7",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.12": "11067a2ae532adaa9db819b5a94462acd1750771582a66d89bf437264fc95cf53b960d2e395105a6efa238e159b98b463ecc88103e848515af5a4ea45c5e57a0",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.4": "2e7f54494f0292687172d2468212aaacc314f91b3feaebcaf9541ad061711976e933014e1e26e1e408241256e28faf6e4a4d7f4eee39b2f40476e98ab7e30db9",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.11": "b5c0ad4260e24f77cd339204ab228a0faf309d3cf24e4aacb4398d694587326ea7c0d40b0530f602a561384857194afb48356d370acb6af19aae6438702d30c3",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.12": "4a2a57b9aeb093c1db94953489e7e1fb22e2855db01f982f4a06481484112e0152cbb883098ba56bd3d51f3bc7c71899759edc871b3218d73c8c610ee47793ce",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.4": "330fb7dec1bd50439bed83a05a601b4b8a10979b92105b96b63dc2a6ac4e7b8f68391473c20d11431901ab5d7d68d43dcac0856747d052401614ca72dbf03409",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.1": "60103d9f02b44c5b7862535407491770b59bcd7665a306adae9475a162725e2aeacdd9431c536a2f096ca0e31f69767512cf26ec43445bed88f421300400b48d",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.11": "0d1b1ba3355e371e06fe253e1664e4fbf15f4080a1ab151e6c4dacf0b8fd16af2cd88cfda4a2ee717bba4fcd8c22ea2a709fcaf60ac2e1675bc5e7c9133a8d67",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.12": "137b19bdec1f9e501e58c48e89265dde88d52fe15b93d51046f1640cdce9920bbd63c266f313b3c08f494c5a403ae448e9699e7dca13612269de8e4286836bb8",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.4": "de06c73d566f5dcd06979b7c73a08bc82660757b7d0c4b6d4a44aecf59b5aef57b4ee0bed4283936046d47366e63660e2aabd8e3caa2cc9b1c56305244670a81",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.1": "39bfb14b5060e90e653174a5c6213b2d3cfe870defd1a9ea22d56c141b99ed6dca036c815c33e7ba46bbb966263b7bb54f43099b07e9779b34ceb1e3ad52ead3",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.11": "e81e9a44e2e87e2a1e2c9687e0279b2fedc41cb1355b3211829f6da29a19a0eacca135eebb8eaac92cce80f1e4f1093491203e5a855d7e57ea657b34a59dd5fc",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.12": "c33748d2b58fe86b1e47564dc33a1efe0daa5408a837f673a1c985f92b78158c2fcd2a1bc2941ed1d53cef2071f2396007271f1a14e9076c641c10b181d52e5d",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.4": "416c4460d463105d6a57d523ac07aeec37d0e4afe59175a86d7621957bbe266e0b8d318f9092a585ef25d402c76f8f2d119bc340c6c4ac2fddf7673337959ef4",
+  "lightningcss-darwin-arm64@npm:1.29.2": "ecba3cfba59d1abf2e487f020c02a6a73635e717c490ca489476958876a44893f393d92b84e844f312b560fc53b940c7086409e1b17ea0a98bc290fb1fd914ff",
+  "lightningcss-darwin-arm64@npm:1.30.1": "e539855e1c1975a942ea63c641a10b14dbfe7751657ea091aa40d414d8dca83ab008c79ba59ca215cd4e32018b67545842469d6e947911d80ce9008875ee90d5",
+  "lightningcss-darwin-x64@npm:1.29.2": "2d190974ddda8dd943aa61586a2d0fb90b8fb87b4ceefa7bf947acbd6f930b474f8d13a4f3cb4de62d507e27ec29f9e3977f7f52c8bfe9d6aee95a49b45a7ae1",
+  "lightningcss-darwin-x64@npm:1.30.1": "89d59789a53dfe2ddff3f9ee7dd825339b8044ed2fffebe6f77139e52857c5c88ab9e026adf76d72d77789c111f304a7dece5782c8ab7b03b1b732b389caec56",
+  "lightningcss-freebsd-x64@npm:1.29.2": "c14a65c022db9fb806412061dd458d4eeced41fba7853b59b42bd23e0cddd3e9bf82d80b742f6e3075c358f7f41149043ab79afbf588b7a4f9e9a51826cf00bc",
+  "lightningcss-freebsd-x64@npm:1.30.1": "175b4126fcfa789061bc980cb887d1b63465168e6b551f672dce100e00dc82023071f4c83daab1a1c9d8321fbc064c7470832a1b71d24a700494b8c116242054",
+  "lightningcss-linux-arm-gnueabihf@npm:1.29.2": "ba5501475726fb193964a378ee2f88d9afcfaf6c35b22a72ecd427cc3d5a0a28824d246168c21f4d8ac1caa9b2b8e6c835bb75f1638ab2eda13c8e8888246617",
+  "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "7000b866497ff4650bb6cee0d890d1951ab6e2b3d76cd375a93a688b745d2503f6f95a59e5a34fbf780ee5a59412ba59f36e73ed32b3c572a45b4b4c33fd48c3",
+  "lightningcss-linux-arm64-gnu@npm:1.29.2": "17d22114fcdb98990b7a9527eff1995a56f5c7fa196ec58595600a374385cf724f4648e59ed2410d62c2e3ebc2fd872e925b11d548fd88f3b291582203acad5f",
+  "lightningcss-linux-arm64-gnu@npm:1.30.1": "b96fd4bb9dd2d507769fbbf83376386027174b08bf088f8f662c0d5da73d1c047b9a0eb2f5bab426cc9e0888f841bd2ee7f4c2386154380d405b1ddf198eb519",
+  "lightningcss-linux-arm64-musl@npm:1.29.2": "ee99aea9d6425fbf937bdd99945208cefc4376fe162d181a68542164c4920c1cd7c63869050de12c44dcd367cc67dc08f63b522e81147d05444ad4f93afb126f",
+  "lightningcss-linux-arm64-musl@npm:1.30.1": "28af49fd88bb0f6f673c2a0b69fd21c3f42a48dccd5ba78afea10c5f3ef274bea0034dc36adf747f2a19af77704d72b417c0d6cf57bcf834d11e343ca5d98b13",
+  "lightningcss-linux-x64-gnu@npm:1.29.2": "17002e82ad3fae9ebf5ce8e1eb66464ca4f256604cb0db4c745f78bc85730f2d4d4f847ebc939327176d3e7dbed771b02f487d58960a62fa4c32b86a915d0a8e",
+  "lightningcss-linux-x64-gnu@npm:1.30.1": "35aaa0f2fa21561b4a45b1fff3f2e00452562c6839afa646f8b94f5ac247e5bfbce32802557f93c90813f0f27c39f54b2443de84a41a1c44db5f16f01705c5ed",
+  "lightningcss-linux-x64-musl@npm:1.29.2": "6a2f54a992d53522852ae37dea730831bb2e434206a58363d0c34a67a4368edcc471e209b022bd525c33ac5886ab0cdd584afe606b92e4e03e18ddd57e667ceb",
+  "lightningcss-linux-x64-musl@npm:1.30.1": "d5feaf9c72ebbfbd4da504102ebe08106f6b9c3e2f03b0ce6f8ee5e2ced7e9364bbeb6cdaa51b9e7361dba8b15bd3a6ed39cb9898c842f1c0fab62e5f2c43cdc",
+  "lightningcss-win32-arm64-msvc@npm:1.29.2": "707e80205917f654db00d0a83e853d198ad74a200bb9d45d8d822158d942866c575fed398f4edf51fc8bbf1ad42b2eeeddfce5fffdb232024b10114475c8f7ea",
+  "lightningcss-win32-arm64-msvc@npm:1.30.1": "cb840e2f4eadd758ad96d8226b84ecb3127edaee44f053aa83c837900c237fa2e4c3b956663a55b6d4364f7b29830b8021a0a1e9bae03d1f7930bcf37c433bff",
+  "lightningcss-win32-x64-msvc@npm:1.29.2": "059cfe0875d086630df9df682728fad52daf1c925dfe6a8280d3adfcadd4f64a301365cb3bf751fc755b08d786a51c4e0be4ec5b9981b2547ab73d038da4eb3f",
+  "lightningcss-win32-x64-msvc@npm:1.30.1": "a99e857773ac3f245eca561b79ffcf7ddf0e4a54cc00a86e96c7cda65a8e7acf75dcffbe02814836b3425cf984cf07c5bc4cf234877616074be00cbe932a3812",
+  "turbo-darwin-64@npm:2.5.4": "49ea24cf702baa0fc1e8a6acfbe75e425b52cd654f654c9da7aa7095fb65a02590de8a9ec85a22b268f3ce558e3fc40b7512634699b090d43c8def450e75ff7e",
+  "turbo-darwin-arm64@npm:2.5.4": "7a8f17ee644c5a4d07fad3b734d2f557267360783de2f70de7c265ed13e6b7281a2c5620f89732f3f9868fd432ad1ec7ea6a93bf95fde01626d16e782df22d2c",
+  "turbo-linux-64@npm:2.5.4": "c219ee1dc8144d874aff9f411c3a84066b66c4c4fd3ccbdf8111ded326f2846f0a17ae943dee2f4a7597f276d9c039be5b770af798b69bb258c60f3000618fb3",
+  "turbo-linux-arm64@npm:2.5.4": "e786417fdb7955badf18ab590bd264cbd300f6ce1976a4c059a30fcc1a1c3ca5e7917f15d97214f172f57d24e54bfb05b2f844c0b364f29a12c8f2b2d08ffa2c",
+  "turbo-windows-64@npm:2.5.4": "ec8b9487214645340840f53162ab848ae59b5ec0a8673de7ce0ad89301c6751faaea637534d461562028a7933aba124d25557b74316d5fe10bf7842661859b70",
+  "turbo-windows-arm64@npm:2.5.4": "2b9227498ada4f341f20c40d637b550ee8572eecc983be4e74d0f06f852e418b880238c5ab7f027aada53566331bd4804a4eafce860645d467948587f2fcae1a"
+}
diff --git a/pkgs/by-name/up/uppy-companion/package.nix b/pkgs/by-name/up/uppy-companion/package.nix
new file mode 100644
index 000000000000..94f986904b14
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  nodejs,
+  fetchFromGitHub,
+  yarn-berry_4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uppy-companion";
+  version = "6.1.1";
+
+  src = fetchFromGitHub {
+    owner = "transloadit";
+    repo = "uppy";
+    tag = "@uppy/companion@${finalAttrs.version}";
+    hash = "sha256-Z7u0Wrkg1/jZtOF86hUbwRVWWGHuv4ktcXx+gEcLYlQ=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_4.yarnBerryConfigHook
+    yarn-berry_4
+  ];
+
+  buildInputs = [
+    nodejs
+  ];
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-5XLOyz1QowX08C0IBcg9Um1eY+1qwtPyqIFb83FPFz8=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn workspace '@uppy/companion' run build
+    yarn workspace '@uppy/companion' run test
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/packages/@uppy
+    mkdir $out/bin
+    mv packages/@uppy/companion $out/lib/packages/@uppy/companion
+    # Remove extra files
+    rm -rf $out/lib/packages/@uppy/companion/{*.md,LICENSE,Makefile,.*ignore,infra/,output/,test/,__mocks__/,*/json}
+    # Remove dev dependencies
+    rm -rf $out/lib/packages/@uppy/companion/node_modules/{.bin,webpack*,update*,tyepscript,jest*,eslint*,{@,}esbuild,{@,}rollup,terser,@types,execa,http-proxy,nock,supertest,vite*}
+
+    # Link final binary
+    ln -s $out/lib/packages/@uppy/companion/bin/companion $out/bin/companion
+
+    patchShebangs $out/bin/companion
+
+    runHook postInstall
+  '';
+
+  updateScript = ./update.sh;
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    changelog = "https://github.com/transloadit/uppy/releases/tag/%2540uppy%252Fcompanion%2540${finalAttrs.version}";
+    description = "Server integration for Uppy file uploader";
+    homepage = "https://uppy.io/";
+    license = lib.licenses.mit;
+    mainProgram = "companion";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/up/uppy-companion/update.sh b/pkgs/by-name/up/uppy-companion/update.sh
new file mode 100755
index 000000000000..9280c873158f
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nodejs curl gnused jq nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+NEW_VERSION=$(npm view '@uppy/companion' version)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+nix-update "$UPDATE_NIX_PNAME" --version "$NEW_VERSION" || true
+
+HOME=$(mktemp -d)
+export HOME
+
+src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src")
+WORKDIR=$(mktemp -d)
+
+cp --recursive --no-preserve=mode "$src/*" "$WORKDIR"
+pushd "$WORKDIR"
+yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json"
+popd
+rm -rf "$WORKDIR"
+
+nix-update "$UPDATE_NIX_PNAME" --version skip || true
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 2db1f0c61a26..ede344e09c7d 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -50,6 +50,7 @@ mapAliases {
   "@prisma/language-server" = throw "@prisma/language-server has been removed because it was broken"; # added 2025-03-23
   "@shopify/cli" = throw "@shopify/cli has been removed because it was broken"; # added 2025-03-12
   "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22
+  "@uppy/companion" = pkgs.uppy-companion; # Added 2025-11-01
   "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
@@ -283,6 +284,7 @@ mapAliases {
   inherit (pkgs) undollar; # added 2024-06-29
   inherit (pkgs) ungit; # added 2023-08-20
   unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02
+  inherit (pkgs) uppy-companion; # Added 2025-11-01
   inherit (pkgs) vim-language-server; # added 2024-06-25
   vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09
   inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index 15b30b90747d..d0eae0605793 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -10,7 +10,6 @@
   "@angular/cli" = "ng";
   "@babel/cli" = "babel";
   "@commitlint/cli" = "commitlint";
-  "@uppy/companion" = "companion";
   "@webassemblyjs/repl-1.11.1" = "wasm";
   "@webassemblyjs/wasm-strip" = "wasm-strip";
   "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 636c48917790..a4d4d435c3e1 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -8,7 +8,6 @@
 , "@tailwindcss/forms"
 , "@tailwindcss/line-clamp"
 , "@tailwindcss/typography"
-, "@uppy/companion"
 , {"@webassemblyjs/cli": "1.11.1"}
 , {"@webassemblyjs/repl": "1.11.1"}
 , "@webassemblyjs/wasm-strip"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 68919b112fb7..75848eff0811 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -129,15 +129,6 @@ let
         sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==";
       };
     };
-    "@aws-crypto/crc32-5.2.0" = {
-      name = "_at_aws-crypto_slash_crc32";
-      packageName = "@aws-crypto/crc32";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz";
-        sha512 = "nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==";
-      };
-    };
     "@aws-crypto/crc32c-3.0.0" = {
       name = "_at_aws-crypto_slash_crc32c";
       packageName = "@aws-crypto/crc32c";
@@ -147,15 +138,6 @@ let
         sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==";
       };
     };
-    "@aws-crypto/crc32c-5.2.0" = {
-      name = "_at_aws-crypto_slash_crc32c";
-      packageName = "@aws-crypto/crc32c";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz";
-        sha512 = "+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==";
-      };
-    };
     "@aws-crypto/ie11-detection-3.0.0" = {
       name = "_at_aws-crypto_slash_ie11-detection";
       packageName = "@aws-crypto/ie11-detection";
@@ -174,15 +156,6 @@ let
         sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==";
       };
     };
-    "@aws-crypto/sha1-browser-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha1-browser";
-      packageName = "@aws-crypto/sha1-browser";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz";
-        sha512 = "OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==";
-      };
-    };
     "@aws-crypto/sha256-browser-3.0.0" = {
       name = "_at_aws-crypto_slash_sha256-browser";
       packageName = "@aws-crypto/sha256-browser";
@@ -192,15 +165,6 @@ let
         sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==";
       };
     };
-    "@aws-crypto/sha256-browser-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha256-browser";
-      packageName = "@aws-crypto/sha256-browser";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz";
-        sha512 = "AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==";
-      };
-    };
     "@aws-crypto/sha256-js-3.0.0" = {
       name = "_at_aws-crypto_slash_sha256-js";
       packageName = "@aws-crypto/sha256-js";
@@ -210,15 +174,6 @@ let
         sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==";
       };
     };
-    "@aws-crypto/sha256-js-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha256-js";
-      packageName = "@aws-crypto/sha256-js";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz";
-        sha512 = "FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==";
-      };
-    };
     "@aws-crypto/supports-web-crypto-3.0.0" = {
       name = "_at_aws-crypto_slash_supports-web-crypto";
       packageName = "@aws-crypto/supports-web-crypto";
@@ -228,15 +183,6 @@ let
         sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==";
       };
     };
-    "@aws-crypto/supports-web-crypto-5.2.0" = {
-      name = "_at_aws-crypto_slash_supports-web-crypto";
-      packageName = "@aws-crypto/supports-web-crypto";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz";
-        sha512 = "iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==";
-      };
-    };
     "@aws-crypto/util-3.0.0" = {
       name = "_at_aws-crypto_slash_util";
       packageName = "@aws-crypto/util";
@@ -246,15 +192,6 @@ let
         sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==";
       };
     };
-    "@aws-crypto/util-5.2.0" = {
-      name = "_at_aws-crypto_slash_util";
-      packageName = "@aws-crypto/util";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz";
-        sha512 = "4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==";
-      };
-    };
     "@aws-sdk/abort-controller-3.296.0" = {
       name = "_at_aws-sdk_slash_abort-controller";
       packageName = "@aws-sdk/abort-controller";
@@ -291,15 +228,6 @@ let
         sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw==";
       };
     };
-    "@aws-sdk/client-s3-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-s3";
-      packageName = "@aws-sdk/client-s3";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.758.0.tgz";
-        sha512 = "f8SlhU9/93OC/WEI6xVJf/x/GoQFj9a/xXK6QCtr5fvCjfSLgMVFmKTiIl/tgtDRzxUDc8YS6EGtbHjJ3Y/atg==";
-      };
-    };
     "@aws-sdk/client-sso-3.296.0" = {
       name = "_at_aws-sdk_slash_client-sso";
       packageName = "@aws-sdk/client-sso";
@@ -309,15 +237,6 @@ let
         sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA==";
       };
     };
-    "@aws-sdk/client-sso-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-sso";
-      packageName = "@aws-sdk/client-sso";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.758.0.tgz";
-        sha512 = "BoGO6IIWrLyLxQG6txJw6RT2urmbtlwfggapNCrNPyYjlXpzTSJhBYjndg7TpDATFd0SXL0zm8y/tXsUXNkdYQ==";
-      };
-    };
     "@aws-sdk/client-sso-oidc-3.296.0" = {
       name = "_at_aws-sdk_slash_client-sso-oidc";
       packageName = "@aws-sdk/client-sso-oidc";
@@ -336,15 +255,6 @@ let
         sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA==";
       };
     };
-    "@aws-sdk/client-sts-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-sts";
-      packageName = "@aws-sdk/client-sts";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.758.0.tgz";
-        sha512 = "ue9hbzjWNQmmyoSeWDRPwnYddsD3BVao5mSFA1kXFNVqWPEenjpkZ1xAlBVzHMMNoEz7LvGI+onXIHntNyiOLQ==";
-      };
-    };
     "@aws-sdk/config-resolver-3.296.0" = {
       name = "_at_aws-sdk_slash_config-resolver";
       packageName = "@aws-sdk/config-resolver";
@@ -372,24 +282,6 @@ let
         sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g==";
       };
     };
-    "@aws-sdk/credential-provider-env-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-env";
-      packageName = "@aws-sdk/credential-provider-env";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.758.0.tgz";
-        sha512 = "N27eFoRrO6MeUNumtNHDW9WOiwfd59LPXPqDrIa3kWL/s+fOKFHb9xIcF++bAwtcZnAxKkgpDCUP+INNZskE+w==";
-      };
-    };
-    "@aws-sdk/credential-provider-http-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-http";
-      packageName = "@aws-sdk/credential-provider-http";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.758.0.tgz";
-        sha512 = "Xt9/U8qUCiw1hihztWkNeIR+arg6P+yda10OuCHX6kFVx3auTlU7+hCqs3UxqniGU4dguHuftf3mRpi5/GJ33Q==";
-      };
-    };
     "@aws-sdk/credential-provider-imds-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-imds";
       packageName = "@aws-sdk/credential-provider-imds";
@@ -408,15 +300,6 @@ let
         sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ==";
       };
     };
-    "@aws-sdk/credential-provider-ini-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-ini";
-      packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.758.0.tgz";
-        sha512 = "cymSKMcP5d+OsgetoIZ5QCe1wnp2Q/tq+uIxVdh9MbfdBBEnl9Ecq6dH6VlYS89sp4QKuxHxkWXVnbXU3Q19Aw==";
-      };
-    };
     "@aws-sdk/credential-provider-node-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-node";
       packageName = "@aws-sdk/credential-provider-node";
@@ -426,15 +309,6 @@ let
         sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA==";
       };
     };
-    "@aws-sdk/credential-provider-node-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-node";
-      packageName = "@aws-sdk/credential-provider-node";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.758.0.tgz";
-        sha512 = "+DaMv63wiq7pJrhIQzZYMn4hSarKiizDoJRvyR7WGhnn0oQ/getX9Z0VNCV3i7lIFoLNTb7WMmQ9k7+z/uD5EQ==";
-      };
-    };
     "@aws-sdk/credential-provider-process-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-process";
       packageName = "@aws-sdk/credential-provider-process";
@@ -444,15 +318,6 @@ let
         sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA==";
       };
     };
-    "@aws-sdk/credential-provider-process-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-process";
-      packageName = "@aws-sdk/credential-provider-process";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.758.0.tgz";
-        sha512 = "AzcY74QTPqcbXWVgjpPZ3HOmxQZYPROIBz2YINF0OQk0MhezDWV/O7Xec+K1+MPGQO3qS6EDrUUlnPLjsqieHA==";
-      };
-    };
     "@aws-sdk/credential-provider-sso-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-sso";
       packageName = "@aws-sdk/credential-provider-sso";
@@ -462,15 +327,6 @@ let
         sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA==";
       };
     };
-    "@aws-sdk/credential-provider-sso-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-sso";
-      packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.758.0.tgz";
-        sha512 = "x0FYJqcOLUCv8GLLFDYMXRAQKGjoM+L0BG4BiHYZRDf24yQWFCAZsCQAYKo6XZYh2qznbsW6f//qpyJ5b0QVKQ==";
-      };
-    };
     "@aws-sdk/credential-provider-web-identity-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-web-identity";
       packageName = "@aws-sdk/credential-provider-web-identity";
@@ -480,15 +336,6 @@ let
         sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA==";
       };
     };
-    "@aws-sdk/credential-provider-web-identity-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-web-identity";
-      packageName = "@aws-sdk/credential-provider-web-identity";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.758.0.tgz";
-        sha512 = "XGguXhBqiCXMXRxcfCAVPlMbm3VyJTou79r/3mxWddHWF0XbhaQiBIbUz6vobVTD25YQRbWSmSch7VA8kI5Lrw==";
-      };
-    };
     "@aws-sdk/crt-loader-3.758.0" = {
       name = "_at_aws-sdk_slash_crt-loader";
       packageName = "@aws-sdk/crt-loader";
@@ -597,15 +444,6 @@ let
         sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag==";
       };
     };
-    "@aws-sdk/lib-storage-3.758.0" = {
-      name = "_at_aws-sdk_slash_lib-storage";
-      packageName = "@aws-sdk/lib-storage";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.758.0.tgz";
-        sha512 = "g07y7rA505zaTJNPTmvW4zYJA3gThFDE1be7kBUKhTKAdwv8jVSbOiAy2AhClXs2evSUoQiFFtD1xWxLRXPPRQ==";
-      };
-    };
     "@aws-sdk/md5-js-3.296.0" = {
       name = "_at_aws-sdk_slash_md5-js";
       packageName = "@aws-sdk/md5-js";
@@ -624,15 +462,6 @@ let
         sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg==";
       };
     };
-    "@aws-sdk/middleware-bucket-endpoint-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-bucket-endpoint";
-      packageName = "@aws-sdk/middleware-bucket-endpoint";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.734.0.tgz";
-        sha512 = "etC7G18aF7KdZguW27GE/wpbrNmYLVT755EsFc8kXpZj8D6AFKxc7OuveinJmiy0bYXAMspJUWsF6CrGpOw6CQ==";
-      };
-    };
     "@aws-sdk/middleware-content-length-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-content-length";
       packageName = "@aws-sdk/middleware-content-length";
@@ -660,15 +489,6 @@ let
         sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg==";
       };
     };
-    "@aws-sdk/middleware-expect-continue-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-expect-continue";
-      packageName = "@aws-sdk/middleware-expect-continue";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.734.0.tgz";
-        sha512 = "P38/v1l6HjuB2aFUewt7ueAW5IvKkFcv5dalPtbMGRhLeyivBOHwbCyuRKgVs7z7ClTpu9EaViEGki2jEQqEsQ==";
-      };
-    };
     "@aws-sdk/middleware-flexible-checksums-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-flexible-checksums";
       packageName = "@aws-sdk/middleware-flexible-checksums";
@@ -678,15 +498,6 @@ let
         sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew==";
       };
     };
-    "@aws-sdk/middleware-flexible-checksums-3.758.0" = {
-      name = "_at_aws-sdk_slash_middleware-flexible-checksums";
-      packageName = "@aws-sdk/middleware-flexible-checksums";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.758.0.tgz";
-        sha512 = "o8Rk71S08YTKLoSobucjnbj97OCGaXgpEDNKXpXaavUM5xLNoHCLSUPRCiEN86Ivqxg1n17Y2nSRhfbsveOXXA==";
-      };
-    };
     "@aws-sdk/middleware-host-header-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-host-header";
       packageName = "@aws-sdk/middleware-host-header";
@@ -696,15 +507,6 @@ let
         sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ==";
       };
     };
-    "@aws-sdk/middleware-host-header-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-host-header";
-      packageName = "@aws-sdk/middleware-host-header";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.734.0.tgz";
-        sha512 = "LW7RRgSOHHBzWZnigNsDIzu3AiwtjeI2X66v+Wn1P1u+eXssy1+up4ZY/h+t2sU4LU36UvEf+jrZti9c6vRnFw==";
-      };
-    };
     "@aws-sdk/middleware-location-constraint-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-location-constraint";
       packageName = "@aws-sdk/middleware-location-constraint";
@@ -714,15 +516,6 @@ let
         sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA==";
       };
     };
-    "@aws-sdk/middleware-location-constraint-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-location-constraint";
-      packageName = "@aws-sdk/middleware-location-constraint";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.734.0.tgz";
-        sha512 = "EJEIXwCQhto/cBfHdm3ZOeLxd2NlJD+X2F+ZTOxzokuhBtY0IONfC/91hOo5tWQweerojwshSMHRCKzRv1tlwg==";
-      };
-    };
     "@aws-sdk/middleware-logger-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-logger";
       packageName = "@aws-sdk/middleware-logger";
@@ -732,15 +525,6 @@ let
         sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw==";
       };
     };
-    "@aws-sdk/middleware-logger-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-logger";
-      packageName = "@aws-sdk/middleware-logger";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.734.0.tgz";
-        sha512 = "mUMFITpJUW3LcKvFok176eI5zXAUomVtahb9IQBwLzkqFYOrMJvWAvoV4yuxrJ8TlQBG8gyEnkb9SnhZvjg67w==";
-      };
-    };
     "@aws-sdk/middleware-recursion-detection-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-recursion-detection";
       packageName = "@aws-sdk/middleware-recursion-detection";
@@ -750,15 +534,6 @@ let
         sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w==";
       };
     };
-    "@aws-sdk/middleware-recursion-detection-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-recursion-detection";
-      packageName = "@aws-sdk/middleware-recursion-detection";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.734.0.tgz";
-        sha512 = "CUat2d9ITsFc2XsmeiRQO96iWpxSKYFjxvj27Hc7vo87YUHRnfMfnc8jw1EpxEwMcvBD7LsRa6vDNky6AjcrFA==";
-      };
-    };
     "@aws-sdk/middleware-retry-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-retry";
       packageName = "@aws-sdk/middleware-retry";
@@ -1029,15 +804,6 @@ let
         sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ==";
       };
     };
-    "@aws-sdk/token-providers-3.758.0" = {
-      name = "_at_aws-sdk_slash_token-providers";
-      packageName = "@aws-sdk/token-providers";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.758.0.tgz";
-        sha512 = "ckptN1tNrIfQUaGWm/ayW1ddG+imbKN7HHhjFdS4VfItsP0QQOB0+Ov+tpgb4MoNR4JaUghMIVStjIeHN2ks1w==";
-      };
-    };
     "@aws-sdk/types-3.296.0" = {
       name = "_at_aws-sdk_slash_types";
       packageName = "@aws-sdk/types";
@@ -1182,15 +948,6 @@ let
         sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw==";
       };
     };
-    "@aws-sdk/util-format-url-3.734.0" = {
-      name = "_at_aws-sdk_slash_util-format-url";
-      packageName = "@aws-sdk/util-format-url";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.734.0.tgz";
-        sha512 = "TxZMVm8V4aR/QkW9/NhujvYpPZjUYqzLwSge5imKZbWFR806NP7RMwc5ilVuHF/bMOln/cVHkl42kATElWBvNw==";
-      };
-    };
     "@aws-sdk/util-hex-encoding-3.295.0" = {
       name = "_at_aws-sdk_slash_util-hex-encoding";
       packageName = "@aws-sdk/util-hex-encoding";
@@ -1263,15 +1020,6 @@ let
         sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog==";
       };
     };
-    "@aws-sdk/util-user-agent-browser-3.734.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-browser";
-      packageName = "@aws-sdk/util-user-agent-browser";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.734.0.tgz";
-        sha512 = "xQTCus6Q9LwUuALW+S76OL0jcWtMOVu14q+GoLnWPUM7QeUw963oQcLhF7oq0CtaLLKyl4GOUfcwc773Zmwwng==";
-      };
-    };
     "@aws-sdk/util-user-agent-node-3.296.0" = {
       name = "_at_aws-sdk_slash_util-user-agent-node";
       packageName = "@aws-sdk/util-user-agent-node";
@@ -1326,15 +1074,6 @@ let
         sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow==";
       };
     };
-    "@aws-sdk/xml-builder-3.734.0" = {
-      name = "_at_aws-sdk_slash_xml-builder";
-      packageName = "@aws-sdk/xml-builder";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.734.0.tgz";
-        sha512 = "Zrjxi5qwGEcUsJ0ru7fRtW74WcTS0rbLcehoFB+rN1GRi2hbLcFaYs4PwVA5diLeAJH0gszv3x4Hr/S87MfbKQ==";
-      };
-    };
     "@azure/abort-controller-2.1.2" = {
       name = "_at_azure_slash_abort-controller";
       packageName = "@azure/abort-controller";
@@ -1767,15 +1506,6 @@ let
         sha512 = "wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==";
       };
     };
-    "@buttercup/fetch-0.2.1" = {
-      name = "_at_buttercup_slash_fetch";
-      packageName = "@buttercup/fetch";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz";
-        sha512 = "sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==";
-      };
-    };
     "@cdktf/cli-core-0.20.11" = {
       name = "_at_cdktf_slash_cli-core";
       packageName = "@cdktf/cli-core";
@@ -2867,15 +2597,6 @@ let
         sha512 = "ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==";
       };
     };
-    "@ioredis/commands-1.2.0" = {
-      name = "_at_ioredis_slash_commands";
-      packageName = "@ioredis/commands";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz";
-        sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==";
-      };
-    };
     "@isaacs/cliui-8.0.2" = {
       name = "_at_isaacs_slash_cliui";
       packageName = "@isaacs/cliui";
@@ -3785,15 +3506,6 @@ let
         sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==";
       };
     };
-    "@opentelemetry/api-1.9.0" = {
-      name = "_at_opentelemetry_slash_api";
-      packageName = "@opentelemetry/api";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz";
-        sha512 = "3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==";
-      };
-    };
     "@orval/angular-7.7.0" = {
       name = "_at_orval_slash_angular";
       packageName = "@orval/angular";
@@ -4685,33 +4397,6 @@ let
         sha512 = "fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==";
       };
     };
-    "@smithy/chunked-blob-reader-5.0.0" = {
-      name = "_at_smithy_slash_chunked-blob-reader";
-      packageName = "@smithy/chunked-blob-reader";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.0.0.tgz";
-        sha512 = "+sKqDBQqb036hh4NPaUiEkYFkTUGYzRsn3EuFhyfQfMy6oGHEUJDurLP9Ufb5dasr/XiAmPNMr6wa9afjQB+Gw==";
-      };
-    };
-    "@smithy/chunked-blob-reader-native-4.0.0" = {
-      name = "_at_smithy_slash_chunked-blob-reader-native";
-      packageName = "@smithy/chunked-blob-reader-native";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.0.0.tgz";
-        sha512 = "R9wM2yPmfEMsUmlMlIgSzOyICs0x9uu7UTHoccMyt7BWw8shcGM8HqB355+BZCPBcySvbTYMs62EgEQkNxz2ig==";
-      };
-    };
-    "@smithy/config-resolver-4.0.1" = {
-      name = "_at_smithy_slash_config-resolver";
-      packageName = "@smithy/config-resolver";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.0.1.tgz";
-        sha512 = "Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==";
-      };
-    };
     "@smithy/core-3.1.5" = {
       name = "_at_smithy_slash_core";
       packageName = "@smithy/core";
@@ -4721,60 +4406,6 @@ let
         sha512 = "HLclGWPkCsekQgsyzxLhCQLa8THWXtB5PxyYN+2O6nkyLt550KQKTlbV2D1/j5dNIQapAZM1+qFnpBFxZQkgCA==";
       };
     };
-    "@smithy/credential-provider-imds-4.0.1" = {
-      name = "_at_smithy_slash_credential-provider-imds";
-      packageName = "@smithy/credential-provider-imds";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.1.tgz";
-        sha512 = "l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==";
-      };
-    };
-    "@smithy/eventstream-codec-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-codec";
-      packageName = "@smithy/eventstream-codec";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.0.1.tgz";
-        sha512 = "Q2bCAAR6zXNVtJgifsU16ZjKGqdw/DyecKNgIgi7dlqw04fqDu0mnq+JmGphqheypVc64CYq3azSuCpAdFk2+A==";
-      };
-    };
-    "@smithy/eventstream-serde-browser-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-browser";
-      packageName = "@smithy/eventstream-serde-browser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.0.1.tgz";
-        sha512 = "HbIybmz5rhNg+zxKiyVAnvdM3vkzjE6ccrJ620iPL8IXcJEntd3hnBl+ktMwIy12Te/kyrSbUb8UCdnUT4QEdA==";
-      };
-    };
-    "@smithy/eventstream-serde-config-resolver-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-config-resolver";
-      packageName = "@smithy/eventstream-serde-config-resolver";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.0.1.tgz";
-        sha512 = "lSipaiq3rmHguHa3QFF4YcCM3VJOrY9oq2sow3qlhFY+nBSTF/nrO82MUQRPrxHQXA58J5G1UnU2WuJfi465BA==";
-      };
-    };
-    "@smithy/eventstream-serde-node-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-node";
-      packageName = "@smithy/eventstream-serde-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.0.1.tgz";
-        sha512 = "o4CoOI6oYGYJ4zXo34U8X9szDe3oGjmHgsMGiZM0j4vtNoT+h80TLnkUcrLZR3+E6HIxqW+G+9WHAVfl0GXK0Q==";
-      };
-    };
-    "@smithy/eventstream-serde-universal-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-universal";
-      packageName = "@smithy/eventstream-serde-universal";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.0.1.tgz";
-        sha512 = "Z94uZp0tGJuxds3iEAZBqGU2QiaBHP4YytLUjwZWx+oUeohCsLyUm33yp4MMBmhkuPqSbQCXq5hDet6JGUgHWA==";
-      };
-    };
     "@smithy/fetch-http-handler-5.0.1" = {
       name = "_at_smithy_slash_fetch-http-handler";
       packageName = "@smithy/fetch-http-handler";
@@ -4784,51 +4415,6 @@ let
         sha512 = "3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==";
       };
     };
-    "@smithy/hash-blob-browser-4.0.1" = {
-      name = "_at_smithy_slash_hash-blob-browser";
-      packageName = "@smithy/hash-blob-browser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.0.1.tgz";
-        sha512 = "rkFIrQOKZGS6i1D3gKJ8skJ0RlXqDvb1IyAphksaFOMzkn3v3I1eJ8m7OkLj0jf1McP63rcCEoLlkAn/HjcTRw==";
-      };
-    };
-    "@smithy/hash-node-4.0.1" = {
-      name = "_at_smithy_slash_hash-node";
-      packageName = "@smithy/hash-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.1.tgz";
-        sha512 = "TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==";
-      };
-    };
-    "@smithy/hash-stream-node-4.0.1" = {
-      name = "_at_smithy_slash_hash-stream-node";
-      packageName = "@smithy/hash-stream-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.0.1.tgz";
-        sha512 = "U1rAE1fxmReCIr6D2o/4ROqAQX+GffZpyMt3d7njtGDr2pUNmAKRWa49gsNVhCh2vVAuf3wXzWwNr2YN8PAXIw==";
-      };
-    };
-    "@smithy/invalid-dependency-4.0.1" = {
-      name = "_at_smithy_slash_invalid-dependency";
-      packageName = "@smithy/invalid-dependency";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.1.tgz";
-        sha512 = "gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==";
-      };
-    };
-    "@smithy/is-array-buffer-2.2.0" = {
-      name = "_at_smithy_slash_is-array-buffer";
-      packageName = "@smithy/is-array-buffer";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz";
-        sha512 = "GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==";
-      };
-    };
     "@smithy/is-array-buffer-4.0.0" = {
       name = "_at_smithy_slash_is-array-buffer";
       packageName = "@smithy/is-array-buffer";
@@ -4838,24 +4424,6 @@ let
         sha512 = "saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==";
       };
     };
-    "@smithy/md5-js-4.0.1" = {
-      name = "_at_smithy_slash_md5-js";
-      packageName = "@smithy/md5-js";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.0.1.tgz";
-        sha512 = "HLZ647L27APi6zXkZlzSFZIjpo8po45YiyjMGJZM3gyDY8n7dPGdmxIIljLm4gPt/7rRvutLTTkYJpZVfG5r+A==";
-      };
-    };
-    "@smithy/middleware-content-length-4.0.1" = {
-      name = "_at_smithy_slash_middleware-content-length";
-      packageName = "@smithy/middleware-content-length";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.1.tgz";
-        sha512 = "OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==";
-      };
-    };
     "@smithy/middleware-endpoint-4.0.6" = {
       name = "_at_smithy_slash_middleware-endpoint";
       packageName = "@smithy/middleware-endpoint";
@@ -4865,15 +4433,6 @@ let
         sha512 = "ftpmkTHIFqgaFugcjzLZv3kzPEFsBFSnq1JsIkr2mwFzCraZVhQk2gqN51OOeRxqhbPTkRFj39Qd2V91E/mQxg==";
       };
     };
-    "@smithy/middleware-retry-4.0.7" = {
-      name = "_at_smithy_slash_middleware-retry";
-      packageName = "@smithy/middleware-retry";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.0.7.tgz";
-        sha512 = "58j9XbUPLkqAcV1kHzVX/kAR16GT+j7DUZJqwzsxh1jtz7G82caZiGyyFgUvogVfNTg3TeAOIJepGc8TXF4AVQ==";
-      };
-    };
     "@smithy/middleware-serde-4.0.2" = {
       name = "_at_smithy_slash_middleware-serde";
       packageName = "@smithy/middleware-serde";
@@ -4946,15 +4505,6 @@ let
         sha512 = "Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==";
       };
     };
-    "@smithy/service-error-classification-4.0.1" = {
-      name = "_at_smithy_slash_service-error-classification";
-      packageName = "@smithy/service-error-classification";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.1.tgz";
-        sha512 = "3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==";
-      };
-    };
     "@smithy/shared-ini-file-loader-4.0.1" = {
       name = "_at_smithy_slash_shared-ini-file-loader";
       packageName = "@smithy/shared-ini-file-loader";
@@ -5018,24 +4568,6 @@ let
         sha512 = "sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==";
       };
     };
-    "@smithy/util-body-length-node-4.0.0" = {
-      name = "_at_smithy_slash_util-body-length-node";
-      packageName = "@smithy/util-body-length-node";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz";
-        sha512 = "q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==";
-      };
-    };
-    "@smithy/util-buffer-from-2.2.0" = {
-      name = "_at_smithy_slash_util-buffer-from";
-      packageName = "@smithy/util-buffer-from";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz";
-        sha512 = "IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==";
-      };
-    };
     "@smithy/util-buffer-from-4.0.0" = {
       name = "_at_smithy_slash_util-buffer-from";
       packageName = "@smithy/util-buffer-from";
@@ -5054,24 +4586,6 @@ let
         sha512 = "L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==";
       };
     };
-    "@smithy/util-defaults-mode-browser-4.0.7" = {
-      name = "_at_smithy_slash_util-defaults-mode-browser";
-      packageName = "@smithy/util-defaults-mode-browser";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.7.tgz";
-        sha512 = "CZgDDrYHLv0RUElOsmZtAnp1pIjwDVCSuZWOPhIOBvG36RDfX1Q9+6lS61xBf+qqvHoqRjHxgINeQz47cYFC2Q==";
-      };
-    };
-    "@smithy/util-defaults-mode-node-4.0.7" = {
-      name = "_at_smithy_slash_util-defaults-mode-node";
-      packageName = "@smithy/util-defaults-mode-node";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.7.tgz";
-        sha512 = "79fQW3hnfCdrfIi1soPbK3zmooRFnLpSx3Vxi6nUlqaaQeC5dm8plt4OTNDNqEEEDkvKghZSaoti684dQFVrGQ==";
-      };
-    };
     "@smithy/util-endpoints-3.0.1" = {
       name = "_at_smithy_slash_util-endpoints";
       packageName = "@smithy/util-endpoints";
@@ -5099,15 +4613,6 @@ let
         sha512 = "HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==";
       };
     };
-    "@smithy/util-retry-4.0.1" = {
-      name = "_at_smithy_slash_util-retry";
-      packageName = "@smithy/util-retry";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.1.tgz";
-        sha512 = "WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==";
-      };
-    };
     "@smithy/util-stream-4.1.2" = {
       name = "_at_smithy_slash_util-stream";
       packageName = "@smithy/util-stream";
@@ -5126,15 +4631,6 @@ let
         sha512 = "77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==";
       };
     };
-    "@smithy/util-utf8-2.3.0" = {
-      name = "_at_smithy_slash_util-utf8";
-      packageName = "@smithy/util-utf8";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz";
-        sha512 = "R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==";
-      };
-    };
     "@smithy/util-utf8-4.0.0" = {
       name = "_at_smithy_slash_util-utf8";
       packageName = "@smithy/util-utf8";
@@ -5144,15 +4640,6 @@ let
         sha512 = "b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==";
       };
     };
-    "@smithy/util-waiter-4.0.2" = {
-      name = "_at_smithy_slash_util-waiter";
-      packageName = "@smithy/util-waiter";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.0.2.tgz";
-        sha512 = "piUTHyp2Axx3p/kc2CIJkYSv0BAaheBQmbACZgQSSfWUumWNW+R1lL+H9PDBxKJkvOeEX+hKYEFiwO8xagL8AQ==";
-      };
-    };
     "@socket.io/component-emitter-3.1.2" = {
       name = "_at_socket.io_slash_component-emitter";
       packageName = "@socket.io/component-emitter";
@@ -5747,15 +5234,6 @@ let
         sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw==";
       };
     };
-    "@types/body-parser-1.19.5" = {
-      name = "_at_types_slash_body-parser";
-      packageName = "@types/body-parser";
-      version = "1.19.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz";
-        sha512 = "fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==";
-      };
-    };
     "@types/cacheable-request-6.0.3" = {
       name = "_at_types_slash_cacheable-request";
       packageName = "@types/cacheable-request";
@@ -5801,15 +5279,6 @@ let
         sha512 = "3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ==";
       };
     };
-    "@types/connect-3.4.38" = {
-      name = "_at_types_slash_connect";
-      packageName = "@types/connect";
-      version = "3.4.38";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz";
-        sha512 = "K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==";
-      };
-    };
     "@types/conventional-commits-parser-5.0.1" = {
       name = "_at_types_slash_conventional-commits-parser";
       packageName = "@types/conventional-commits-parser";
@@ -5900,24 +5369,6 @@ let
         sha512 = "52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==";
       };
     };
-    "@types/express-4.17.21" = {
-      name = "_at_types_slash_express";
-      packageName = "@types/express";
-      version = "4.17.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz";
-        sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==";
-      };
-    };
-    "@types/express-serve-static-core-4.19.6" = {
-      name = "_at_types_slash_express-serve-static-core";
-      packageName = "@types/express-serve-static-core";
-      version = "4.19.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz";
-        sha512 = "N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==";
-      };
-    };
     "@types/geojson-7946.0.4" = {
       name = "_at_types_slash_geojson";
       packageName = "@types/geojson";
@@ -5963,15 +5414,6 @@ let
         sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==";
       };
     };
-    "@types/http-errors-2.0.4" = {
-      name = "_at_types_slash_http-errors";
-      packageName = "@types/http-errors";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz";
-        sha512 = "D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==";
-      };
-    };
     "@types/inquirer-6.5.0" = {
       name = "_at_types_slash_inquirer";
       packageName = "@types/inquirer";
@@ -6071,15 +5513,6 @@ let
         sha512 = "RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==";
       };
     };
-    "@types/mime-1.3.5" = {
-      name = "_at_types_slash_mime";
-      packageName = "@types/mime";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz";
-        sha512 = "/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==";
-      };
-    };
     "@types/minimatch-3.0.5" = {
       name = "_at_types_slash_minimatch";
       packageName = "@types/minimatch";
@@ -6242,24 +5675,6 @@ let
         sha512 = "dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==";
       };
     };
-    "@types/qs-6.9.18" = {
-      name = "_at_types_slash_qs";
-      packageName = "@types/qs";
-      version = "6.9.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz";
-        sha512 = "kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==";
-      };
-    };
-    "@types/range-parser-1.2.7" = {
-      name = "_at_types_slash_range-parser";
-      packageName = "@types/range-parser";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz";
-        sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==";
-      };
-    };
     "@types/react-19.0.10" = {
       name = "_at_types_slash_react";
       packageName = "@types/react";
@@ -6287,24 +5702,6 @@ let
         sha512 = "I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==";
       };
     };
-    "@types/send-0.17.4" = {
-      name = "_at_types_slash_send";
-      packageName = "@types/send";
-      version = "0.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz";
-        sha512 = "x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==";
-      };
-    };
-    "@types/serve-static-1.15.7" = {
-      name = "_at_types_slash_serve-static";
-      packageName = "@types/serve-static";
-      version = "1.15.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz";
-        sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==";
-      };
-    };
     "@types/supports-color-8.1.3" = {
       name = "_at_types_slash_supports-color";
       packageName = "@types/supports-color";
@@ -9554,15 +8951,6 @@ let
         sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
       };
     };
-    "buffer-5.6.0" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz";
-        sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==";
-      };
-    };
     "buffer-5.7.1" = {
       name = "buffer";
       packageName = "buffer";
@@ -11012,15 +10400,6 @@ let
         sha512 = "eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==";
       };
     };
-    "cluster-key-slot-1.1.2" = {
-      name = "cluster-key-slot";
-      packageName = "cluster-key-slot";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz";
-        sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==";
-      };
-    };
     "cmd-extension-1.0.2" = {
       name = "cmd-extension";
       packageName = "cmd-extension";
@@ -11696,15 +11075,6 @@ let
         sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w==";
       };
     };
-    "connect-redis-7.1.1" = {
-      name = "connect-redis";
-      packageName = "connect-redis";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.1.tgz";
-        sha512 = "M+z7alnCJiuzKa8/1qAYdGUXHYfDnLolOGAUjOioB07pP39qxjG+X9ibsud7qUBc4jMV5Mcy3ugGv8eFcgamJQ==";
-      };
-    };
     "consola-3.4.0" = {
       name = "consola";
       packageName = "consola";
@@ -12030,15 +11400,6 @@ let
         sha512 = "rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==";
       };
     };
-    "cookie-0.4.1" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
-        sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
-      };
-    };
     "cookie-0.4.2" = {
       name = "cookie";
       packageName = "cookie";
@@ -12066,15 +11427,6 @@ let
         sha512 = "yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==";
       };
     };
-    "cookie-parser-1.4.6" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz";
-        sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==";
-      };
-    };
     "cookie-signature-1.0.6" = {
       name = "cookie-signature";
       packageName = "cookie-signature";
@@ -12084,15 +11436,6 @@ let
         sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==";
       };
     };
-    "cookie-signature-1.0.7" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz";
-        sha512 = "NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==";
-      };
-    };
     "cookiejar-2.1.4" = {
       name = "cookiejar";
       packageName = "cookiejar";
@@ -12300,15 +11643,6 @@ let
         sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==";
       };
     };
-    "cron-parser-4.9.0" = {
-      name = "cron-parser";
-      packageName = "cron-parser";
-      version = "4.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz";
-        sha512 = "p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==";
-      };
-    };
     "cross-dirname-0.1.0" = {
       name = "cross-dirname";
       packageName = "cross-dirname";
@@ -13380,15 +12714,6 @@ let
         sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==";
       };
     };
-    "denque-2.1.0" = {
-      name = "denque";
-      packageName = "denque";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz";
-        sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==";
-      };
-    };
     "depcheck-1.4.7" = {
       name = "depcheck";
       packageName = "depcheck";
@@ -14505,15 +13830,6 @@ let
         sha512 = "V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==";
       };
     };
-    "entities-5.0.0" = {
-      name = "entities";
-      packageName = "entities";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-5.0.0.tgz";
-        sha512 = "BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==";
-      };
-    };
     "env-paths-2.2.1" = {
       name = "env-paths";
       packageName = "env-paths";
@@ -14991,15 +14307,6 @@ let
         sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==";
       };
     };
-    "escape-goat-3.0.0" = {
-      name = "escape-goat";
-      packageName = "escape-goat";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz";
-        sha512 = "w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==";
-      };
-    };
     "escape-goat-4.0.0" = {
       name = "escape-goat";
       packageName = "escape-goat";
@@ -15603,33 +14910,6 @@ let
         sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg==";
       };
     };
-    "express-interceptor-1.2.0" = {
-      name = "express-interceptor";
-      packageName = "express-interceptor";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-interceptor/-/express-interceptor-1.2.0.tgz";
-        sha512 = "fCbcJv8ZwabDg0M/3PmHUxfr/WKHGMpAicR9TfGdhANV4M1GBDSrBTenHIK3aegyRN5S6eDwlvyNFiLynnc19w==";
-      };
-    };
-    "express-prom-bundle-7.0.0" = {
-      name = "express-prom-bundle";
-      packageName = "express-prom-bundle";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-7.0.0.tgz";
-        sha512 = "VwVaCyGBGHkHdecpTqRdW1Jm2fXK8weCUKjGjNWorc9g4M+cZ3xoj+N9uQzfRWfIPXJG5QOaiAziOIalQzMwgA==";
-      };
-    };
-    "express-session-1.18.1" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz";
-        sha512 = "a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==";
-      };
-    };
     "ext-1.7.0" = {
       name = "ext";
       packageName = "ext";
@@ -17844,15 +17124,6 @@ let
         sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
       };
     };
-    "grant-5.4.22" = {
-      name = "grant";
-      packageName = "grant";
-      version = "5.4.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grant/-/grant-5.4.22.tgz";
-        sha512 = "DEi+/JjXT84mmFYhSmv+SX14v+3Z7vuCIYAMwtdPCTXHMSLhWqSYqWAMXDUQZuV7yaJv2d84AYnkCFNooLKBsA==";
-      };
-    };
     "graphlib-2.1.8" = {
       name = "graphlib";
       packageName = "graphlib";
@@ -18384,15 +17655,6 @@ let
         sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==";
       };
     };
-    "helmet-7.2.0" = {
-      name = "helmet";
-      packageName = "helmet";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/helmet/-/helmet-7.2.0.tgz";
-        sha512 = "ZRiwvN089JfMXokizgqEPXsl2Guk094yExfoDXR0cBYWxtBbaSww/w+vT4WEJsBW2iTUi1GgZ6swmoug3Oy4Xw==";
-      };
-    };
     "help-me-3.0.0" = {
       name = "help-me";
       packageName = "help-me";
@@ -18519,15 +17781,6 @@ let
         sha512 = "sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg==";
       };
     };
-    "hot-patcher-2.0.1" = {
-      name = "hot-patcher";
-      packageName = "hot-patcher";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hot-patcher/-/hot-patcher-2.0.1.tgz";
-        sha512 = "ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q==";
-      };
-    };
     "hot-shots-6.8.7" = {
       name = "hot-shots";
       packageName = "hot-shots";
@@ -19680,15 +18933,6 @@ let
         sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==";
       };
     };
-    "ioredis-5.6.0" = {
-      name = "ioredis";
-      packageName = "ioredis";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ioredis/-/ioredis-5.6.0.tgz";
-        sha512 = "tBZlIIWbndeWBWCXWZiqtOF/yxf6yZX3tAlTJ7nfo5jhd6dctNxF7QnYlZLZ1a0o0pDoen7CgZqO+zjNaFbJAg==";
-      };
-    };
     "iota-array-1.0.0" = {
       name = "iota-array";
       packageName = "iota-array";
@@ -21174,15 +20418,6 @@ let
         sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==";
       };
     };
-    "js-base64-3.7.7" = {
-      name = "js-base64";
-      packageName = "js-base64";
-      version = "3.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz";
-        sha512 = "7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==";
-      };
-    };
     "js-cookie-3.0.5" = {
       name = "js-cookie";
       packageName = "js-cookie";
@@ -22092,15 +21327,6 @@ let
         sha512 = "7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA==";
       };
     };
-    "layerr-3.0.0" = {
-      name = "layerr";
-      packageName = "layerr";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/layerr/-/layerr-3.0.0.tgz";
-        sha512 = "tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA==";
-      };
-    };
     "lazy-1.0.11" = {
       name = "lazy";
       packageName = "lazy";
@@ -23280,15 +22506,6 @@ let
         sha512 = "ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==";
       };
     };
-    "long-timeout-0.1.1" = {
-      name = "long-timeout";
-      packageName = "long-timeout";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz";
-        sha512 = "BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==";
-      };
-    };
     "longest-streak-2.0.4" = {
       name = "longest-streak";
       packageName = "longest-streak";
@@ -25540,15 +24757,6 @@ let
         sha512 = "uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==";
       };
     };
-    "moment-timezone-0.5.47" = {
-      name = "moment-timezone";
-      packageName = "moment-timezone";
-      version = "0.5.47";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz";
-        sha512 = "UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==";
-      };
-    };
     "morgan-1.10.0" = {
       name = "morgan";
       packageName = "morgan";
@@ -25991,15 +25199,6 @@ let
         sha512 = "9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==";
       };
     };
-    "nested-property-4.0.0" = {
-      name = "nested-property";
-      packageName = "nested-property";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nested-property/-/nested-property-4.0.0.tgz";
-        sha512 = "yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA==";
-      };
-    };
     "netmask-2.0.2" = {
       name = "netmask";
       packageName = "netmask";
@@ -26369,15 +25568,6 @@ let
         sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==";
       };
     };
-    "node-schedule-2.1.1" = {
-      name = "node-schedule";
-      packageName = "node-schedule";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.1.tgz";
-        sha512 = "OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ==";
-      };
-    };
     "node-static-0.7.11" = {
       name = "node-static";
       packageName = "node-static";
@@ -28367,15 +27557,6 @@ let
         sha512 = "Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==";
       };
     };
-    "path-posix-1.0.0" = {
-      name = "path-posix";
-      packageName = "path-posix";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
-        sha512 = "1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==";
-      };
-    };
     "path-root-0.1.1" = {
       name = "path-root";
       packageName = "path-root";
@@ -29294,15 +28475,6 @@ let
         sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
       };
     };
-    "prom-client-15.1.2" = {
-      name = "prom-client";
-      packageName = "prom-client";
-      version = "15.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz";
-        sha512 = "on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ==";
-      };
-    };
     "promise-8.3.0" = {
       name = "promise";
       packageName = "promise";
@@ -30320,24 +29492,6 @@ let
         sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==";
       };
     };
-    "redis-errors-1.2.0" = {
-      name = "redis-errors";
-      packageName = "redis-errors";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
-        sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==";
-      };
-    };
-    "redis-parser-3.0.0" = {
-      name = "redis-parser";
-      packageName = "redis-parser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
-        sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==";
-      };
-    };
     "reduce-flatten-1.0.1" = {
       name = "reduce-flatten";
       packageName = "reduce-flatten";
@@ -31202,15 +30356,6 @@ let
         sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-compose-2.1.7" = {
-      name = "request-compose";
-      packageName = "request-compose";
-      version = "2.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-compose/-/request-compose-2.1.7.tgz";
-        sha512 = "27amNkWTK4Qq25XEwdmrhb4VLMiQzRSKuDfsy1o1griykcyXk5MxMHmJG+OKTRdO9PgsO7Kkn7GrEkq0UAIIMQ==";
-      };
-    };
     "request-light-0.4.0" = {
       name = "request-light";
       packageName = "request-light";
@@ -31220,15 +30365,6 @@ let
         sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA==";
       };
     };
-    "request-oauth-1.0.1" = {
-      name = "request-oauth";
-      packageName = "request-oauth";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-oauth/-/request-oauth-1.0.1.tgz";
-        sha512 = "85THTg1RgOYtqQw42JON6AqvHLptlj1biw265Tsq4fD4cPdUvhDB2Qh9NTv17yCD322ROuO9aOmpc4GyayGVBA==";
-      };
-    };
     "request-promise-4.2.6" = {
       name = "request-promise";
       packageName = "request-promise";
@@ -32264,15 +31400,6 @@ let
         sha512 = "v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==";
       };
     };
-    "serialize-error-11.0.3" = {
-      name = "serialize-error";
-      packageName = "serialize-error";
-      version = "11.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz";
-        sha512 = "2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==";
-      };
-    };
     "serialize-javascript-6.0.2" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
@@ -33164,15 +32291,6 @@ let
         sha512 = "WTECP0nYNWO1n2g5bpsV0yZN9cBmZsF8ThHFbOqVN0HBFRoaQZLLEMvMmJlKHNPYQeVngeI5+jJzIfFqOIo1OA==";
       };
     };
-    "sorted-array-functions-1.3.0" = {
-      name = "sorted-array-functions";
-      packageName = "sorted-array-functions";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz";
-        sha512 = "2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -33596,15 +32714,6 @@ let
         sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==";
       };
     };
-    "standard-as-callback-2.1.0" = {
-      name = "standard-as-callback";
-      packageName = "standard-as-callback";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz";
-        sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==";
-      };
-    };
     "stat-mode-0.3.0" = {
       name = "stat-mode";
       packageName = "stat-mode";
@@ -35477,15 +34586,6 @@ let
         sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==";
       };
     };
-    "tus-js-client-4.3.1" = {
-      name = "tus-js-client";
-      packageName = "tus-js-client";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.3.1.tgz";
-        sha512 = "ZLeYmjrkaU1fUsKbIi8JML52uAocjEZtBx4DKjRrqzrZa0O4MYwT6db+oqePlspV+FxXJAyFBc/L5gwUi2OFsg==";
-      };
-    };
     "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
@@ -36746,15 +35846,6 @@ let
         sha512 = "oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==";
       };
     };
-    "url-join-5.0.0" = {
-      name = "url-join";
-      packageName = "url-join";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz";
-        sha512 = "n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==";
-      };
-    };
     "url-parse-1.5.10" = {
       name = "url-parse";
       packageName = "url-parse";
@@ -36791,15 +35882,6 @@ let
         sha512 = "0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==";
       };
     };
-    "url-value-parser-2.2.0" = {
-      name = "url-value-parser";
-      packageName = "url-value-parser";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.2.0.tgz";
-        sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A==";
-      };
-    };
     "urlpattern-polyfill-10.0.0" = {
       name = "urlpattern-polyfill";
       packageName = "urlpattern-polyfill";
@@ -37097,15 +36179,6 @@ let
         sha512 = "d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==";
       };
     };
-    "validator-13.12.0" = {
-      name = "validator";
-      packageName = "validator";
-      version = "13.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz";
-        sha512 = "c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==";
-      };
-    };
     "value-or-function-4.0.0" = {
       name = "value-or-function";
       packageName = "value-or-function";
@@ -37997,15 +37070,6 @@ let
         sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg==";
       };
     };
-    "webdav-5.7.1" = {
-      name = "webdav";
-      packageName = "webdav";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webdav/-/webdav-5.7.1.tgz";
-        sha512 = "JVPn3nLxXJfHSRvennHsOrDYjFLkilZ1Qlw8Ff6hpqp6AvkgF7a//aOh5wA4rMp+sLZ1Km0V+iv0LyO1FIwtXg==";
-      };
-    };
     "webidl-conversions-3.0.1" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -40910,626 +39974,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@uppy/companion" = nodeEnv.buildNodePackage {
-    name = "_at_uppy_slash_companion";
-    packageName = "@uppy/companion";
-    version = "5.5.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@uppy/companion/-/companion-5.5.2.tgz";
-      sha512 = "5izGN8U64tdXMdZewoDn+12vtKddzp9X1F7q6yi3vFoWcSO4oTsCQYmpKrU8A1V/5iAsn3g+NALwA9SUpzb7Aw==";
-    };
-    dependencies = [
-      sources."@aws-crypto/crc32-5.2.0"
-      sources."@aws-crypto/crc32c-5.2.0"
-      (
-        sources."@aws-crypto/sha1-browser-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha256-browser-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      sources."@aws-crypto/sha256-js-5.2.0"
-      sources."@aws-crypto/supports-web-crypto-5.2.0"
-      (
-        sources."@aws-crypto/util-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/client-s3-3.758.0"
-      sources."@aws-sdk/client-sso-3.758.0"
-      sources."@aws-sdk/client-sts-3.758.0"
-      sources."@aws-sdk/core-3.758.0"
-      sources."@aws-sdk/credential-provider-env-3.758.0"
-      sources."@aws-sdk/credential-provider-http-3.758.0"
-      sources."@aws-sdk/credential-provider-ini-3.758.0"
-      sources."@aws-sdk/credential-provider-node-3.758.0"
-      sources."@aws-sdk/credential-provider-process-3.758.0"
-      sources."@aws-sdk/credential-provider-sso-3.758.0"
-      sources."@aws-sdk/credential-provider-web-identity-3.758.0"
-      (
-        sources."@aws-sdk/lib-storage-3.758.0"
-        // {
-          dependencies = [
-            sources."buffer-5.6.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-bucket-endpoint-3.734.0"
-      sources."@aws-sdk/middleware-expect-continue-3.734.0"
-      (
-        sources."@aws-sdk/middleware-flexible-checksums-3.758.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-host-header-3.734.0"
-      sources."@aws-sdk/middleware-location-constraint-3.734.0"
-      sources."@aws-sdk/middleware-logger-3.734.0"
-      sources."@aws-sdk/middleware-recursion-detection-3.734.0"
-      sources."@aws-sdk/middleware-sdk-s3-3.758.0"
-      sources."@aws-sdk/middleware-ssec-3.734.0"
-      sources."@aws-sdk/middleware-user-agent-3.758.0"
-      sources."@aws-sdk/nested-clients-3.758.0"
-      sources."@aws-sdk/region-config-resolver-3.734.0"
-      sources."@aws-sdk/s3-presigned-post-3.758.0"
-      sources."@aws-sdk/s3-request-presigner-3.758.0"
-      sources."@aws-sdk/signature-v4-multi-region-3.758.0"
-      sources."@aws-sdk/token-providers-3.758.0"
-      sources."@aws-sdk/types-3.734.0"
-      sources."@aws-sdk/util-arn-parser-3.723.0"
-      sources."@aws-sdk/util-endpoints-3.743.0"
-      sources."@aws-sdk/util-format-url-3.734.0"
-      sources."@aws-sdk/util-locate-window-3.723.0"
-      sources."@aws-sdk/util-user-agent-browser-3.734.0"
-      sources."@aws-sdk/util-user-agent-node-3.758.0"
-      sources."@aws-sdk/util-utf8-browser-3.259.0"
-      sources."@aws-sdk/xml-builder-3.734.0"
-      sources."@buttercup/fetch-0.2.1"
-      sources."@httptoolkit/websocket-stream-6.0.1"
-      sources."@ioredis/commands-1.2.0"
-      sources."@opentelemetry/api-1.9.0"
-      sources."@sindresorhus/is-5.6.0"
-      sources."@smithy/abort-controller-4.0.1"
-      sources."@smithy/chunked-blob-reader-5.0.0"
-      sources."@smithy/chunked-blob-reader-native-4.0.0"
-      sources."@smithy/config-resolver-4.0.1"
-      sources."@smithy/core-3.1.5"
-      sources."@smithy/credential-provider-imds-4.0.1"
-      sources."@smithy/eventstream-codec-4.0.1"
-      sources."@smithy/eventstream-serde-browser-4.0.1"
-      sources."@smithy/eventstream-serde-config-resolver-4.0.1"
-      sources."@smithy/eventstream-serde-node-4.0.1"
-      sources."@smithy/eventstream-serde-universal-4.0.1"
-      sources."@smithy/fetch-http-handler-5.0.1"
-      sources."@smithy/hash-blob-browser-4.0.1"
-      (
-        sources."@smithy/hash-node-4.0.1"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/hash-stream-node-4.0.1"
-      sources."@smithy/invalid-dependency-4.0.1"
-      sources."@smithy/is-array-buffer-2.2.0"
-      sources."@smithy/md5-js-4.0.1"
-      sources."@smithy/middleware-content-length-4.0.1"
-      sources."@smithy/middleware-endpoint-4.0.6"
-      sources."@smithy/middleware-retry-4.0.7"
-      sources."@smithy/middleware-serde-4.0.2"
-      sources."@smithy/middleware-stack-4.0.1"
-      sources."@smithy/node-config-provider-4.0.1"
-      sources."@smithy/node-http-handler-4.0.3"
-      sources."@smithy/property-provider-4.0.1"
-      sources."@smithy/protocol-http-5.0.1"
-      sources."@smithy/querystring-builder-4.0.1"
-      sources."@smithy/querystring-parser-4.0.1"
-      sources."@smithy/service-error-classification-4.0.1"
-      sources."@smithy/shared-ini-file-loader-4.0.1"
-      (
-        sources."@smithy/signature-v4-5.0.1"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/smithy-client-4.1.6"
-      sources."@smithy/types-4.1.0"
-      sources."@smithy/url-parser-4.0.1"
-      (
-        sources."@smithy/util-base64-4.0.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-body-length-browser-4.0.0"
-      sources."@smithy/util-body-length-node-4.0.0"
-      sources."@smithy/util-buffer-from-2.2.0"
-      sources."@smithy/util-config-provider-4.0.0"
-      sources."@smithy/util-defaults-mode-browser-4.0.7"
-      sources."@smithy/util-defaults-mode-node-4.0.7"
-      sources."@smithy/util-endpoints-3.0.1"
-      sources."@smithy/util-hex-encoding-4.0.0"
-      sources."@smithy/util-middleware-4.0.1"
-      sources."@smithy/util-retry-4.0.1"
-      (
-        sources."@smithy/util-stream-4.1.2"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-uri-escape-4.0.0"
-      (
-        sources."@smithy/util-utf8-4.0.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-waiter-4.0.2"
-      sources."@szmarczak/http-timer-5.0.1"
-      sources."@types/body-parser-1.19.5"
-      sources."@types/connect-3.4.38"
-      sources."@types/express-4.17.21"
-      sources."@types/express-serve-static-core-4.19.6"
-      sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/http-errors-2.0.4"
-      sources."@types/mime-1.3.5"
-      sources."@types/node-22.13.10"
-      sources."@types/qs-6.9.18"
-      sources."@types/range-parser-1.2.7"
-      sources."@types/send-0.17.4"
-      sources."@types/serve-static-1.15.7"
-      sources."@types/ws-8.18.0"
-      sources."accepts-1.3.8"
-      sources."array-flatten-1.1.1"
-      sources."asynckit-0.4.0"
-      sources."aws-crt-1.26.2"
-      sources."axios-1.8.3"
-      sources."balanced-match-1.0.2"
-      sources."base-64-1.0.0"
-      sources."base64-js-1.5.1"
-      (
-        sources."basic-auth-2.0.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."bintrees-1.0.2"
-      (
-        sources."bl-4.1.0"
-        // {
-          dependencies = [
-            sources."buffer-5.7.1"
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."bowser-2.11.0"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-6.0.3"
-      sources."buffer-equal-constant-time-1.0.1"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.9"
-      sources."byte-length-1.0.2"
-      sources."bytes-3.1.2"
-      sources."cacheable-lookup-7.0.0"
-      sources."cacheable-request-10.2.14"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."charenc-0.0.2"
-      sources."cluster-key-slot-1.1.2"
-      sources."combine-errors-3.0.3"
-      sources."combined-stream-1.0.8"
-      sources."commist-1.1.0"
-      sources."common-tags-1.8.2"
-      sources."concat-map-0.0.1"
-      (
-        sources."concat-stream-2.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."connect-redis-7.1.1"
-      sources."content-disposition-0.5.4"
-      sources."content-type-1.0.5"
-      sources."cookie-0.4.1"
-      sources."cookie-parser-1.4.6"
-      sources."cookie-signature-1.0.6"
-      sources."core-util-is-1.0.3"
-      sources."cors-2.8.5"
-      sources."cron-parser-4.9.0"
-      sources."crypt-0.0.2"
-      sources."crypto-js-4.2.0"
-      sources."custom-error-instance-2.1.1"
-      sources."data-uri-to-buffer-4.0.1"
-      sources."debug-4.4.0"
-      (
-        sources."decompress-response-6.0.0"
-        // {
-          dependencies = [
-            sources."mimic-response-3.1.0"
-          ];
-        }
-      )
-      sources."defer-to-connect-2.0.1"
-      sources."delayed-stream-1.0.0"
-      sources."denque-2.1.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."dunder-proto-1.0.1"
-      sources."duplexify-3.7.1"
-      sources."ecdsa-sig-formatter-1.0.11"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-2.0.0"
-      sources."end-of-stream-1.4.4"
-      sources."entities-5.0.0"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."escape-goat-3.0.0"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-4.0.0"
-      sources."etag-1.8.1"
-      sources."events-3.3.0"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."cookie-0.7.1"
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      (
-        sources."express-interceptor-1.2.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."express-prom-bundle-7.0.0"
-      (
-        sources."express-session-1.18.1"
-        // {
-          dependencies = [
-            sources."cookie-0.7.2"
-            sources."cookie-signature-1.0.7"
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."fast-safe-stringify-2.1.1"
-      sources."fast-xml-parser-4.4.1"
-      sources."fetch-blob-3.2.0"
-      (
-        sources."finalhandler-1.3.1"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."follow-redirects-1.15.9"
-      sources."form-data-4.0.2"
-      sources."form-data-encoder-2.1.4"
-      sources."formdata-polyfill-4.0.10"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-stream-6.0.1"
-      sources."glob-7.2.3"
-      sources."gopd-1.2.0"
-      sources."got-13.0.0"
-      sources."graceful-fs-4.2.11"
-      sources."grant-5.4.22"
-      sources."has-flag-4.0.0"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."helmet-7.2.0"
-      (
-        sources."help-me-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."hot-patcher-2.0.1"
-      sources."http-cache-semantics-4.1.1"
-      sources."http-errors-2.0.0"
-      sources."http2-wrapper-2.2.1"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ioredis-5.6.0"
-      sources."ipaddr.js-2.2.0"
-      sources."is-buffer-1.1.6"
-      sources."is-stream-2.0.1"
-      sources."isarray-1.0.0"
-      sources."isomorphic-ws-4.0.1"
-      sources."js-base64-3.7.7"
-      sources."js-sdsl-4.3.0"
-      sources."json-buffer-3.0.1"
-      sources."jsonwebtoken-9.0.2"
-      sources."jwa-1.4.1"
-      sources."jws-3.2.2"
-      sources."keyv-4.5.4"
-      sources."layerr-3.0.0"
-      sources."leven-2.1.0"
-      sources."lodash-4.17.21"
-      sources."lodash._baseiteratee-4.7.0"
-      sources."lodash._basetostring-4.12.0"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."lodash._stringtopath-4.8.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.includes-4.3.0"
-      sources."lodash.isarguments-3.1.0"
-      sources."lodash.isboolean-3.0.3"
-      sources."lodash.isinteger-4.0.4"
-      sources."lodash.isnumber-3.0.3"
-      sources."lodash.isplainobject-4.0.6"
-      sources."lodash.isstring-4.0.1"
-      sources."lodash.once-4.1.1"
-      sources."lodash.throttle-4.1.1"
-      sources."lodash.uniqby-4.5.0"
-      sources."long-timeout-0.1.1"
-      sources."lowercase-keys-3.0.0"
-      sources."lru-cache-6.0.0"
-      sources."luxon-3.5.0"
-      sources."math-intrinsics-1.1.0"
-      sources."md5-2.3.0"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.3"
-      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-response-4.0.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."moment-2.30.1"
-      sources."moment-timezone-0.5.47"
-      (
-        sources."morgan-1.10.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-            sources."on-finished-2.3.0"
-          ];
-        }
-      )
-      (
-        sources."mqtt-4.3.8"
-        // {
-          dependencies = [
-            sources."duplexify-4.1.3"
-            sources."readable-stream-3.6.2"
-            sources."ws-7.5.10"
-          ];
-        }
-      )
-      sources."mqtt-packet-6.10.0"
-      sources."ms-2.1.3"
-      sources."negotiator-0.6.3"
-      sources."nested-property-4.0.0"
-      sources."node-domexception-1.0.0"
-      sources."node-fetch-3.3.2"
-      sources."node-gyp-build-4.8.4"
-      sources."node-schedule-2.1.1"
-      sources."normalize-url-8.0.1"
-      sources."number-allocator-1.0.14"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."on-finished-2.4.1"
-      sources."on-headers-1.0.2"
-      sources."once-1.4.0"
-      sources."p-cancelable-3.0.0"
-      sources."parseurl-1.3.3"
-      sources."path-is-absolute-1.0.1"
-      sources."path-posix-1.0.0"
-      sources."path-to-regexp-0.1.12"
-      sources."process-0.11.10"
-      sources."process-nextick-args-2.0.1"
-      sources."prom-client-15.1.2"
-      sources."proper-lockfile-4.1.2"
-      (
-        sources."proxy-addr-2.0.7"
-        // {
-          dependencies = [
-            sources."ipaddr.js-1.9.1"
-          ];
-        }
-      )
-      sources."proxy-from-env-1.1.0"
-      sources."pump-3.0.2"
-      sources."qs-6.13.0"
-      sources."querystringify-2.2.0"
-      sources."quick-lru-5.1.1"
-      sources."random-bytes-1.0.0"
-      sources."randombytes-2.1.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."redis-errors-1.2.0"
-      sources."redis-parser-3.0.0"
-      sources."reinterval-1.1.0"
-      sources."request-compose-2.1.7"
-      (
-        sources."request-oauth-1.0.1"
-        // {
-          dependencies = [
-            sources."uuid-8.3.2"
-          ];
-        }
-      )
-      sources."requires-port-1.0.0"
-      sources."resolve-alpn-1.2.1"
-      sources."responselike-3.0.0"
-      sources."retry-0.12.0"
-      sources."rfdc-1.4.1"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            (
-              sources."debug-2.6.9"
-              // {
-                dependencies = [
-                  sources."ms-2.0.0"
-                ];
-              }
-            )
-            sources."encodeurl-1.0.2"
-          ];
-        }
-      )
-      sources."serialize-error-11.0.3"
-      sources."serialize-javascript-6.0.2"
-      sources."serve-static-1.16.2"
-      sources."setprototypeof-1.2.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."sorted-array-functions-1.3.0"
-      (
-        sources."split2-3.2.2"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."standard-as-callback-2.1.0"
-      sources."statuses-2.0.1"
-      (
-        sources."stream-browserify-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."stream-shift-1.0.3"
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."strnum-1.1.2"
-      sources."supports-color-8.1.1"
-      sources."tdigest-0.1.2"
-      sources."toidentifier-1.0.1"
-      sources."tslib-2.8.1"
-      sources."tus-js-client-4.3.1"
-      sources."type-fest-2.19.0"
-      sources."type-is-1.6.18"
-      sources."typedarray-0.0.6"
-      sources."uid-safe-2.1.5"
-      sources."undici-types-6.20.0"
-      sources."unpipe-1.0.0"
-      sources."url-join-5.0.0"
-      sources."url-parse-1.5.10"
-      sources."url-value-parser-2.2.0"
-      sources."utf-8-validate-5.0.10"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-9.0.1"
-      sources."validator-13.12.0"
-      sources."vary-1.1.2"
-      sources."web-streams-polyfill-3.3.3"
-      (
-        sources."webdav-5.7.1"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      sources."wrappy-1.0.2"
-      sources."ws-8.17.1"
-      sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:";
-      homepage = "https://github.com/transloadit/uppy#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@webassemblyjs/cli-1.11.1" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_cli";
     packageName = "@webassemblyjs/cli";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 805f464bd465..afdcd913b076 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -191,10 +191,6 @@ final: prev: {
     '';
   };
 
-  uppy-companion = prev."@uppy/companion".override {
-    name = "uppy-companion";
-  };
-
   vega-cli = prev.vega-cli.override {
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = with pkgs; [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f82ca15311b..207202790f36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2393,8 +2393,6 @@ with pkgs;
 
   unify = with python3Packages; toPythonApplication unify;
 
-  inherit (nodePackages) uppy-companion;
-
   usb-modeswitch-data = callPackage ../by-name/us/usb-modeswitch/data.nix { };
 
   persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };

From 260935802aeaeb81d6165e9a7ef282b5c4c686d4 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 21 Oct 2025 20:18:13 +0200
Subject: [PATCH 097/101] hwinfo: 23.5 -> 25.0

This upgrades hwinfo from 23.5 to 25.0. This includes a change to
Makefile which introduces INSTALL_PREFIX, which defaults to /usr.
Instead of replacing /usr we can now use an empty INSTALL_PREFIX.
---
 pkgs/by-name/hw/hwinfo/package.nix       | 12 +++++++-----
 pkgs/by-name/ni/nixos-facter/package.nix |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix
index 2a72312211fe..cbce9883b497 100644
--- a/pkgs/by-name/hw/hwinfo/package.nix
+++ b/pkgs/by-name/hw/hwinfo/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwinfo";
-  version = "23.5";
+  version = "25.0";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = finalAttrs.version;
-    hash = "sha256-OweEFxNxQpD7blHywhmHTA66vsYG+Qvsufm3huyUhi0=";
+    hash = "sha256-8C+FM4UAn219ZQzPxk2IfK6ZKmTZNweo4oCoSYeZJ6A=";
   };
 
   nativeBuildInputs = [
@@ -49,8 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Replace /usr paths with Nix store paths
     substituteInPlace Makefile \
-      --replace-fail "/sbin" "/bin" \
-      --replace-fail "/usr/" "/"
+      --replace-fail "/sbin" "/bin"
     substituteInPlace src/isdn/cdb/Makefile \
       --replace-fail "lex isdn_cdb.lex" "flex isdn_cdb.lex"
     substituteInPlace hwinfo.pc.in \
@@ -99,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
     "CC=${stdenv.cc.targetPrefix}cc"
     "ARCH=${stdenv.hostPlatform.uname.processor}"
   ];
-  installFlags = [ "DESTDIR=$(out)" ];
+  installFlags = [
+    "INSTALL_PREFIX="
+    "DESTDIR=$(out)"
+  ];
 
   enableParallelBuilding = false; # broken parallel dependencies
 
diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 6b75db216fc4..92e4edc377c7 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -17,8 +17,8 @@ let
     src = fetchFromGitHub {
       owner = "numtide";
       repo = "hwinfo";
-      rev = "c2259845d10694c099fb306a8cfc5a403e71c708";
-      hash = "sha256-RGIoJkYiNMRHwUclzdRMELxCgBU9Pfvaghvt3op0zM0=";
+      rev = "bfeab0b4e38b200c7a62a44d4d01601a86fe1091";
+      hash = "sha256-GL3fNCSaU45fNihEksgtPtbuLkc+tVGXtPH05wbrHwI=";
     };
   };
 in

From e6d383dcdef577fd3e9cd05767c45878c216c69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Tue, 4 Nov 2025 19:11:43 +0100
Subject: [PATCH 098/101] nixos/netbird-dashboard: Sync env with upstream

From here: https://github.com/netbirdio/dashboard/blob/main/docker/init_react_envs.sh#L69C1-L69C416
---
 nixos/modules/services/networking/netbird/dashboard.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/netbird/dashboard.nix b/nixos/modules/services/networking/netbird/dashboard.nix
index bee3aeadd55e..3cddb34a8ac0 100644
--- a/nixos/modules/services/networking/netbird/dashboard.nix
+++ b/nixos/modules/services/networking/netbird/dashboard.nix
@@ -135,10 +135,12 @@ in
                 "$AUTH_SUPPORTED_SCOPES"
                 "$NETBIRD_DRAG_QUERY_PARAMS"
                 "$NETBIRD_GOOGLE_ANALYTICS_ID"
+                "$NETBIRD_GOOGLE_TAG_MANAGER_ID"
                 "$NETBIRD_HOTJAR_TRACK_ID"
                 "$NETBIRD_MGMT_API_ENDPOINT"
                 "$NETBIRD_MGMT_GRPC_API_ENDPOINT"
                 "$NETBIRD_TOKEN_SOURCE"
+                "$NETBIRD_WASM_PATH"
                 "$USE_AUTH0"
               ];
             }

From 99fccc2055cf4b938a6aabb13b3b4ef8e66a2be6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 14:54:28 -0300
Subject: [PATCH 099/101] nanotts: fix build with cmake4, unbreak

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

diff --git a/pkgs/by-name/na/nanotts/package.nix b/pkgs/by-name/na/nanotts/package.nix
index c1a246a67262..bb6422750d1d 100644
--- a/pkgs/by-name/na/nanotts/package.nix
+++ b/pkgs/by-name/na/nanotts/package.nix
@@ -35,6 +35,10 @@ stdenv.mkDerivation {
   ];
 
   patchPhase = ''
+    # fix 64-bit compilation error in picoapi.c: picoos_uint32 vs picoos_objsize_t
+    substituteInPlace svoxpico/picoapi.c \
+      --replace-fail 'picoos_uint32 rest_mem_size;' 'picoos_objsize_t rest_mem_size;'
+
     substituteInPlace "src/main.cpp" --replace "/usr/share/pico/lang" "$out/share/lang"
     echo "" > update_build_version.sh
   '';
@@ -46,6 +50,11 @@ stdenv.mkDerivation {
       --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Speech synthesizer commandline utility that improves pico2wave, included with SVOX PicoTTS";
     homepage = "https://github.com/gmn/nanotts";

From 827fe1128aee3c6d7563f102b7c956e1e6d340b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Tue, 4 Nov 2025 18:14:55 +0100
Subject: [PATCH 100/101] maintainers: update theobori

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 62eae8512913..b955f0b08460 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25895,10 +25895,10 @@
   };
   theobori = {
     name = "Théo Bori";
-    email = "theo1.bori@epitech.eu";
+    email = "theobori@disroot.org";
     github = "theobori";
     githubId = 71843723;
-    keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D  A75C BDD5 7BE9 9D55 5965"; } ];
+    keys = [ { fingerprint = "0636 56A5 6E31 5FFD BE46  8522 6D22 B068 2CCF 9294"; } ];
   };
   theonlymrcat = {
     name = "Max Guppy";

From a2d25c29f3a72d783ac1a31bafa0845213caaf7b Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 13:46:19 -0500
Subject: [PATCH 101/101] nodePackages.webpack: drop

Not an end-user tool, also unused in nixpkgs, so drop it. Users should
use `webpack-cli` which is exposed in search if they want the cli
instead.
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 382 ------------------
 3 files changed, 1 insertion(+), 383 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ede344e09c7d..9985c4d5271c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -296,6 +296,7 @@ mapAliases {
   vue-language-server = self.vls; # added 2023-08-20
   vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12
   inherit (pkgs) web-ext; # added 2023-08-20
+  webpack = throw "'webpack' has been removed because it is a library that should be imported within a Javascript project, not an end-user tool."; # Added 2025-11-04
   inherit (pkgs) webpack-cli; # added 2024-12-03
   webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05
   webtorrent-cli = throw "webtorrent-cli has been removed because it was broken"; # added 2025-03-12
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a4d4d435c3e1..3a4374975da3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -136,7 +136,6 @@
 , "vega-lite"
 , "vercel"
 , "wavedrom-cli"
-, "webpack"
 , "wring"
 , "@yaegassy/coc-nginx"
 ]
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 75848eff0811..ce62216d9777 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -3011,15 +3011,6 @@ let
         sha512 = "R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==";
       };
     };
-    "@jridgewell/source-map-0.3.6" = {
-      name = "_at_jridgewell_slash_source-map";
-      packageName = "@jridgewell/source-map";
-      version = "0.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz";
-        sha512 = "1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==";
-      };
-    };
     "@jridgewell/sourcemap-codec-1.5.0" = {
       name = "_at_jridgewell_slash_sourcemap-codec";
       packageName = "@jridgewell/sourcemap-codec";
@@ -5333,24 +5324,6 @@ let
         sha512 = "03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==";
       };
     };
-    "@types/eslint-9.6.1" = {
-      name = "_at_types_slash_eslint";
-      packageName = "@types/eslint";
-      version = "9.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz";
-        sha512 = "FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==";
-      };
-    };
-    "@types/eslint-scope-3.7.7" = {
-      name = "_at_types_slash_eslint-scope";
-      packageName = "@types/eslint-scope";
-      version = "3.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz";
-        sha512 = "MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==";
-      };
-    };
     "@types/estree-1.0.6" = {
       name = "_at_types_slash_estree";
       packageName = "@types/estree";
@@ -5999,15 +5972,6 @@ let
         sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==";
       };
     };
-    "@webassemblyjs/ast-1.14.1" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz";
-        sha512 = "nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==";
-      };
-    };
     "@webassemblyjs/ast-1.8.1" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
@@ -6026,15 +5990,6 @@ let
         sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.13.2" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz";
-        sha512 = "6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==";
-      };
-    };
     "@webassemblyjs/floating-point-hex-parser-1.8.1" = {
       name = "_at_webassemblyjs_slash_floating-point-hex-parser";
       packageName = "@webassemblyjs/floating-point-hex-parser";
@@ -6053,15 +6008,6 @@ let
         sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz";
-        sha512 = "U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==";
-      };
-    };
     "@webassemblyjs/helper-api-error-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-api-error";
       packageName = "@webassemblyjs/helper-api-error";
@@ -6071,15 +6017,6 @@ let
         sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.14.1" = {
-      name = "_at_webassemblyjs_slash_helper-buffer";
-      packageName = "@webassemblyjs/helper-buffer";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz";
-        sha512 = "jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==";
-      };
-    };
     "@webassemblyjs/helper-buffer-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-buffer";
       packageName = "@webassemblyjs/helper-buffer";
@@ -6161,15 +6098,6 @@ let
         sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==";
       };
     };
-    "@webassemblyjs/helper-numbers-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-numbers";
-      packageName = "@webassemblyjs/helper-numbers";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz";
-        sha512 = "FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==";
-      };
-    };
     "@webassemblyjs/helper-wasm-bytecode-1.11.1" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
@@ -6179,15 +6107,6 @@ let
         sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz";
-        sha512 = "3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==";
-      };
-    };
     "@webassemblyjs/helper-wasm-bytecode-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
@@ -6197,15 +6116,6 @@ let
         sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.14.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-section";
-      packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz";
-        sha512 = "ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==";
-      };
-    };
     "@webassemblyjs/helper-wasm-section-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-wasm-section";
       packageName = "@webassemblyjs/helper-wasm-section";
@@ -6224,15 +6134,6 @@ let
         sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==";
       };
     };
-    "@webassemblyjs/ieee754-1.13.2" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz";
-        sha512 = "4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==";
-      };
-    };
     "@webassemblyjs/ieee754-1.8.1" = {
       name = "_at_webassemblyjs_slash_ieee754";
       packageName = "@webassemblyjs/ieee754";
@@ -6251,15 +6152,6 @@ let
         sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==";
       };
     };
-    "@webassemblyjs/leb128-1.13.2" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz";
-        sha512 = "Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==";
-      };
-    };
     "@webassemblyjs/leb128-1.8.1" = {
       name = "_at_webassemblyjs_slash_leb128";
       packageName = "@webassemblyjs/leb128";
@@ -6278,15 +6170,6 @@ let
         sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==";
       };
     };
-    "@webassemblyjs/utf8-1.13.2" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz";
-        sha512 = "3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==";
-      };
-    };
     "@webassemblyjs/utf8-1.8.1" = {
       name = "_at_webassemblyjs_slash_utf8";
       packageName = "@webassemblyjs/utf8";
@@ -6305,24 +6188,6 @@ let
         sha512 = "qNByLv/qST8x4CshQ8vUuX/+OebI9gK+FHkGPMnLnwALKFJOG0jIxG8TXaf2L+fVHNyd96qhsZ/GL54G3KTjpg==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-edit";
-      packageName = "@webassemblyjs/wasm-edit";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz";
-        sha512 = "RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==";
-      };
-    };
-    "@webassemblyjs/wasm-gen-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-gen";
-      packageName = "@webassemblyjs/wasm-gen";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz";
-        sha512 = "AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==";
-      };
-    };
     "@webassemblyjs/wasm-gen-1.8.1" = {
       name = "_at_webassemblyjs_slash_wasm-gen";
       packageName = "@webassemblyjs/wasm-gen";
@@ -6332,15 +6197,6 @@ let
         sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-opt";
-      packageName = "@webassemblyjs/wasm-opt";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz";
-        sha512 = "PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==";
-      };
-    };
     "@webassemblyjs/wasm-parser-1.11.1" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
@@ -6350,15 +6206,6 @@ let
         sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz";
-        sha512 = "JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==";
-      };
-    };
     "@webassemblyjs/wasm-parser-1.8.1" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
@@ -6395,15 +6242,6 @@ let
         sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==";
       };
     };
-    "@webassemblyjs/wast-printer-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz";
-        sha512 = "kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==";
-      };
-    };
     "@webassemblyjs/wast-printer-1.8.1" = {
       name = "_at_webassemblyjs_slash_wast-printer";
       packageName = "@webassemblyjs/wast-printer";
@@ -6926,15 +6764,6 @@ let
         sha512 = "vuBv+fm2s6cqUyey2A7qYcvsik+GMDJsw8BARP2sDE76cqmaZVarsvHf7Vx6VJ0Xk8gLl+u3MoAPf6gKzJefeA==";
       };
     };
-    "ajv-keywords-5.1.0" = {
-      name = "ajv-keywords";
-      packageName = "ajv-keywords";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz";
-        sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==";
-      };
-    };
     "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
@@ -13776,15 +13605,6 @@ let
         sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q==";
       };
     };
-    "enhanced-resolve-5.18.1" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "5.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz";
-        sha512 = "ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==";
-      };
-    };
     "entities-1.0.0" = {
       name = "entities";
       packageName = "entities";
@@ -13956,15 +13776,6 @@ let
         sha512 = "cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==";
       };
     };
-    "es-module-lexer-1.6.0" = {
-      name = "es-module-lexer";
-      packageName = "es-module-lexer";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz";
-        sha512 = "qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==";
-      };
-    };
     "es-object-atoms-1.1.1" = {
       name = "es-object-atoms";
       packageName = "es-object-atoms";
@@ -14424,15 +14235,6 @@ let
         sha512 = "+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A==";
       };
     };
-    "eslint-scope-5.1.1" = {
-      name = "eslint-scope";
-      packageName = "eslint-scope";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz";
-        sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==";
-      };
-    };
     "eslint-scope-8.3.0" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
@@ -16845,15 +16647,6 @@ let
         sha512 = "R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==";
       };
     };
-    "glob-to-regexp-0.4.1" = {
-      name = "glob-to-regexp";
-      packageName = "glob-to-regexp";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz";
-        sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
-      };
-    };
     "glob-watcher-6.0.0" = {
       name = "glob-watcher";
       packageName = "glob-watcher";
@@ -20319,15 +20112,6 @@ let
         sha512 = "2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==";
       };
     };
-    "jest-worker-27.5.1" = {
-      name = "jest-worker";
-      packageName = "jest-worker";
-      version = "27.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz";
-        sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==";
-      };
-    };
     "jimp-0.16.13" = {
       name = "jimp";
       packageName = "jimp";
@@ -21660,15 +21444,6 @@ let
         sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==";
       };
     };
-    "loader-runner-4.3.0" = {
-      name = "loader-runner";
-      packageName = "loader-runner";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz";
-        sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==";
-      };
-    };
     "loady-0.0.5" = {
       name = "loady";
       packageName = "loady";
@@ -31220,15 +30995,6 @@ let
         sha512 = "UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==";
       };
     };
-    "schema-utils-4.3.0" = {
-      name = "schema-utils";
-      packageName = "schema-utils";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz";
-        sha512 = "Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==";
-      };
-    };
     "scoped-regex-3.0.0" = {
       name = "scoped-regex";
       packageName = "scoped-regex";
@@ -33884,24 +33650,6 @@ let
         sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg==";
       };
     };
-    "terser-5.39.0" = {
-      name = "terser";
-      packageName = "terser";
-      version = "5.39.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz";
-        sha512 = "LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==";
-      };
-    };
-    "terser-webpack-plugin-5.3.14" = {
-      name = "terser-webpack-plugin";
-      packageName = "terser-webpack-plugin";
-      version = "5.3.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz";
-        sha512 = "vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==";
-      };
-    };
     "text-decoder-1.2.3" = {
       name = "text-decoder";
       packageName = "text-decoder";
@@ -36989,15 +36737,6 @@ let
         sha512 = "9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==";
       };
     };
-    "watchpack-2.4.2" = {
-      name = "watchpack";
-      packageName = "watchpack";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz";
-        sha512 = "TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==";
-      };
-    };
     "wavedrom-3.5.0" = {
       name = "wavedrom";
       packageName = "wavedrom";
@@ -37088,24 +36827,6 @@ let
         sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==";
       };
     };
-    "webpack-5.98.0" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "5.98.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz";
-        sha512 = "UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==";
-      };
-    };
-    "webpack-sources-3.2.3" = {
-      name = "webpack-sources";
-      packageName = "webpack-sources";
-      version = "3.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz";
-        sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==";
-      };
-    };
     "websocket-driver-0.7.4" = {
       name = "websocket-driver";
       packageName = "websocket-driver";
@@ -55610,109 +55331,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  webpack = nodeEnv.buildNodePackage {
-    name = "webpack";
-    packageName = "webpack";
-    version = "5.98.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz";
-      sha512 = "UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==";
-    };
-    dependencies = [
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@types/eslint-9.6.1"
-      sources."@types/eslint-scope-3.7.7"
-      sources."@types/estree-1.0.6"
-      sources."@types/json-schema-7.0.15"
-      sources."@types/node-22.13.10"
-      sources."@webassemblyjs/ast-1.14.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.13.2"
-      sources."@webassemblyjs/helper-api-error-1.13.2"
-      sources."@webassemblyjs/helper-buffer-1.14.1"
-      sources."@webassemblyjs/helper-numbers-1.13.2"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.13.2"
-      sources."@webassemblyjs/helper-wasm-section-1.14.1"
-      sources."@webassemblyjs/ieee754-1.13.2"
-      sources."@webassemblyjs/leb128-1.13.2"
-      sources."@webassemblyjs/utf8-1.13.2"
-      sources."@webassemblyjs/wasm-edit-1.14.1"
-      sources."@webassemblyjs/wasm-gen-1.14.1"
-      sources."@webassemblyjs/wasm-opt-1.14.1"
-      sources."@webassemblyjs/wasm-parser-1.14.1"
-      sources."@webassemblyjs/wast-printer-1.14.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."acorn-8.14.1"
-      sources."ajv-8.17.1"
-      sources."ajv-formats-2.1.1"
-      sources."ajv-keywords-5.1.0"
-      sources."browserslist-4.24.4"
-      sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001704"
-      sources."chrome-trace-event-1.0.4"
-      sources."commander-2.20.3"
-      sources."electron-to-chromium-1.5.118"
-      sources."enhanced-resolve-5.18.1"
-      sources."es-module-lexer-1.6.0"
-      sources."escalade-3.2.0"
-      sources."eslint-scope-5.1.1"
-      (
-        sources."esrecurse-4.3.0"
-        // {
-          dependencies = [
-            sources."estraverse-5.3.0"
-          ];
-        }
-      )
-      sources."estraverse-4.3.0"
-      sources."events-3.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-uri-3.0.6"
-      sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."jest-worker-27.5.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-1.0.0"
-      sources."loader-runner-4.3.0"
-      sources."merge-stream-2.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."neo-async-2.6.2"
-      sources."node-releases-2.0.19"
-      sources."picocolors-1.1.1"
-      sources."randombytes-2.1.0"
-      sources."require-from-string-2.0.2"
-      sources."safe-buffer-5.2.1"
-      sources."schema-utils-4.3.0"
-      sources."serialize-javascript-6.0.2"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."supports-color-8.1.1"
-      sources."tapable-2.2.1"
-      sources."terser-5.39.0"
-      sources."terser-webpack-plugin-5.3.14"
-      sources."undici-types-6.20.0"
-      sources."update-browserslist-db-1.1.3"
-      sources."watchpack-2.4.2"
-      sources."webpack-5.98.0"
-      sources."webpack-sources-3.2.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff";
-      homepage = "https://github.com/webpack/webpack";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   wring = nodeEnv.buildNodePackage {
     name = "wring";
     packageName = "wring";