From 45d0ddc9ad39ae2d1b4eacd7bc28fbcd399fa64a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 15 Apr 2026 16:05:45 -0500
Subject: [PATCH 01/57] oracle-instantclient: remove unused optionals from
 inherit

---
 pkgs/by-name/or/oracle-instantclient/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix
index 6cd1c5d2829a..81eac628ebbb 100644
--- a/pkgs/by-name/or/oracle-instantclient/package.nix
+++ b/pkgs/by-name/or/oracle-instantclient/package.nix
@@ -15,7 +15,7 @@
 assert odbcSupport -> unixodbc != null;
 
 let
-  inherit (lib) optional optionals optionalString;
+  inherit (lib) optional optionalString;
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 

From b8cc960e34bdc3514cef06b691bf1dedd2e4991d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 16 Apr 2026 07:45:08 -0500
Subject: [PATCH 02/57] blitz: fix unused let bindings

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

diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix
index baecb22da069..5ecff1439cdf 100644
--- a/pkgs/by-name/bl/blitz/package.nix
+++ b/pkgs/by-name/bl/blitz/package.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  inherit (lib) optional optionals;
+  inherit (lib) optional;
 in
 stdenv.mkDerivation rec {
   pname = "blitz++";

From 0dc8665db2764a7c4108e0733c92a87b0be39728 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 16 Apr 2026 07:45:14 -0500
Subject: [PATCH 03/57] gsm: fix unused let bindings

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

diff --git a/pkgs/by-name/gs/gsm/package.nix b/pkgs/by-name/gs/gsm/package.nix
index 5e08a0556cbb..15f8be8cfdfb 100644
--- a/pkgs/by-name/gs/gsm/package.nix
+++ b/pkgs/by-name/gs/gsm/package.nix
@@ -8,7 +8,7 @@
 
 let
   inherit (stdenv.hostPlatform) isDarwin;
-  inherit (lib) optional optionalString;
+  inherit (lib) optionalString;
 in
 
 stdenv.mkDerivation rec {

From c0e9b137e9d5b213c4acc21eafae75147f663b5f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 16 Apr 2026 07:45:14 -0500
Subject: [PATCH 04/57] libmikmod: fix unused let bindings

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

diff --git a/pkgs/by-name/li/libmikmod/package.nix b/pkgs/by-name/li/libmikmod/package.nix
index 4666ed47a7da..eed21156d237 100644
--- a/pkgs/by-name/li/libmikmod/package.nix
+++ b/pkgs/by-name/li/libmikmod/package.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  inherit (lib) optional optionalString;
+  inherit (lib) optional;
 
 in
 stdenv.mkDerivation (finalAttrs: {

From dd24e8bf8039408429af175785c670964a5cde86 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 16 Apr 2026 07:45:15 -0500
Subject: [PATCH 05/57] squeezelite: fix unused let bindings

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

diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix
index a40c0c5c690e..cf1596c2d42d 100644
--- a/pkgs/by-name/sq/squeezelite/package.nix
+++ b/pkgs/by-name/sq/squeezelite/package.nix
@@ -28,7 +28,7 @@
 }:
 
 let
-  inherit (lib) optional optionals optionalString;
+  inherit (lib) optional optionalString;
 
   pulseSupport = audioBackend == "pulse";
 

From 3c48983574d113d1e507b6e871ec3b1bf22732b1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 16 Apr 2026 07:45:16 -0500
Subject: [PATCH 06/57] stable-diffusion-cpp: fix unused let bindings

---
 pkgs/by-name/st/stable-diffusion-cpp/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/st/stable-diffusion-cpp/package.nix b/pkgs/by-name/st/stable-diffusion-cpp/package.nix
index f6bfc5daf6bf..05af46bff40d 100644
--- a/pkgs/by-name/st/stable-diffusion-cpp/package.nix
+++ b/pkgs/by-name/st/stable-diffusion-cpp/package.nix
@@ -35,7 +35,6 @@ let
     cmakeBool
     cmakeFeature
     optionals
-    optionalString
     ;
 
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;

From 2dae572f529125e4cca9bc0c0d784685cff21b47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 21:17:34 +0000
Subject: [PATCH 07/57] alpine: 2.29.9 -> 2.29.99

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

diff --git a/pkgs/by-name/al/alpine/package.nix b/pkgs/by-name/al/alpine/package.nix
index aed6da79df56..50eb784ba0e6 100644
--- a/pkgs/by-name/al/alpine/package.nix
+++ b/pkgs/by-name/al/alpine/package.nix
@@ -15,12 +15,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "alpine";
-  version = "2.29.9";
+  version = "2.29.99";
 
   src = fetchgit {
     url = "https://repo.or.cz/alpine.git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uAPQlF2IQPSZ0QoK9bwh6RBGsb1X0ktP1eVhs3RO44I=";
+    hash = "sha256-h/6HSqEmMZAjVtDJ+9MqM1WYBalthl0mfsC1/f4OmOw=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 39f7e919f2e29d9d0965d2898535a399cdd8d5c1 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 17 May 2026 21:17:51 +0300
Subject: [PATCH 08/57] liberation_ttf: use installFonts hook

---
 pkgs/data/fonts/liberation-fonts/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix
index bf211347e022..6a13ca682586 100644
--- a/pkgs/data/fonts/liberation-fonts/default.nix
+++ b/pkgs/data/fonts/liberation-fonts/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fontforge,
+  installFonts,
   python3,
 }:
 let
@@ -10,6 +11,7 @@ let
 
   commonNativeBuildInputs = [
     fontforge
+    installFonts
     python3
   ];
   common =
@@ -34,12 +36,14 @@ let
       inherit nativeBuildInputs postPatch;
 
       installPhase = ''
-        find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
+        runHook preInstall
 
         for i in ${toString docsToInstall}; do
           # not all docs exist in all versions
           install -m444 -Dt $out/share/doc/${pname}-${version} $i || true
         done
+
+        runHook postInstall
       '';
 
       meta = {

From 3a32efc2eaa2014fe86c6a24b8e7baab98327ac1 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Mon, 18 May 2026 17:36:01 +0300
Subject: [PATCH 09/57] lohit-fonts: use installFonts

---
 pkgs/data/fonts/lohit-fonts/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix
index 58c83ec56640..a73ebe717dd7 100644
--- a/pkgs/data/fonts/lohit-fonts/default.nix
+++ b/pkgs/data/fonts/lohit-fonts/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchurl,
+  installFonts,
 }:
 let
   fonts = {
@@ -110,19 +111,13 @@ let
         inherit hash;
       };
 
-      installPhase = ''
-        runHook preInstall
+      nativeBuildInputs = [
+        installFonts
+      ];
 
-        mkdir -p $out/share/fonts/truetype
-        cp -v *.ttf $out/share/fonts/truetype/
-
-        mkdir -p $out/etc/fonts/conf.d
-        cp -v *.conf $out/etc/fonts/conf.d
-
-        mkdir -p "$out/share/doc/lohit-${pname}"
-        cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${pname}/"
-
-        runHook postInstall
+      postInstall = ''
+        install -Dm644 *.conf -t $out/etc/fonts/conf.d
+        install -Dm644 ChangeLog* COPYRIGHT* -t "$out/share/doc/lohit-${pname}/"
       '';
 
       meta = {

From bcab0f4fb97d00a15714f4b832f8c4696cf90bb6 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Mon, 18 May 2026 18:05:58 +0300
Subject: [PATCH 10/57] data/fonts/gdouros: use installFonts

---
 pkgs/data/fonts/gdouros/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix
index d6244752efec..2f369570312b 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
 let
@@ -70,7 +71,7 @@ let
       hash,
       description,
     }:
-    stdenvNoCC.mkDerivation rec {
+    stdenvNoCC.mkDerivation {
       inherit pname version;
 
       src = fetchzip {
@@ -79,14 +80,10 @@ let
         inherit hash;
       };
 
-      installPhase = ''
-        runHook preInstall
+      nativeBuildInputs = [ installFonts ];
 
-        mkdir -p $out/share/{fonts/opentype,doc/${pname}}
-        mv *.otf                -t "$out/share/fonts/opentype"
-        mv *.{odt,ods,pdf,xlsx}       -t "$out/share/doc/${pname}"  || true  # install docs if any
-
-        runHook postInstall
+      postInstall = ''
+        install -Dm644 *.{odt,ods,pdf,xlsx} -t "$out/share/doc/${pname}" || true  # install docs if any
       '';
 
       meta = {

From c01bebe4a52cfc7f5b2140b9f0f3e9d94ac1db58 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Mon, 18 May 2026 18:11:03 +0300
Subject: [PATCH 11/57] mplus-outline-fonts: use installFonts

---
 .../fonts/mplus-outline-fonts/default.nix     | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix
index d9fcbcbfec75..bf56b2bdf339 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -3,6 +3,7 @@
   stdenvNoCC,
   fetchurl,
   fetchFromGitHub,
+  installFonts,
 }:
 
 let
@@ -18,13 +19,7 @@ in
       hash = "sha256-ROuXO0tq/1dN5FTbEF3cI+Z0nCKUc0vZyx4Nc05M3Xk=";
     };
 
-    installPhase = ''
-      runHook preInstall
-
-      install -m444 -Dt $out/share/fonts/truetype/${pname} *.ttf
-
-      runHook postInstall
-    '';
+    nativeBuildInputs = [ installFonts ];
 
     meta = {
       description = "M+ Outline Fonts (legacy OSDN release)";
@@ -46,15 +41,7 @@ in
       hash = "sha256-jzDDUs1dKjqNjsMeTA2/4vm+akIisnOuE2mPQS7IDSA=";
     };
 
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/share/fonts/{truetype,opentype}/${pname}
-      mv fonts/ttf/* $out/share/fonts/truetype/${pname}
-      mv fonts/otf/* $out/share/fonts/opentype/${pname}
-
-      runHook postInstall
-    '';
+    nativeBuildInputs = [ installFonts ];
 
     meta = {
       description = "M+ Outline Fonts (GitHub release)";

From 318f67fcf0a58542726eed1c2b6cf25425a8dcb3 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Mon, 18 May 2026 18:20:15 +0300
Subject: [PATCH 12/57] data/fonts/open-relay: use installFonts

---
 pkgs/data/fonts/open-relay/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/open-relay/default.nix b/pkgs/data/fonts/open-relay/default.nix
index caeb085fa28c..db897c3c1ab4 100644
--- a/pkgs/data/fonts/open-relay/default.nix
+++ b/pkgs/data/fonts/open-relay/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  installFonts,
 }:
 
 let
@@ -19,14 +20,11 @@ let
         hash = "sha256-UI3JP/5Os7xWB07dwlEpWuDMG1awpsOr0itmZpxGtyg=";
       };
 
-      installPhase = ''
-        runHook preInstall
+      sourceRoot = "${finalAttrs.src.name}/${directory}";
+      nativeBuildInputs = [ installFonts ];
 
-
-        install -D -m444 -t "$out/share/fonts/truetype" "${directory}/"*.ttf
-        install -D -m644 -t "$out/share/doc/${finalAttrs.pname}-${finalAttrs.version}" "${directory}/OFL.txt"
-
-        runHook postInstall
+      postInstall = ''
+        install -D -m644 -t "$out/share/doc/${finalAttrs.pname}-${finalAttrs.version}" OFL.txt
       '';
 
       meta = {

From 3189debed6b4762800b9e215de1ce451ec120507 Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Wed, 20 May 2026 17:29:53 +0200
Subject: [PATCH 13/57] firejail: 0.9.76 -> 0.9.80

the patch can be safely removed as the `--overlay` mode
which it used to address is now entirely gone from the `firejail`
codebase
---
 .../firejail/mount-nix-dir-on-overlay.patch   | 27 -------------------
 pkgs/by-name/fi/firejail/package.nix          |  8 ++----
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch

diff --git a/pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch b/pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch
deleted file mode 100644
index 6493eb4fdf26..000000000000
--- a/pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/firejail/fs_overlayfs.c
-+++ b/src/firejail/fs_overlayfs.c
-@@ -327,6 +327,16 @@
- 		errExit("mounting /dev");
- 	fs_logger("whitelist /dev");
- 
-+	// mount-bind /nix
-+	if (arg_debug)
-+		printf("Mounting /nix\n");
-+	char *nix;
-+	if (asprintf(&nix, "%s/nix", oroot) == -1)
-+		errExit("asprintf");
-+	if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0)
-+		errExit("mounting /nix");
-+	fs_logger("whitelist /nix");
-+
- 	// mount-bind run directory
- 	if (arg_debug)
- 		printf("Mounting /run\n");
-@@ -384,6 +394,7 @@
- 	free(odiff);
- 	free(owork);
- 	free(dev);
-+	free(nix);
- 	free(run);
- 	free(tmp);
- }
diff --git a/pkgs/by-name/fi/firejail/package.nix b/pkgs/by-name/fi/firejail/package.nix
index 881e83f4f5d5..5a6af45aed8c 100644
--- a/pkgs/by-name/fi/firejail/package.nix
+++ b/pkgs/by-name/fi/firejail/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "firejail";
-  version = "0.9.76";
+  version = "0.9.80";
 
   src = fetchFromGitHub {
     owner = "netblue30";
     repo = "firejail";
     rev = finalAttrs.version;
-    sha256 = "sha256-0zb5olSuXOHeRj4dqeevubedjqOuDnUEBQaD/vOj2CM=";
+    sha256 = "sha256-rw1hNX8QFy5UFDx4vaYiiWV+hy7ji6XY6eEPvieGQoM=";
   };
 
   nativeBuildInputs = [
@@ -34,10 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # Adds the /nix directory when using an overlay.
-    # Required to run any programs under this mode.
-    ./mount-nix-dir-on-overlay.patch
-
     # By default fbuilder hardcodes the firejail binary to the install path.
     # On NixOS the firejail binary is a setuid wrapper available in $PATH.
     ./fbuilder-call-firejail-on-path.patch

From 54717de1699ca1641ad8b5d2b3e298db9bfa88b2 Mon Sep 17 00:00:00 2001
From: Nathan Mills <38995150+Quipyowert2@users.noreply.github.com>
Date: Sun, 14 Jun 2026 23:47:39 +0000
Subject: [PATCH 14/57] lincity-ng: 2.14.2 -> 2.15.0

https://github.com/lincity-ng/lincity-ng/releases/tag/lincity-ng-2.15.0
---
 pkgs/by-name/li/lincity-ng/package.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/li/lincity-ng/package.nix b/pkgs/by-name/li/lincity-ng/package.nix
index 61f963b1ba88..5c0da82e2bdd 100644
--- a/pkgs/by-name/li/lincity-ng/package.nix
+++ b/pkgs/by-name/li/lincity-ng/package.nix
@@ -1,9 +1,9 @@
 {
   stdenv,
-  SDL2,
-  SDL2_image,
-  SDL2_mixer,
-  SDL2_ttf,
+  sdl3,
+  sdl3-image,
+  sdl3-mixer,
+  sdl3-ttf,
   cmake,
   fetchFromGitHub,
   fmt,
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lincity-ng";
-  version = "2.14.2";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "lincity-ng";
     repo = "lincity-ng";
     tag = "lincity-ng-${finalAttrs.version}";
-    hash = "sha256-HW+bB9xnrok8tWKIJJUt3Qgo5e9HmI6NZORG4PazmEM=";
+    hash = "sha256-NgOMbFsK/8njP3hOT9N9E9TRipSW+7CAw1oVDW1F5QU=";
   };
 
   hardeningDisable = [ "format" ];
@@ -47,10 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fmt
-    SDL2
-    SDL2_image
-    SDL2_mixer
-    SDL2_ttf
+    sdl3
+    sdl3-image
+    sdl3-mixer
+    sdl3-ttf
     libx11
     libwebp
     libtiff
@@ -68,8 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   env.NIX_CFLAGS_COMPILE = "
-    -I${lib.getDev SDL2_image}/include/SDL2
-    -I${lib.getDev SDL2_mixer}/include/SDL2
+    -I${lib.getDev sdl3-image}/include/SDL3
+    -I${lib.getDev sdl3-mixer}/include/SDL3
   ";
 
   meta = {

From d00bdef79be1c7b729be994396816929dd1b3a62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jul 2026 00:45:41 +0000
Subject: [PATCH 15/57] python3Packages.strawberry-graphql-django: 0.86.0 ->
 0.86.5

---
 .../python-modules/strawberry-graphql-django/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/strawberry-graphql-django/default.nix b/pkgs/development/python-modules/strawberry-graphql-django/default.nix
index 54a467314af6..305a82c01bd8 100644
--- a/pkgs/development/python-modules/strawberry-graphql-django/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql-django/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql-django";
-  version = "0.86.0";
+  version = "0.86.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry-django";
     tag = version;
-    hash = "sha256-pWhYJsfUxfK8FH9jSPWhd2P89AVYM5Z3wA2OlU6XLRo=";
+    hash = "sha256-eksnTz6o9bj6LcmflwVEnnBkjLj3GyNG9NAX/IietmI=";
   };
 
   postPatch = ''

From 2365696627e689ffc74d0e0ab926c914223baedb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Jul 2026 12:28:47 +0000
Subject: [PATCH 16/57] libosip: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/by-name/li/libosip/package.nix b/pkgs/by-name/li/libosip/package.nix
index b0515180856f..1a3e05729ba5 100644
--- a/pkgs/by-name/li/libosip/package.nix
+++ b/pkgs/by-name/li/libosip/package.nix
@@ -4,10 +4,10 @@
   fetchurl,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  version = "5.3.1";
+  version = "5.3.2";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-/oL+hBYIJmrBWlwRGCFtoAxVTVAG4odaisN1Kx5q3Hk=";
+    sha256 = "sha256-Fhhvb1VAk2tiw6rKboQJ4a8lzSKrw4grOTviFfSdOwA=";
   };
   pname = "libosip2";
 

From ea040368e2f7d264d849d2263410cf5cdceffdbd Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Sat, 25 Jul 2026 23:16:53 -0400
Subject: [PATCH 17/57] texlive-bin-big: autoreconf to fix build with gcc 16

(texlive-bin-big is not a real attribute, but it does not appear to be
actually exposed as an attribute. we're building this as a dependency of
`texlivePackages.texlive-scripts`.)

autoconf 2.72 has a bug where AC_PROG_CXX would reject c++20 compilers,
and attempts to switch to c++98 or c++11 instead of using the compiler's
default. when using gcc 16, which defaults to c++20, this causes
texlive-bin-big to be built with c++20, causing issues with some of the
included icu4c headers. this bug was fixed in autoconf 2.73, so we
regenerate the autoconf declarations with the newest version of autconf
(currently 2.73). once the configure scripts distributed with the source
are regenerated with autoconf 2.73+, the `reautoconf` call should be
removed.
---
 pkgs/tools/typesetting/tex/texlive/bin.nix    | 28 +++++++++++++++----
 .../tools/typesetting/tex/texlive/default.nix |  3 ++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 9ebe2d90d7d9..b13dd6c3eec3 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -26,6 +26,9 @@
   perlPackages,
   python3Packages,
   pkg-config,
+  autoconf,
+  automake,
+  libtool,
   cmake,
   ninja,
   libpaper,
@@ -415,7 +418,12 @@ rec {
 
     hardeningDisable = [ "format" ];
 
-    inherit (core) nativeBuildInputs depsBuildBuild;
+    inherit (core) depsBuildBuild;
+    nativeBuildInputs = core.nativeBuildInputs ++ [
+      autoconf
+      automake
+      libtool
+    ];
     buildInputs = core.buildInputs ++ [
       core
       cairo
@@ -426,11 +434,21 @@ rec {
       potrace
     ];
 
-    /*
-      deleting the unused packages speeds up configure by a considerable margin
-      and ensures we do not rebuild existing libraries by mistake
-    */
+    # autoconf 2.72 has a bug where AC_PROG_CXX would reject c++20 compilers,
+    # and attempts to switch to c++98 or c++11 instead of using the compiler's
+    # default. when using gcc 16, which defaults to c++20, this causes
+    # texlive-bin-big to be built with c++11, leading to issues with some of
+    # the included icu4c headers. this bug was fixed in autoconf 2.73, so we
+    # regenerate the autoconf declarations with the newest version of autconf.
+    # once the configure scripts distributed with the source are regenerated
+    # with autoconf 2.73+, the `reautoconf` call should be removed.
+    #
+    # deleting the unused packages speeds up configure by a considerable margin
+    # and ensures we do not rebuild existing libraries by mistake
     preConfigure = ''
+      substituteInPlace ./reautoconf --replace-fail "/bin/pwd" "pwd"
+      ./reautoconf
+
       rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \
         libs/{mpfr,pixman,xpdf,zlib,zziplib} \
         texk/{afm2pl,bibtex-x,chktex,cjkutils,detex,dtl,dvi2tty,dvidvi,dviljk,dviout-util} \
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index ceba25edf09c..12de9b6345b5 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -53,6 +53,9 @@
   perlPackages,
   python3Packages,
   pkg-config,
+  autoconf,
+  automake,
+  libtool,
   cmake,
   ninja,
   libpaper,

From 485b1d73f6d187eeff5a793636ef060cbd0709a2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 8 Jun 2026 10:56:55 -0500
Subject: [PATCH 18/57] monotone: switch to finalAttrs, use SRI hash, add
 strictDeps and structuredAttrs, hardcode pname

Assisted-by: Cursor Composer 2.5
---
 .../version-management/monotone/default.nix   | 24 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 0bc7b6a2044e..6d745a221080 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -22,7 +22,6 @@
 }:
 
 let
-  version = "1.1-unstable-2021-05-01";
   perlVersion = lib.getVersion perl;
 
   botan = callPackage ./botan2.nix { enableForMonotone = true; };
@@ -30,13 +29,16 @@ in
 
 assert perlVersion != "";
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "monotone";
-  inherit version;
+  version = "1.1-unstable-2021-05-01";
+
+  strictDeps = true;
+  __structuredAttrs = true;
 
   #  src = fetchurl {
   #    url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
-  #    sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r";
+  #    hash = "sha256-+Vz2CiLU5GG+ydDnL102CcmkV2+xzEX1U9AgLOLjjIg=";
   #  };
 
   # My mirror of upstream Monotone repository
@@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
     owner = "7c6f434c";
     repo = "monotone-mirror";
     rev = "b30b0e1c16def043d2dad57d1467d5bfdecdb070";
-    hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd";
+    hash = "sha256-rb5dWCGqwuzStwIbNlsUKbGjGvgQD3gaIyiMq9RG3sE=";
   };
 
   patches = [
@@ -56,7 +58,7 @@ stdenv.mkDerivation rec {
       name = "rm-clang-float128-hack.patch";
       url = "https://github.com/7c6f434c/monotone-mirror/commit/5f01a3a9326a8dbdae7fc911b208b7c319e5f456.patch";
       revert = true;
-      sha256 = "0fzjdv49dx5lzvqhkvk50lkccagwx8h0bfha4a0k6l4qh36f9j7c";
+      hash = "sha256-7MjkzICYUDOBIgq6BSDq/CnGJgVl7gnx/rT0lshu8js=";
     })
     ./monotone-1.1-gcc-14.patch
   ];
@@ -94,15 +96,15 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    mkdir -p $out/share/${pname}-${version}
-    cp -rv contrib/ $out/share/${pname}-${version}/contrib
+    mkdir -p $out/share/monotone-${finalAttrs.version}
+    cp -rv contrib/ $out/share/monotone-${finalAttrs.version}/contrib
     mkdir -p $out/${perl.libPrefix}/${perlVersion}
     cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
 
     patchShebangs "$out/share/monotone"
-    patchShebangs "$out/share/${pname}-${version}"
+    patchShebangs "$out/share/monotone-${finalAttrs.version}"
 
-    find "$out"/share/{doc/monotone,${pname}-${version}}/contrib/ -type f | xargs sed -e 's@! */usr/bin/@!/usr/bin/env @; s@! */bin/bash@!/usr/bin/env bash@' -i
+    find "$out"/share/{doc/monotone,monotone-${finalAttrs.version}}/contrib/ -type f | xargs sed -e 's@! */usr/bin/@!/usr/bin/env @; s@! */bin/bash@!/usr/bin/env bash@' -i
   '';
 
   #doCheck = true; # some tests fail (and they take VERY long)
@@ -114,4 +116,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Plus;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79f255ec1773..5cecfaa6753a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9029,9 +9029,7 @@ with pkgs;
 
   mercurialFull = mercurial.override { fullBuild = true; };
 
-  monotone = callPackage ../applications/version-management/monotone {
-    lua = lua5;
-  };
+  monotone = callPackage ../applications/version-management/monotone { };
 
   mopidyPackages = recurseIntoAttrs (
     callPackages ../applications/audio/mopidy {

From d1436a5139567ac9864afac60ee1456ae9332d49 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 8 Jun 2026 11:13:19 -0500
Subject: [PATCH 19/57] monotone: migrate to by-name

Assisted-by: Cursor Composer 2.5
---
 .../version-management => by-name/mo}/monotone/botan2.nix       | 0
 .../monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch   | 0
 .../mo}/monotone/monotone-1.1-adapt-to-botan2.patch             | 0
 .../mo}/monotone/monotone-1.1-gcc-14.patch                      | 0
 .../monotone/default.nix => by-name/mo/monotone/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 6 files changed, 2 deletions(-)
 rename pkgs/{applications/version-management => by-name/mo}/monotone/botan2.nix (100%)
 rename pkgs/{applications/version-management => by-name/mo}/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch (100%)
 rename pkgs/{applications/version-management => by-name/mo}/monotone/monotone-1.1-adapt-to-botan2.patch (100%)
 rename pkgs/{applications/version-management => by-name/mo}/monotone/monotone-1.1-gcc-14.patch (100%)
 rename pkgs/{applications/version-management/monotone/default.nix => by-name/mo/monotone/package.nix} (100%)

diff --git a/pkgs/applications/version-management/monotone/botan2.nix b/pkgs/by-name/mo/monotone/botan2.nix
similarity index 100%
rename from pkgs/applications/version-management/monotone/botan2.nix
rename to pkgs/by-name/mo/monotone/botan2.nix
diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch b/pkgs/by-name/mo/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
similarity index 100%
rename from pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
rename to pkgs/by-name/mo/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch b/pkgs/by-name/mo/monotone/monotone-1.1-adapt-to-botan2.patch
similarity index 100%
rename from pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch
rename to pkgs/by-name/mo/monotone/monotone-1.1-adapt-to-botan2.patch
diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch b/pkgs/by-name/mo/monotone/monotone-1.1-gcc-14.patch
similarity index 100%
rename from pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch
rename to pkgs/by-name/mo/monotone/monotone-1.1-gcc-14.patch
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/by-name/mo/monotone/package.nix
similarity index 100%
rename from pkgs/applications/version-management/monotone/default.nix
rename to pkgs/by-name/mo/monotone/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5cecfaa6753a..d9818226307e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9029,8 +9029,6 @@ with pkgs;
 
   mercurialFull = mercurial.override { fullBuild = true; };
 
-  monotone = callPackage ../applications/version-management/monotone { };
-
   mopidyPackages = recurseIntoAttrs (
     callPackages ../applications/audio/mopidy {
       python = python3;

From 7bd54db11233202d345e4e83d7d4f8a9a8433415 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jul 2026 05:54:29 +0200
Subject: [PATCH 20/57] ocamlPackages.ppx_import: make compatible with OCaml
 5.5

---
 pkgs/development/ocaml-modules/ppx_import/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index 185154a4ec7b..4d55edb6570c 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchurl,
+  fetchpatch,
   ocaml,
   buildDunePackage,
   ounit,
@@ -38,6 +39,14 @@ buildDunePackage {
       ."${version}";
   };
 
+  patches =
+    # Compatibility with OCaml 5.5
+    # See https://github.com/ocaml-ppx/ppx_import/pull/107
+    lib.optional (lib.versionAtLeast ocaml.version "5.5") (fetchpatch {
+      url = "https://github.com/ocaml-ppx/ppx_import/commit/ddff918dc86f3d336af60ea67de4a0b5373b7409.patch";
+      hash = "sha256-PenEGKPltvzJY//YoU5iNqZIYGz3vBGXZONBcwgQgjY=";
+    });
+
   propagatedBuildInputs = [
     ppxlib
   ];
@@ -54,6 +63,5 @@ buildDunePackage {
     description = "Syntax extension for importing declarations from interface files";
     license = lib.licenses.mit;
     homepage = "https://github.com/ocaml-ppx/ppx_import";
-    broken = lib.versionAtLeast ocaml.version "5.5";
   };
 }

From 288887a20afd9bc518be524faf9a62c6a58a2b1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Jul 2026 11:30:39 +0000
Subject: [PATCH 21/57] reqable: 3.2.10 -> 3.2.16

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

diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix
index a50b69ba9f4a..fd9e675f9912 100644
--- a/pkgs/by-name/re/reqable/package.nix
+++ b/pkgs/by-name/re/reqable/package.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "reqable";
-  version = "3.2.10";
+  version = "3.2.16";
 
   src = fetchurl {
     url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb";
-    hash = "sha256-IojbkSAQK7eL2dR6ZqXXBCs/TWpEeB/SGYbuN70Ecnw=";
+    hash = "sha256-E9bVx3BcHOY9Vq7ZyH3UsIRG3NWWXkRIbW9Zvy9lTQo=";
   };
 
   nativeBuildInputs = [

From db6568dfd8141963f46d8e125eade0c8fa256133 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Jul 2026 08:41:05 +0000
Subject: [PATCH 22/57] atop: 2.12.1 -> 2.13.0

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

diff --git a/pkgs/by-name/at/atop/package.nix b/pkgs/by-name/at/atop/package.nix
index 0463c91245ea..f5dcfc82c50b 100644
--- a/pkgs/by-name/at/atop/package.nix
+++ b/pkgs/by-name/at/atop/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "atop";
-  version = "2.12.1";
+  version = "2.13.0";
 
   src = fetchurl {
     url = "https://www.atoptool.nl/download/atop-${finalAttrs.version}.tar.gz";
-    hash = "sha256-T9vmfF36+JQFY54YWZ9OrneXgHP/pU88eMNoq1S9EvY=";
+    hash = "sha256-6hgvhMn1LKki5a9PF9/5f/QkQApPL5I5Mxemr2bmqHQ=";
   };
 
   nativeBuildInputs = [

From 58863ea42e5b399a98e1610e43c5128520cf5a3e Mon Sep 17 00:00:00 2001
From: SED4906 <sed4906birdie@gmail.com>
Date: Wed, 29 Jul 2026 10:11:48 -0700
Subject: [PATCH 23/57] xscreensaver: 6.13 -> 6.15

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

diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix
index 013ba64959b0..85d73acc5058 100644
--- a/pkgs/by-name/xs/xscreensaver/package.nix
+++ b/pkgs/by-name/xs/xscreensaver/package.nix
@@ -35,11 +35,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xscreensaver";
-  version = "6.13";
+  version = "6.15";
 
   src = fetchurl {
     url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz";
-    hash = "sha256-pzFI3SFifP8udRMcjgwbCV8zTGiyLgnzbTfMJ5YRZ7c=";
+    hash = "sha256-0uaH5WJj+/2Pyh+5zHyTMf1PCWq1fT90glZf4BLDYtM=";
   };
 
   outputs = [
@@ -93,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix installation paths for GTK resources.
     sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
       -i driver/Makefile.in po/Makefile.in.in
+    # Fix installation path for PAM.
+    sed -e 's%PAM_ROOT	= /etc%PAM_ROOT	= @sysconfdir@%' -i driver/Makefile.in
   '';
 
   configureFlags = [

From 6b1c1c1f33fca134ec4961bdd8408acb05a04c2d Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 31 Jul 2026 21:37:32 +1000
Subject: [PATCH 24/57] xmoto: fix build on darwin

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

diff --git a/pkgs/by-name/xm/xmoto/package.nix b/pkgs/by-name/xm/xmoto/package.nix
index c09df22d00fa..05f4b59b70e9 100644
--- a/pkgs/by-name/xm/xmoto/package.nix
+++ b/pkgs/by-name/xm/xmoto/package.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     cmake
     gettext
     makeWrapper
+    pkg-config
   ];
 
   buildInputs = [

From eee871ad5e4f7c453108e12b1293e47e1c7045c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Jul 2026 18:13:28 +0000
Subject: [PATCH 25/57] baresip: 4.9.0 -> 4.10.0

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

diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index e0fdf5a9fb0e..99a3fa7c2f06 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -31,14 +31,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "4.9.0";
+  version = "4.10.0";
   pname = "baresip";
 
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eEDiv/yBKWVvKTAeelqVSAQp2xHhXRJVkK2x0FZ9tOE=";
+    hash = "sha256-EUnMcRvSvQoCgVmDVPjtfeppUiheVU2xD49D9hZbGb4=";
   };
 
   patches = [

From 34e3a9954e51001bcfd1eb8dfd0040e8fa79e36c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Aug 2026 01:08:10 +0000
Subject: [PATCH 26/57] apache-jena: 6.1.0 -> 6.2.0

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

diff --git a/pkgs/by-name/ap/apache-jena/package.nix b/pkgs/by-name/ap/apache-jena/package.nix
index 08e41eee5a6e..f736047f7ec5 100644
--- a/pkgs/by-name/ap/apache-jena/package.nix
+++ b/pkgs/by-name/ap/apache-jena/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apache-jena";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchurl {
     url = "mirror://apache/jena/binaries/apache-jena-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ZTEIqR/Zswmom8dWJYuuC8oBWHzvR1lC0RhS4766KuM=";
+    hash = "sha256-FMEu9KovAHikc75LELAV4OC4XnZ9aGfoWBZ53o/sP24=";
   };
 
   nativeBuildInputs = [

From 81cb6015ff88949a2059607fe27a6756a0585e9e Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sat, 1 Aug 2026 22:20:32 +1000
Subject: [PATCH 27/57] xen: 4.20.3 -> 4.20.4

Minor bugfixes. It's mostly a convenience release that rebased
all of the XSA patches we were accumulating.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 245 +-------------------------------
 1 file changed, 6 insertions(+), 239 deletions(-)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index 8fe896762437..6e47fa7230d9 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -173,7 +173,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xen";
-  version = "4.20.3";
+  version = "4.20.4";
 
   # This attribute can be overriden to correct the file paths in
   # `passthru` when building an unstable Xen.
@@ -185,242 +185,9 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-makefile-efi-output-directory.patch
 
     (replaceVars ./0002-scripts-external-executable-calls.patch scriptDeps)
-
-    # XSA #483
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa483.patch";
-      hash = "sha256-pZkSQKAjEIa/EHlCa2hD+3kofzpVHtFxcdp/TiWu9i8=";
-    })
-
-    # XSA #484
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa484.patch";
-      hash = "sha256-6zkTBHKfpAK2poSycEFSb3pE9pDpZwBxAe5Jf862j+U=";
-    })
-
-    # XSA #486
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa486.patch";
-      hash = "sha256-8EC1lv2JAYqchX5sHbO3NbP7haEyu1V0/72KwALG+BA=";
-    })
-
-    # XSA #488
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa488-4.20.patch";
-      hash = "sha256-QttKWdmWC6Zn5k2hd6RIMCpLWv71HB/A9mCbDP+i8to=";
-    })
-
-    # XSA #490
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa490-4.21.patch";
-      hash = "sha256-PF4zNeaS8aXHBNKLcgjVBUqmREg+nvdyHyLlhX2YBiw=";
-    })
-
-    # XSA #491
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa491-4.21.patch";
-      hash = "sha256-I21YIcaK1v7BfBJi/aiVACgR3QyN+/gXnB4YMprT4zA=";
-    })
-
-    # XSA #492
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-01.patch";
-      hash = "sha256-U3nE7jgTKh2HmS9tMVQG+TIGvgU5B1aikC3NSER0CaY=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-02.patch";
-      hash = "sha256-Y3k9ICThfnIcu59F2pFDbFWD5DL6siPJmINmC7nT2uY=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-03.patch";
-      hash = "sha256-k4nPft59/MQwYKcdrzj5d80+LDhp05e86iJWzabjkQc=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-04.patch";
-      hash = "sha256-Mn+8q9zsstXbmrS/rkDdtwWEiD3EGNlmpa+eB1wESA4=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-05.patch";
-      hash = "sha256-csf9nf6cz3skhq1ph8HIs2AEVgBkw29hP39zwqy2vwM=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-06.patch";
-      hash = "sha256-urY9bjqqzKSGqGqEhDnagLUrzDsKkARMERT7vmukeUU=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-07.patch";
-      hash = "sha256-OyUC9bJevxiMuJuyJO9Z3ScXebe7lZM95HkK5YxGino=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-08.patch";
-      hash = "sha256-g3zV+r9LKjuMbkl4gprhWqClOgDU/Kbesr39LQiM+Aw=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-09.patch";
-      hash = "sha256-Wuc5dqwm+zwlYOzDXpRgyQH584sKwETi+xcE7HASHyI=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-10.patch";
-      hash = "sha256-ggln1O+epVOErBSUhIxX7xhwBy808vnQtcae3KYoQdo=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-11.patch";
-      hash = "sha256-/Yb1i/ms8MaVsEa/nK84CTFclOKcJoWMjjQJQab7l40=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-12.patch";
-      hash = "sha256-IpUeM+t7AZ8IVlzake+PiFAe0FCeFzChy+eaN9MAiSM=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-13.patch";
-      hash = "sha256-3vZj9VrDcFtlKrlMy1OD//F+6O252m23jJ0BRShQ6wA=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-14.patch";
-      hash = "sha256-LiBavW+FTfXdELs8Fm79KeOvskRqDXytv/e7eYRgSvY=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-15.patch";
-      hash = "sha256-0eK2hIFPNDIfv2W0ivkGL8Z3F+NpN4p2X0JVKjeBYWE=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-16.patch";
-      hash = "sha256-iEEkPC9mIuSF6Swt3/myUizsc8DubSPEkLkf1zm0/NE=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-17.patch";
-      hash = "sha256-YNo1wr+fRKk8+78Jf/zqJ7q9ugbzg7gyiyJ3zU+nB60=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-18.patch";
-      hash = "sha256-qNWe3iw+bYDtvBZ2KVfcy4VKu/waOyhoKZ0L8bqLdNc=";
-    })
-
-    # XSA #493
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-01.patch";
-      hash = "sha256-SvAj+9CIyedpFENCB/lQTJUB4kpVkGh+z+NNk82lQqM=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-02.patch";
-      hash = "sha256-4fajBBBKMnMTy7mvFSUghwkRbYo833s3jATeGfiOrjc=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-03.patch";
-      hash = "sha256-/AI9gtd60UWf89NNd7+Zx1g+KyAIM2wCih/07LN5zt4=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-04.patch";
-      hash = "sha256-qvXQG9VZkgca/za3bx1zTDkmRz5lFT3JPkbdI1mlBGY=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-05.patch";
-      hash = "sha256-6pGjjPjalw6TY0n9TInE3nCXNmt6BUxwy1r1xf55U7k=";
-    })
-
-    # XSA #494
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa494-4.20.patch";
-      hash = "sha256-ns0s++J2adUD/HWuMiYad/g3MITs+twlMnkpFnP7T0w=";
-    })
-
-    # XSA #495
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa495-4.20.patch";
-      hash = "sha256-SAMu8r0yyPvD3zLCaQL53oNs+ZhV3puKUq4cCofkut8=";
-    })
-
-    # XSA #497
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa497.patch";
-      hash = "sha256-xftChrVcwMJYgkH22HUlUQXSTPee0ghPRnPVymWJr3o=";
-    })
-
-    # XSA #499
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-1.patch";
-      hash = "sha256-Xk8+g/mEAtf3HIWqHL2+0iYSihtWy/tohaP6DcLo1+s=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-2.patch";
-      hash = "sha256-YiDERwBeOvXtgsKjLbpCoLrfYQ1aw/QnXv9i4lKMrDs=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-3.patch";
-      hash = "sha256-wyEc7GW83Vf++J10s/pqJTghXgqQhwUymPjpryuq8Wg=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-4.patch";
-      hash = "sha256-bK6VYiMorwGHi25q9tPu5r/YQCMPc6NWBirLAx6oCPg=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-5.patch";
-      hash = "sha256-Vj5vcpVvuuExK2NvDBP6vrIRjTPsgx8Yv4zVt0ftUnk=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-6.patch";
-      hash = "sha256-uTBGP6WMfE5FipQ7rzOKY7FxCztQUV6jqbROtHZozoY=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-7.patch";
-      hash = "sha256-UsAx2ouUB/BNpCQCObvcjj+DLPuRBqyxlI6QQsPXtWM=";
-    })
-
-    # XSA #500
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa500.patch";
-      hash = "sha256-cQc/wkaP1wK7dzbdFHmvghK6BcokWrTAtxk0gtIDQ1E=";
-    })
-
-    # XSA #501
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa501.patch";
-      hash = "sha256-RvdzD/ZCpC7VT0/zzksse/dN5FBl8W/Gul04XQ5EyRg=";
-    })
-
-    # XSA #502
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa502-4.21.patch";
-      hash = "sha256-hSmNtFwYValGoTwYgoz0uXhQiQV/pZ4rsYRNLAY5Ak8=";
-    })
-
-    # XSA #503
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa503.patch";
-      hash = "sha256-l64K1LetmngV1V8Vy9fH4dEvUdlAH6ukXwuEMetg83A=";
-    })
-
-    # XSA #504
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa504.patch";
-      hash = "sha256-uMygMaI824GW0L4obYXfaRIiohiBZpwAvoEO6slOZCE=";
-    })
-
-    # XSA #505
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa505.patch";
-      hash = "sha256-eZ8CdfzU5Ylyi6BpB4fOJh0VHfHeWa2JsRyhH+sh400=";
-    })
-
-    # XSA #506
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa506.patch";
-      hash = "sha256-8unTCZE3Kh2JfqDSG5KrgRx9zL9J9pcVzeXnO5vUM0Y=";
-    })
-
-    # XSA #507
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa507.patch";
-      hash = "sha256-3d5h0evLsFzTAyEDYstvPFcqYLirIZxMWPSY5L868ng=";
-    })
-
-    # XSA #508
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa508.patch";
-      hash = "sha256-KhNGfEsVxlxFbnlO+yeeIj8Eo75NE9QOPmg0xlt8U6U=";
-    })
-
-    # patch `libxl` to search for `qemu-system-i386` properly. (Before 4.21)
+  ]
+  ++ optionals (versionOlder finalAttrs.version "4.21") [
+    # Patch `libxl` to search for `qemu-system-i386` properly.
     (fetchpatch {
       url = "https://github.com/xen-project/xen/commit/f6281291704aa356489f4bd927cc7348a920bd01.diff?full_index=1";
       hash = "sha256-LH+68kxH/gxdyh45kYCPxKwk+9cztLrScpC2pCNQV2M=";
@@ -438,8 +205,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xen-project";
     repo = "xen";
-    tag = "RELEASE-4.20.3";
-    hash = "sha256-+qTHIsDD2A5lVwmpJ7artnzdviT1XN05CYeu7JFxfqc=";
+    tag = "RELEASE-${finalAttrs.version}";
+    hash = "sha256-dO9Y7W6NIVbXwWdlnQawpmV6MtemczwgbZdi9gGu190=";
   };
 
   strictDeps = true;

From a89659eb86b71085c0569feaaed9851decc28fbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Aug 2026 15:38:30 +0000
Subject: [PATCH 28/57] tailscale: 1.98.10 -> 1.102.1

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

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index eb6560dbe2bf..c779517f9b79 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -24,7 +24,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "tailscale";
-  version = "1.98.10";
+  version = "1.102.1";
 
   outputs = [
     "out"
@@ -35,10 +35,10 @@ buildGoModule (finalAttrs: {
     owner = "tailscale";
     repo = "tailscale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RHnHMS5xHQ2BDn6SiHkmwwwzvHjye7OrB+QRqu3gIU8=";
+    hash = "sha256-zsYFnk6QI1MAc8ROL3RPSoQTKtmINYWAbAsaDwom0WI=";
   };
 
-  vendorHash = "sha256-oORTAfLmCGhIxgn3lapgvQLmdqxcOMhsdXbzxYeoR0o=";
+  vendorHash = "sha256-amKkUPszyhG4N5ZtrB01swBACYq76raSS+SQRneLmwc=";
 
   nativeBuildInputs = [
     makeWrapper

From 39940b557c33554ad2267c87e90a66f16880da08 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Aug 2026 11:15:26 -0700
Subject: [PATCH 29/57] ci: fix typos

Assisted-by: Claude Code (claude-opus-5)
---
 ci/github-script/get-pr-commit-details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/github-script/get-pr-commit-details.js b/ci/github-script/get-pr-commit-details.js
index 5841bb8177eb..097e14db7047 100644
--- a/ci/github-script/get-pr-commit-details.js
+++ b/ci/github-script/get-pr-commit-details.js
@@ -76,7 +76,7 @@ async function getCommitDetailsForPR({ core, pr, repoPath }) {
 
   return Promise.all(
     shas.map(async (sha) => {
-      // Subject, author name, author email, committer name, committer email (all tab-seperated)
+      // Subject, author name, author email, committer name, committer email (all tab-separated)
       // then a blank line, then filenames.
       const result = (
         await runGit({

From b28d642b6d75b2f60bff112a1eafe78d3aa0a316 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Aug 2026 11:15:27 -0700
Subject: [PATCH 30/57] maintainers: fix typos

Assisted-by: Claude Code (claude-opus-5)
---
 maintainers/scripts/dep-licenses.sh            | 2 +-
 maintainers/scripts/haskell/update-stackage.sh | 2 +-
 maintainers/scripts/sha-to-sri.py              | 2 +-
 maintainers/scripts/update-octave-packages     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/maintainers/scripts/dep-licenses.sh b/maintainers/scripts/dep-licenses.sh
index 816dcf6d7f76..aeaff532a830 100755
--- a/maintainers/scripts/dep-licenses.sh
+++ b/maintainers/scripts/dep-licenses.sh
@@ -36,7 +36,7 @@ sed '
 
 if test $(wc -l "$tmp/filter.sed" | sed 's/ .*//') == 0; then
   echo 1>&2 "
-No derivation mentionned in the stack trace.  Either your derivation does
+No derivation mentioned in the stack trace.  Either your derivation does
 not use stdenv.mkDerivation or you forgot to use the stdenv adapter named
 traceDrvLicenses.
 
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 02559e16572b..ea10c57b9011 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -34,7 +34,7 @@ fi
 # Stackage solver to use, LTS or Nightly
 # (should be capitalized like the display name)
 SOLVER=LTS
-# Stackage solver verson, if any. Use latest if empty
+# Stackage solver version, if any. Use latest if empty
 VERSION=
 TMP_TEMPLATE=update-stackage.XXXXXXX
 readonly SOLVER
diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py
index bb02a84e7cac..9f8b1f3d3d48 100755
--- a/maintainers/scripts/sha-to-sri.py
+++ b/maintainers/scripts/sha-to-sri.py
@@ -166,7 +166,7 @@ def atomicFileUpdate(target: Path):
 
     Yields a pair `(original, new)` of open files.
     `original` is the pre-existing file at `target`, open for reading;
-    `new` is an empty, temporary file in the same filder, open for writing.
+    `new` is an empty, temporary file in the same folder, open for writing.
 
     Upon exiting the context, the files are closed; if no exception was
     raised, `new` (atomically) replaces the `target`, otherwise it is deleted.
diff --git a/maintainers/scripts/update-octave-packages b/maintainers/scripts/update-octave-packages
index 49ff2ef71e6b..43b1b3ef58a8 100755
--- a/maintainers/scripts/update-octave-packages
+++ b/maintainers/scripts/update-octave-packages
@@ -30,7 +30,7 @@ INDEX = "https://raw.githubusercontent.com/gnu-octave/packages/main/packages"
 """url of Octave packages' source on GitHub"""
 
 EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip']
-"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
+"""Permitted file extensions. These are evaluated from left to right and the first occurrence is returned."""
 
 PRERELEASES = False
 

From b5e73a0b2daa529a07895aca8f6f521de2c9ed4e Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Aug 2026 11:15:27 -0700
Subject: [PATCH 31/57] pkgs: fix typos in stdenv, build-support, top-level and
 test

Assisted-by: Claude Code (claude-opus-5)
---
 .../build-fhsenv-bubblewrap/buildFHSEnv.nix   |  2 +-
 .../dotnet/add-nuget-deps/default.nix         |  2 +-
 .../make-hardcode-gsettings-patch/default.nix |  2 +-
 pkgs/stdenv/darwin/default.nix                |  2 +-
 .../inputDerivationRequiredSystemFeatures.nix |  2 +-
 pkgs/top-level/aliases.nix                    | 42 +++++++++----------
 pkgs/top-level/all-packages.nix               |  8 ++--
 pkgs/top-level/perl-packages.nix              | 14 +++----
 pkgs/top-level/python-aliases.nix             | 14 +++----
 pkgs/top-level/release.nix                    |  2 +-
 pkgs/top-level/stage.nix                      |  2 +-
 11 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
index 34d1e9c2fa1f..21316d47d5d2 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@@ -64,7 +64,7 @@ let
 
   # base packages of the fhsenv
   # these match the host's architecture, glibc_multi is used for multilib
-  # builds. glibcLocales must be before glibc or glibc_multi as otherwiese
+  # builds. glibcLocales must be before glibc or glibc_multi as otherwise
   # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available.
   baseTargetPaths = with pkgs; [
     glibcLocales
diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix
index a2c1fd63cc0e..468c8c4565c7 100644
--- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix
+++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix
@@ -96,7 +96,7 @@ attrs
 
           defaultDepsFile =
             # Wire in the depsFile such that running the script with no args
-            # runs it agains the correct deps file by default.
+            # runs it against the correct deps file by default.
             # Note that toString is necessary here as it results in the path at
             # eval time (i.e. to the file in your local Nixpkgs checkout) rather
             # than the Nix store path of the path after it's been imported.
diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix
index b803bd97eacf..c218a5a4a1ee 100644
--- a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix
+++ b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix
@@ -11,7 +11,7 @@
 
   This is useful so that libraries can find schemas even though Nix lacks
   a standard location like /usr/share, where GSettings system could look for schemas.
-  The derivation is is somewhat dependency-heavy so it is best used as part of an update script.
+  The derivation is somewhat dependency-heavy so it is best used as part of an update script.
 
   For each schema id referenced in the source code (e.g. org.gnome.evolution),
   a variable name such as `EVOLUTION` must be provided.
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index b19cdcc54de2..208f11551127 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -339,7 +339,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
   # Create a stage with the bootstrap tools. This will be used to build the subsequent stages and
   # build up the standard environment.
   #
-  # Note: Each stage depends only on the the packages in `prevStage`. If a package is not to be
+  # Note: Each stage depends only on the packages in `prevStage`. If a package is not to be
   # rebuilt, it should be passed through by inheriting it.
   (
     prevStage:
diff --git a/pkgs/stdenv/tests/inputDerivationRequiredSystemFeatures.nix b/pkgs/stdenv/tests/inputDerivationRequiredSystemFeatures.nix
index 487e55bf7f0b..7672ec9a3e5a 100644
--- a/pkgs/stdenv/tests/inputDerivationRequiredSystemFeatures.nix
+++ b/pkgs/stdenv/tests/inputDerivationRequiredSystemFeatures.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
       to a lack of system features, then that builder would also not be able to
       build `<originalDerivation>.inputDerivation`.
 
-      That was an aribtrary (and probably accidental) limitation. Building
+      That was an arbitrary (and probably accidental) limitation. Building
       input derivations never requires any system features. This test checks to
       make sure that that limitation no longer exists.
     '';
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08d69741489e..7492bdef2e2e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -406,8 +406,8 @@ mapAliases {
   binserve = throw "'binserve' has been removed because it is unmaintained upstream."; # Added 2025-11-29
   binutilsDualAs = throw "binutilsDualAs has been removed because it was only useful on `x86_64-darwin` and also only useful for the GNAT bootstrap and also not even used for that any more and actually what on earth were you using this thing for anyway?"; # Added 2026-06-27
   bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27
-  bitcoin-abc = throw "bitcoin-abc has been removed due to a lack of maintanance"; # Added 2025-06-17
-  bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintanance"; # Added 2025-06-17
+  bitcoin-abc = throw "bitcoin-abc has been removed due to a lack of maintenance"; # Added 2025-06-17
+  bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintenance"; # Added 2025-06-17
   bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
   bitwarden = throw "'bitwarden' has been renamed to/replaced by 'bitwarden-desktop'"; # Converted to throw 2025-10-27
   bitwarden_rs = throw "'bitwarden_rs' has been renamed to/replaced by 'vaultwarden'"; # Converted to throw 2025-10-27
@@ -415,12 +415,12 @@ mapAliases {
   bitwarden_rs-postgresql = throw "'bitwarden_rs-postgresql' has been renamed to/replaced by 'vaultwarden-postgresql'"; # Converted to throw 2025-10-27
   bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2025-10-27
   bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2025-10-27
-  bkyml = throw "''bkyml' has been removed due to a lack of upstream maintainance"; # Added 2026-06-16
+  bkyml = throw "'bkyml' has been removed due to a lack of upstream maintenance"; # Added 2026-06-16
   blackbird = throw "'blackbird' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
   blackbox = throw "'blackbox' has been removed since it has been deprecated and archived upstream. Consider using pass instead"; # Added 2026-01-16
   blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21
   blender-hip = throw "blender-hip has been removed in favor of setting `config.rocmSupport = true` or using `pkgsRocm.blender`"; # Added 2026-01-04
-  blender-with-packages = throw "blender-with-packages is deprecated in in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"; # Converted to throw 2025-10-26
+  blender-with-packages = throw "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"; # Converted to throw 2025-10-26
   blockbench-electron = throw "'blockbench-electron' has been renamed to/replaced by 'blockbench'"; # Converted to throw 2025-10-27
   bloomeetunes = throw "bloomeetunes is unmaintained and has been removed"; # Added 2025-08-26
   blueberry = throw "'blueberry' has been removed as it is unmaintained upstream. Consider using blueman instead"; # Added 2026-03-09
@@ -468,8 +468,8 @@ mapAliases {
   carp = throw "'carp' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   cask = throw "'cask' has been renamed to/replaced by 'emacs.pkgs.cask'"; # Converted to throw 2025-10-27
   catalyst-browser = throw "'catalyst-browser' has been removed due to a lack of maintenance and not satisfying our security criteria for browsers."; # Added 2025-06-25
-  cataract = throw "'cataract' has been removed due to a lack of maintenace"; # Added 2025-08-25
-  cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenace"; # Added 2025-08-25
+  cataract = throw "'cataract' has been removed due to a lack of maintenance"; # Added 2025-08-25
+  cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenance"; # Added 2025-08-25
   catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
   catfs = throw "'catfs' has been removed as it was unmaintained upstream"; # Added 2026-05-31
   catnip-gtk4 = throw "'catnip-gtk4' has been removed, as it has been unmaintained upstream since June 2023, use cavasik or cavalier instead"; # Added 2026-01-01
@@ -575,7 +575,7 @@ mapAliases {
   code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   CoinMP = throw "'CoinMP' has been renamed to/replaced by 'coinmp'"; # Converted to throw 2025-10-27
-  collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08
+  collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Added 2025-08-08
   colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
   commonsBcel = warnAlias "'commonsBcel' has been renamed to 'commons-bcel'" commons-bcel; # Added 2026-02-08
@@ -622,7 +622,7 @@ mapAliases {
   crossLibcStdenv = throw "'crossLibcStdenv' has been renamed to/replaced by 'stdenvNoLibc'"; # Converted to throw 2025-10-27
   cryfs = throw "'cryfs' has been removed as versions <2.x depend on FUSE 2, which is deprecated and is no longer available in Nixpkgs. 'cryfs' may be added again in the future once version 2.0.0 is stabilised. In the meantime, consider using 'gocryptfs'."; # Added 2026-07-12
   crystal_1_11 = throw "'crystal_1_11' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-09-04
-  csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Addeed 2025-11-07
+  csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Added 2025-11-07
   cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
   ctpp2 = throw "'ctpp2' has been removed due to lack of maintenance."; # Added 2025-12-31
   cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
@@ -863,7 +863,7 @@ mapAliases {
   fontcursormisc = font-cursor-misc; # Added 2026-01-19
   fontdaewoomisc = font-daewoo-misc; # Added 2026-01-19
   fontdecmisc = font-dec-misc; # Added 2026-01-19
-  fontfinder = throw "'fontfinder' has been remved as it has been unmaintained upstream since April 2023"; # Added 2026-02-07
+  fontfinder = throw "'fontfinder' has been removed as it has been unmaintained upstream since April 2023"; # Added 2026-02-07
   fontibmtype1 = font-ibm-type1; # Added 2026-01-19
   fontisasmisc = font-isas-misc; # Added 2026-01-19
   fontjismisc = font-jis-misc; # Added 2026-01-19
@@ -905,7 +905,7 @@ mapAliases {
   fusionInventory = warnAlias "'fusionInventory' has been renamed to 'fusioninventory-agent'" fusioninventory-agent; # Added 2026-02-08
   futuresql = throw "'futuresql' has been renamed to/replaced by 'libsForQt5.futuresql'"; # Converted to throw 2025-10-27
   fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27
-  fzf-zsh = throw "'fzf-zsh' has been removed because it was superseed by its builtin equivalent and archived upstream."; # Added 2026-01-17
+  fzf-zsh = throw "'fzf-zsh' has been removed because it was superseded by its builtin equivalent and archived upstream."; # Added 2026-01-17
   g4music = throw "'g4music' has been renamed to/replaced by 'gapless'"; # Converted to throw 2025-10-27
   galene-stt = throw "'galene-stt' has been removed as it is unmaintained and broken"; # Added 2026-01-27
   gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -958,7 +958,7 @@ mapAliases {
   gitfs = throw "'gitfs' has been removed, as it is broken and unmaintained upstream"; # Added 2026-05-22
   gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30
   gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
-  gkrellm = throw "'gkrellm' has been removed as it dependend on the deprecated GTK2 engine."; # Added 2026-07-30
+  gkrellm = throw "'gkrellm' has been removed as it depended on the deprecated GTK2 engine."; # Added 2026-07-30
   glabels = throw "'glabels' has been removed because it is no longer maintained. Consider using 'glabels-qt', which is an active fork."; # Added 2025-09-16
   glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17
   glew110 = warnAlias "'glew110' has been renamed to 'glew_1_10'" glew_1_10; # Added 2026-01-14
@@ -993,7 +993,7 @@ mapAliases {
   gnatcoll-xref = throw "'gnatcoll-xref' has been renamed to/replaced by 'gnatPackages.gnatcoll-xref'"; # Converted to throw 2025-10-27
   gnatcoll-zlib = throw "'gnatcoll-zlib' has been renamed to/replaced by 'gnatPackages.gnatcoll-zlib'"; # Converted to throw 2025-10-27
   gnatinspect = throw "'gnatinspect' has been renamed to/replaced by 'gnatPackages.gnatinspect'"; # Converted to throw 2025-10-27
-  gnaural = throw "'gnaural' has been removed due to lack of maintainance and relying on gtk2. Consider using 'sbagen' instead"; # Added 2026-05-22
+  gnaural = throw "'gnaural' has been removed due to lack of maintenance and relying on gtk2. Consider using 'sbagen' instead"; # Added 2026-05-22
   gnome-bluetooth_1_0 = throw "'gnome-bluetooth_1_0' has been removed as it is unmaintained upstream"; # Added 2026-03-09
   gnome-firmware-updater = throw "'gnome-firmware-updater' has been renamed to/replaced by 'gnome-firmware'"; # Converted to throw 2025-10-27
   gnome-icon-theme = throw "'gnome-icon-theme' has been removed because it is unmaintained upstream and depends on GTK 2."; # Added 2026-07-22
@@ -1153,7 +1153,7 @@ mapAliases {
   jmtpfs = throw "'jmtpfs' has been removed, as it is unmaintained"; # Added 2026-06-06
   joplin = joplin-cli; # Added 2025-11-03
   jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
-  jsduck = throw "jsduck has been removed, as it was broken and and unmaintained upstream."; # Added 2025-12-02
+  jsduck = throw "jsduck has been removed, as it was broken and unmaintained upstream."; # Added 2025-12-02
   julia_19 = throw "Julia 1.9 has reached its end of life and 'julia_19' has been removed. Please use a supported version."; # Added 2025-10-29
   julia_19-bin = throw "Julia 1.9 has reached its end of life and 'julia_19-bin' has been removed. Please use a supported version."; # Added 2025-10-29
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
@@ -1449,7 +1449,7 @@ mapAliases {
   linuxstopmotion = throw "'linuxstopmotion' has been renamed to/replaced by 'stopmotion'"; # Converted to throw 2025-10-27
   liquidfun = throw "liquidfun has been removed, as it has failed to build (and so presumed unused) for 10 years"; # Added 2025-12-19
   Literate = throw "'Literate' has been renamed to/replaced by 'literate'"; # Converted to throw 2025-10-27
-  littlefs-fuse = throw "'littlefs-fuse' has been removed as it depends on fues2, which has has been deprecated"; # Added 2026-05-05
+  littlefs-fuse = throw "'littlefs-fuse' has been removed as it depends on fues2, which has been deprecated"; # Added 2026-05-05
   littlenavmap = throw "littlenavmap has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   live-chart = throw "live-chart has been removed as it is no longer used in Nixpkgs. livechart-2 (elementary's fork) is available as pantheon.live-chart"; # Added 2025-10-10
   lixVersions = lixPackageSets.renamedDeprecatedLixVersions; # Added 2025-03-20, warning in ../tools/package-management/lix/default.nix
@@ -1592,8 +1592,8 @@ mapAliases {
   microcodeIntel = throw "'microcodeIntel' has been renamed to/replaced by 'microcode-intel'"; # Converted to throw 2025-10-27
   microsoft_gsl = throw "'microsoft_gsl' has been renamed to/replaced by 'microsoft-gsl'"; # Converted to throw 2025-10-27
   MIDIVisualizer = throw "'MIDIVisualizer' has been renamed to/replaced by 'midivisualizer'"; # Converted to throw 2025-10-27
-  midori = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
-  midori-unwrapped = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
+  midori = throw "'midori' original project has been abandoned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
+  midori-unwrapped = throw "'midori' original project has been abandoned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
   migra = throw "migra has been removed because it has transitively been marked as broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
   mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20
   mime-types = throw "'mime-types' has been renamed to/replaced by 'mailcap'"; # Converted to throw 2025-10-27
@@ -1641,7 +1641,7 @@ mapAliases {
   mpris-discord-rpc = throw "'mpris-discord-rpc' has been renamed to 'music-discord-rpc'."; # Added 2025-09-14
   mpw = throw "'mpw' has been removed, as upstream development has moved to Spectre, which is packaged as 'spectre-cli'"; # Added 2025-10-26
   mrpeach = throw "'mrpeach' has been removed as it is unmaintained"; # Added 2025-10-06
-  mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
+  mrxvt = throw "'mrxvt' has been removed due to lack of maintenance upstream"; # Added 2025-09-25
   msalsdk-dbusclient = throw "'msalsdk-dbusclient' has been removed, as it is no longer needed by 'intune-portal'"; # Added 2026-02-11
   msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14
   msp430NewlibCross = throw "'msp430NewlibCross' has been renamed to/replaced by 'msp430Newlib'"; # Converted to throw 2025-10-27
@@ -1658,7 +1658,7 @@ mapAliases {
   n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
   nagiosPluginsOfficial = throw "'nagiosPluginsOfficial' has been renamed to/replaced by 'monitoring-plugins'"; # Converted to throw 2025-10-27
   namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25
-  nanoblogger = throw "nanoblogger has been removed as upstream stopped developement in 2013"; # Added 2025-09-10
+  nanoblogger = throw "nanoblogger has been removed as upstream stopped development in 2013"; # Added 2025-09-10
   nasc = throw "'nasc' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   nats-streaming-server = throw "'nats-streaming-server' has been removed as critical bug fixes and security fixes will no longer be performed as of June of 2023"; # Added 2025-10-13
   ncdu_2 = throw "'ncdu_2' has been renamed to/replaced by 'ncdu'"; # Converted to throw 2025-10-27
@@ -2087,7 +2087,7 @@ mapAliases {
   retroarchBare = throw "'retroarchBare' has been renamed to/replaced by 'retroarch-bare'"; # Converted to throw 2025-10-27
   retroarchFull = throw "'retroarchFull' has been renamed to/replaced by 'retroarch-full'"; # Converted to throw 2025-10-27
   retroshare06 = throw "'retroshare06' has been renamed to/replaced by 'retroshare'"; # Converted to throw 2025-10-27
-  rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
+  rewind-ai = throw "'rewind-ai' has been removed due to lack of maintenance upstream"; # Added 2025-08-03
   rHttp = rhttp; # Added 2026-07-05
   rigsofrods = throw "'rigsofrods' has been renamed to/replaced by 'rigsofrods-bin'"; # Converted to throw 2025-10-27
   rili = throw "'rili' has been dropped in favor of its maintained fork 'li-ri'"; # Added 2026-01-03
@@ -2112,7 +2112,7 @@ mapAliases {
   rr-unstable = throw "'rr-unstable' has been renamed to/replaced by 'rr'"; # Converted to throw 2025-10-27
   rss-glx = throw "'rss-glx' has been removed because it was broken and depends on an outdated version of ImageMagick"; # added 2026-02-26
   rtx = throw "'rtx' has been renamed to/replaced by 'mise'"; # Converted to throw 2025-10-27
-  ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
+  ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintenance and had not been updated since 2020"; # Added 2025-08-24
   ruby_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   ruby_3_2 = throw "ruby_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
   ruby_3_5 = ruby_4_0; # Added 2025-12-22
@@ -2123,7 +2123,7 @@ mapAliases {
   runCommandNoCC = warnAlias "'runCommandNoCC' has been renamed to/replaced by 'runCommand'" runCommand; # Converted to warning 2025-10-28
   runCommandNoCCLocal = warnAlias "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'" runCommandLocal; # Converted to warning 2025-10-28
   runescape = throw "'runescape' was removed due to a lack of maintenance, insecure dependencies, and incompatibility with Jagex accounts. Please consider using 'bolt-launcher' instead."; # Added 2026-02-24
-  rust-hypervisor-firmware = throw "rust-hypevisor-firmware was removed, as it is no longer needed by Cloud Hypervisor and was broken"; # Added 2026-02-19
+  rust-hypervisor-firmware = throw "rust-hypervisor-firmware was removed, as it is no longer needed by Cloud Hypervisor and was broken"; # Added 2026-02-19
   rust-synapse-state-compress = throw "'rust-synapse-state-compress' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27
   rustc-wasm32 = throw "'rustc-wasm32' has been renamed to/replaced by 'rustc'"; # Converted to throw 2025-10-27
   rustic-rs = throw "'rustic-rs' has been renamed to/replaced by 'rustic'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 506c38f1bc91..e232316a6120 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -82,7 +82,7 @@ with pkgs;
       # TODO It would be much better to pass the `stdenvNoCC` and *unwrapped*
       # cc, bintools, compiler-rt equivalent, etc. and create all final stdenvs
       # as part of the stage. Then we would never be tempted to override a later
-      # thing to to create an earlier thing (leading to infinite recursion) and
+      # thing to create an earlier thing (leading to infinite recursion) and
       # we also would still respect the stage arguments choices for these
       # things.
       (
@@ -116,7 +116,7 @@ with pkgs;
 
     # Inputs
     `modes`
-    : An attribute set containg keys from `config.recursionMode` defaulting to true.
+    : An attribute set containing keys from `config.recursionMode` defaulting to true.
     `attrs`
     : An attribute set to scan for derivations.
 
@@ -1279,7 +1279,7 @@ with pkgs;
   appimage-run = callPackage ../tools/package-management/appimage-run { };
   appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {
     appimage-run = appimage-run.override {
-      appimage-run-tests = null; # break boostrap cycle for passthru.tests
+      appimage-run-tests = null; # break bootstrap cycle for passthru.tests
     };
   };
 
@@ -1979,7 +1979,7 @@ with pkgs;
     mkDerivation = buildEmscriptenPackage;
   };
 
-  # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
+  # The latest version used by elasticsearch, logstash, kibana and the beats from elastic.
   # When updating make sure to update all plugins or they will break!
   elk7Version = "7.17.27";
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7c52ed9443bc..34f6193bc6a3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5201,7 +5201,7 @@ with self;
       hash = "sha256-p1KK8in6OhIF3NJakd59dKxvp9lSgbmTtV6Lb0+HuZE=";
     };
     meta = {
-      description = "Set of modules to make the module developement easier";
+      description = "Set of modules to make the module development easier";
       license = with lib.licenses; [
         artistic1
         gpl1Plus
@@ -8782,7 +8782,7 @@ with self;
       hash = "sha256-tpGbpJuf6Yv98+isyue5t/eNyeceu9C3/vekXZkyTMs=";
     };
     meta = {
-      description = "Perl extension for simple genrating of unique id's";
+      description = "Perl extension for simple generating of unique id's";
       license = with lib.licenses; [
         artistic1
         gpl1Plus
@@ -9556,7 +9556,7 @@ with self;
       commonsense
     ];
     meta = {
-      description = "Deliantra suppport module to read/write archetypes, maps etc";
+      description = "Deliantra support module to read/write archetypes, maps etc";
       license = with lib.licenses; [
         artistic1
         gpl1Plus
@@ -14302,7 +14302,7 @@ with self;
       hash = "sha256-JtCfgYNuQ+rkACjVKD/lYg/m/mJ4vz6462AMSOw0r8c=";
     };
     meta = {
-      description = "Perl extension for reading from continously updated files";
+      description = "Perl extension for reading from continuously updated files";
       license = with lib.licenses; [
         artistic1
         gpl1Plus
@@ -25483,7 +25483,7 @@ with self;
     buildInputs = [ TestFatal ];
     preCheck = "rm t/icmp_ps.t t/icmpv6_ps.t"; # ping socket tests fail
     meta = {
-      description = "Asyncronously check remote host for reachability";
+      description = "Asynchronously check remote host for reachability";
       homepage = "https://github.com/frioux/Net-Async-Ping";
       license = with lib.licenses; [
         artistic1
@@ -31698,7 +31698,7 @@ with self;
       StatisticsDistributions
     ];
     meta = {
-      description = "Perl module to perform T-test on 2 independent samples Statistics::TTest::Sufficient - Perl module to perfrom T-Test on 2 indepdent samples using sufficient statistics";
+      description = "Perl module to perform T-test on 2 independent samples Statistics::TTest::Sufficient - Perl module to perform T-Test on 2 independent samples using sufficient statistics";
       license = with lib.licenses; [
         artistic1
         gpl1Plus
@@ -37204,7 +37204,7 @@ with self;
       hash = "sha256-1RP7tRQT98oeZKG9zmGU337GB23qVQZtZ7lQGR7sMqk=";
     };
     meta = {
-      description = "Tied hash with specific methods overriden by callbacks";
+      description = "Tied hash with specific methods overridden by callbacks";
       license = lib.licenses.artistic1;
     };
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b9e1bc0722a2..7a427ab8b78f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -78,7 +78,7 @@ mapAliases {
   abjad = throw "'abjad' was removed due to lack of maintenance"; # Added 2026-03-24
   abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29
   advocate = throw "'advocate' has been removed due to being archived upstream and unused"; # added 2026-07-01
-  aioinflux = throw "'aioinflux' was removed because it is abandonned upstream. For InfluxDB v2+ support, please use the official Python client library"; # Added 2026-01-15
+  aioinflux = throw "'aioinflux' was removed because it is abandoned upstream. For InfluxDB v2+ support, please use the official Python client library"; # Added 2026-01-15
   aiosasl = throw "'aiosasl' was removed because it is abandoned upstream and does not work on modern Python versions."; # Added 2026-06-28
   aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29
   aioshutil = throw "'aioshutil' was removed because uiprotect no longer depends on it"; # added 2026-02-16
@@ -224,7 +224,7 @@ mapAliases {
   EasyProcess = throw "'EasyProcess' has been renamed to/replaced by 'easyprocess'"; # Converted to throw 2025-10-29
   editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
   elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
-  eliqonline = throw "'eligonline' was removed because Home Assistant dropped the integation"; # Added 2026-06-04
+  eliqonline = throw "'eligonline' was removed because Home Assistant dropped the integration"; # Added 2026-06-04
   email_validator = throw "'email_validator' has been renamed to/replaced by 'email-validator'"; # Converted to throw 2025-10-29
   emailthreads = throw "'emailthreads' has been removed because the upstream repository was archived in 2024"; # Added 2026-04-09
   enocean = throw "'enocean' was removed because Home Assistant switched to 'enocean-async'"; # added 2026-03-31
@@ -540,12 +540,12 @@ mapAliases {
   pySmartDL = throw "'pySmartDL' has been renamed to/replaced by 'pysmartdl'"; # Converted to throw 2025-10-29
   pysmi-lextudio = throw "'pysmi-lextudio' has been renamed to/replaced by 'pysmi'"; # Converted to throw 2025-10-29
   pysnmp-lextudio = throw "'pysnmp-lextudio' has been renamed to/replaced by 'pysnmp'"; # Converted to throw 2025-10-29
-  pysqlcipher3 = throw "'pysqlcipher3' has been removed has it was abandonned upstream and broken"; # Added 2025-12-30
+  pysqlcipher3 = throw "'pysqlcipher3' has been removed as it was abandoned upstream and broken"; # Added 2025-12-30
   PyStemmer = throw "'PyStemmer' has been renamed to/replaced by 'pystemmer'"; # Converted to throw 2025-10-29
   pysuez = throw "'pysuez' has been renamed to/replaced by 'pysuezv2'"; # Converted to throw 2025-10-29
   pytado = throw "'pytado' has been renamed to/replaced by 'python-tado'"; # Converted to throw 2025-10-29
   pytedee-async = aiotedee; # added 2025-07-06
-  pytest-cram = throw "'pytest-cram' was removed becaused it was unmaintained"; # added 2026-07-14
+  pytest-cram = throw "'pytest-cram' was removed because it was unmaintained"; # added 2026-07-14
   pytest-kafka = throw "'pytest-kafka' was removed because it is no longer used"; # added 2026-06-17
   pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2025-10-29
   pytest-subtests = throw "'pytest-subtests' has been integrated into pytest 9."; # Added 2026-01-21
@@ -555,7 +555,7 @@ mapAliases {
   pytestquickcheck = throw "'pytestquickcheck' has been renamed to/replaced by 'pytest-quickcheck'"; # Converted to throw 2025-10-29
   pytestrunner = throw "'pytestrunner' has been renamed to/replaced by 'pytest-runner'"; # Converted to throw 2025-10-29
   python-bring-api = throw "python-bring-api was removed because Home Assistant switched to bring-api"; # added 2025-10-03
-  python-clementine-remote = throw "'python-clementine-remote' was removed because Home Assistant droppped the integration"; # Added 2026-06-04
+  python-clementine-remote = throw "'python-clementine-remote' was removed because Home Assistant dropped the integration"; # Added 2026-06-04
   python-ethtool = throw "'python-ethtool' has been renamed to/replaced by 'ethtool'"; # Converted to throw 2025-10-29
   python-igraph = throw "'python-igraph' has been renamed to/replaced by 'igraph'"; # Converted to throw 2025-10-29
   python-jsonrpc-server = throw "python-jsonrpc-server has been removed because it was no longer used by anything"; # added 2025-11-11
@@ -648,7 +648,7 @@ mapAliases {
   spacy_models = throw "'spacy_models' has been renamed to/replaced by 'spacy-models'"; # Converted to throw 2025-10-29
   spark_parser = throw "'spark_parser' has been renamed to/replaced by 'spark-parser'"; # Converted to throw 2025-10-29
   SPARQLWrapper = throw "'SPARQLWrapper' has been renamed to/replaced by 'sparqlwrapper'"; # Converted to throw 2025-10-29
-  sparsezoo = throw "sparsezoo has been removed since it is abandonned"; # added 2025-09-01
+  sparsezoo = throw "sparsezoo has been removed since it is abandoned"; # added 2025-09-01
   sphinx-hoverxref = throw "'sphinx-hoverxref' has been deprecated upstream. It's functionality was merged into the readthedocs.org admin panel."; # Added 2026-01-18"
   sphinx-jquery = throw "'sphinx-jquery' has been renamed to/replaced by 'sphinxcontrib-jquery'"; # Converted to throw 2025-10-29
   sphinx-version-warning = throw "'sphinx-version-warning' has been abandoned upstream in 2019"; # Added 2026-01-18
@@ -710,7 +710,7 @@ mapAliases {
   typical = throw "'typical' has been removed as it was broken and archived upstream"; # Added 2025-11-27
   uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
   ufoLib2 = throw "'ufoLib2' has been renamed to/replaced by 'ufolib2'"; # Converted to throw 2025-10-29
-  unicode-slugify = throw "'unicode-slugify' has been removed becaues it was broken and unmaintained. Consider using 'python-slugify' instead."; # added 2025-10-05
+  unicode-slugify = throw "'unicode-slugify' has been removed because it was broken and unmaintained. Consider using 'python-slugify' instead."; # added 2025-10-05
   unifi = throw "'unifi' has been removed as upstream was archived in 2017"; # Added 2025-08-25
   unifiled = throw "'unifiled' has been removed because Home Assistant dropped the integration"; # Added 2026-06-04
   unittest-data-provider = throw "'unittest-data-provider' has been removed as it was unused, unmaintained, and upstream suggests 'pytest parameterize' instead."; # Added 2026-05-22
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 65c5490592e9..a6b22fba574e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -144,7 +144,7 @@ let
             # jobs.firefox-unwrapped.aarch64-darwin
             jobs.qt5.qtmultimedia.aarch64-darwin
             jobs.inkscape.aarch64-darwin
-            jobs.gimp2.aarch64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved
+            jobs.gimp2.aarch64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resolved
             jobs.emacs.aarch64-darwin
             jobs.wireshark.aarch64-darwin
 
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 0668737c9ee4..947a3c266cf7 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -118,7 +118,7 @@ let
       # `pkgs{theirHost}{theirTarget}`. For example, `pkgsBuildHost` means their
       # host platform is our build platform, and their target platform is our host
       # platform. We only care about their host/target platforms, not their build
-      # platform, because the the former two alone affect the interface of the
+      # platform, because the former two alone affect the interface of the
       # final package; the build platform is just an implementation detail that
       # should not leak.
       pkgsBuildBuild = withFallback adjacentPackages.pkgsBuildBuild;

From 062d2b697e5cdec6653706e79199d42ed995de11 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Aug 2026 11:15:27 -0700
Subject: [PATCH 32/57] pkgs: fix typos in applications, data, desktops, games
 and misc

Assisted-by: Claude Code (claude-opus-5)
---
 .../editors/jetbrains/plugins/default.nix          |  2 +-
 pkgs/applications/editors/neovim/wrapper.nix       |  2 +-
 .../editors/vscode/extensions/default.nix          | 14 +++++++-------
 .../extensions/ms-vscode.cpptools/default.nix      |  2 +-
 pkgs/applications/editors/vscode/vscode.nix        |  2 +-
 pkgs/applications/graphics/sane/frontends.nix      |  2 +-
 .../misc/cubocore-packages/corefm/default.nix      |  2 +-
 .../misc/cubocore-packages/libcprime/default.nix   |  2 +-
 pkgs/applications/misc/inochi2d/default.nix        |  2 +-
 .../networking/cluster/hadoop/default.nix          |  4 ++--
 .../networking/cluster/helm/plugins/helm-dt.nix    |  2 +-
 .../networking/cluster/spark/default.nix           |  2 +-
 pkgs/applications/radio/gnuradio/wrapper.nix       |  2 +-
 .../plugins/advanced-scene-switcher/default.nix    |  2 +-
 .../virtualization/singularity/generic.nix         |  2 +-
 .../virtualization/singularity/packages.nix        |  2 +-
 pkgs/data/fonts/open-relay/default.nix             |  2 +-
 .../desktops/gnome/extensions/update-extensions.py |  2 +-
 pkgs/games/quake3/content/hires.nix                |  2 +-
 pkgs/misc/barebox/default.nix                      |  2 +-
 20 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/plugins/default.nix b/pkgs/applications/editors/jetbrains/plugins/default.nix
index 5eaf7dbbff43..04c86a5fca4f 100644
--- a/pkgs/applications/editors/jetbrains/plugins/default.nix
+++ b/pkgs/applications/editors/jetbrains/plugins/default.nix
@@ -16,7 +16,7 @@
     let
       processPlugin =
         plugin:
-        # We can remove this check and just asume plugins to be derivations starting with 26.11.
+        # We can remove this check and just assume plugins to be derivations starting with 26.11.
         lib.throwIfNot (lib.isDerivation plugin)
           "addPlugins no longer supports resolving plugins by name or id strings. Please supply a derivation instead"
           plugin;
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index f048fac3ac2b..47b37f1a8e28 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -46,7 +46,7 @@ let
       withPerl ? false,
       withRuby ? false,
 
-      # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim
+      # whether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim
       vimAlias ? false,
       viAlias ? false,
 
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index db6259d847ca..51c6b4690c5b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1117,7 +1117,7 @@ let
           hash = "sha256-aSyTgGZt9AMZopmPLHb3Mc2RxUGZH87eMtOPX8DlgWQ=";
         };
         meta = {
-          description = "The offical CUE extension for VS Code, providing syntax highlighting and language server integration (LSP)";
+          description = "The official CUE extension for VS Code, providing syntax highlighting and language server integration (LSP)";
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=cuelangorg.vscode-cue";
           homepage = "https://github.com/cue-lang/vscode-cue";
           license = lib.licenses.mit;
@@ -1380,7 +1380,7 @@ let
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
-          description = "Makes judging, compiling, and downloading problems for competitve programming easy. Also supports auto-submit for a few sites";
+          description = "Makes judging, compiling, and downloading problems for competitive programming easy. Also supports auto-submit for a few sites";
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=DivyanshuAgrawal.competitive-programming-helper";
           homepage = "https://github.com/agrawal-d/cph";
           license = lib.licenses.gpl3;
@@ -1553,7 +1553,7 @@ let
           hash = "sha256-6xooF8petGLn8Zlh8rCXG2RJdAcdt8t8GPwhfgc5Gxs=";
         };
         meta = {
-          description = "Adwaita VS Code theme with Github syntax highlighting";
+          description = "Adwaita VS Code theme with GitHub syntax highlighting";
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=egirlcatnip.adwaita-github-theme";
           homepage = "https://github.com/egirlcatnip/adwaita-github-theme";
           license = lib.licenses.gpl3;
@@ -1664,7 +1664,7 @@ let
           hash = "sha256-caNcbDTB/F2mdlGpfIfJv13lzY5Wwj7p7r8dAte9+3A=";
         };
         meta = {
-          description = "Visual Studio Code extension of using chinese-english dictonary in right-click menu";
+          description = "Visual Studio Code extension of using chinese-english dictionary in right-click menu";
           homepage = "https://github.com/exiahuang/fanyi-vscode";
           changelog = "https://marketplace.visualstudio.com/items/ExiaHuang.dictionary/changelog";
           license = lib.licenses.gpl3Only;
@@ -3039,7 +3039,7 @@ let
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog";
-          description = "Rainbow syntax higlighting for CSV and TSV files in Visual Studio Code";
+          description = "Rainbow syntax highlighting for CSV and TSV files in Visual Studio Code";
           downloadPage = "https://marketplace.visualstudio.com/items?itemname=mechatroner.rainbow-csv";
           homepage = "https://github.com/mechatroner/vscode_rainbow_csv";
           license = lib.licenses.mit;
@@ -3138,7 +3138,7 @@ let
 
         meta = {
           changelog = "https://github.com/moshfeu/vscode-compare-folders/releases";
-          description = "Extension allows you to compare folders, show the diffs in a list and present diff in a splitted view side by side";
+          description = "Extension allows you to compare folders, show the diffs in a list and present diff in a split view side by side";
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=moshfeu.compare-folders";
           homepage = "https://github.com/moshfeu/vscode-compare-folders";
           license = lib.licenses.mit;
@@ -5468,7 +5468,7 @@ let
           hash = "sha256-sin2kTx7aXFPhtraKUjsowuV8Z2z237RIePL4F/JiPM=";
         };
         meta = {
-          description = "Visual Studio Code extension to help user easyly finish long words ";
+          description = "Visual Studio Code extension to help user easily finish long words ";
           longDescription = ''
             Dictionary completion allows user to get a list of keywords, based off of the current word at the cursor.
             This is useful if you are typing a long word (e.g. acknowledgeable) and don't want to finish typing or don't remember the Spelling
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
index 902cda5b3941..f0bee93edf8f 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
@@ -24,7 +24,7 @@
   So, in order for debugging to work properly, you merely need to create symlinks
   to one of these terminals at the appropriate location.
 
-  The good news is the the utility library is open source and with some effort
+  The good news is the utility library is open source and with some effort
   we could build a patched version ourselves. See:
 
   <https://github.com/Microsoft/MIEngine/blob/2885386dc7f35e0f1e44827269341e786361f28e/src/MICore/TerminalLauncher.cs#L156>
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 6b237b302a68..72f67bb49c83 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -10,7 +10,7 @@
   # sourceExecutableName is the name of the binary in the source archive over
   # which we have no control and it is needed to run the insider version as
   # documented in https://wiki.nixos.org/wiki/Visual_Studio_Code#Insiders_Build
-  # On MacOS the insider binary is still called code instead of code-insiders as
+  # On macOS the insider binary is still called code instead of code-insiders as
   # of 2023-08-06.
   sourceExecutableName ?
     "code" + lib.optionalString (isInsiders && stdenv.hostPlatform.isLinux) "-insiders",
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index 449156a56f06..6c854e10d65c 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
   };
 
-  # add all fedora patchs. fix gcc-14 build among other things
+  # add all fedora patches. fix gcc-14 build among other things
   # https://src.fedoraproject.org/rpms/sane-frontends/tree/main
   patches =
     let
diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
index f297314c5657..28ad0c2ef778 100644
--- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "Lightwight filemanager from the C Suite";
+    description = "Lightweight filemanager from the C Suite";
     mainProgram = "corefm";
     homepage = "https://gitlab.com/cubocore/coreapps/corefm";
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
index 7bfde551bb3d..faab1e369458 100644
--- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true;
 
   meta = {
-    description = "Library for bookmarking, saving recent activites, managing settings of C-Suite";
+    description = "Library for bookmarking, saving recent activities, managing settings of C-Suite";
     homepage = "https://gitlab.com/cubocore/libcprime";
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix
index d66c4b5035a6..f0696f9d5bb2 100644
--- a/pkgs/applications/misc/inochi2d/default.nix
+++ b/pkgs/applications/misc/inochi2d/default.nix
@@ -8,7 +8,7 @@
 
 # Note for maintainers:
 #
-# These packages are only allowed to be packaged under the the condition that we
+# These packages are only allowed to be packaged under the condition that we
 # - patch source/creator/config.d to not point to upstream's bug tracker
 # - use the "barebones" configuration to remove the mascot and logo from the build
 #
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 11e899ebe285..0fbaa46d2364 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -155,9 +155,9 @@ let
           computers using a simple programming model. It is designed to
           scale up from single servers to thousands of machines, each
           offering local computation and storage. Rather than rely on
-          hardware to deliver high-avaiability, the library itself is
+          hardware to deliver high-availability, the library itself is
           designed to detect and handle failures at the application layer,
-          so delivering a highly-availabile service on top of a cluster of
+          so delivering a highly-available service on top of a cluster of
           computers, each of which may be prone to failures.
         '';
         maintainers = with lib.maintainers; [ illustris ];
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
index 20968d05f475..6326694feb55 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
   '';
 
   meta = {
-    description = "Helm Distribution plugin is is a set of utilities and Helm Plugin for making offline work with Helm Charts easier";
+    description = "Helm Distribution plugin is a set of utilities and Helm Plugin for making offline work with Helm Charts easier";
     homepage = "https://github.com/vmware-labs/distribution-tooling-for-helm";
     maintainers = with lib.maintainers; [ ascii17 ];
     license = lib.licenses.mit;
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 3b1e20abb868..b319a6dec41a 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -8,7 +8,7 @@
   RSupport ? true,
   R,
   nixosTests,
-  # needeed in situations where hadoop's jdk version is too old
+  # needed in situations where hadoop's jdk version is too old
   jdk21_headless,
 }:
 
diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix
index 4afa3cca6afc..3ebf0430be1f 100644
--- a/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/pkgs/applications/radio/gnuradio/wrapper.nix
@@ -27,7 +27,7 @@
   atk,
   # For Adding additional GRC blocks
   extraPackages ? [ ],
-  # For Adding additional python packaages
+  # For Adding additional python packages
   extraPythonPackages ? [ ],
   soapysdr, # For it's passthru.searchPath
   # soapysdr plugins we add by default. Ideally, we should have a
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index 6c67d1757316..fd1d8d0a3ee5 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -21,7 +21,7 @@
   libusb1,
   pkg-config,
   # #FIXME: Could not get cmake to pick up on these dependencies
-  # Ommiting them prevents cmake from building the OCR video capabilities
+  # Omitting them prevents cmake from building the OCR video capabilities
   # Everything else should work it's just missing this one plugin
   # tesseract,
   # leptonica,
diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix
index 7edf7607bfd7..e2804889ebcf 100644
--- a/pkgs/applications/virtualization/singularity/generic.nix
+++ b/pkgs/applications/virtualization/singularity/generic.nix
@@ -1,4 +1,4 @@
-# Configurations that should only be overrided by
+# Configurations that should only be overridden by
 # overrideAttrs
 {
   pname,
diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix
index cb2d1b5e8c25..44258928ee27 100644
--- a/pkgs/applications/virtualization/singularity/packages.nix
+++ b/pkgs/applications/virtualization/singularity/packages.nix
@@ -98,7 +98,7 @@ let
           description = "";
           longDescription = ''
             This package produces identical store derivations to `pkgs.${packageName}`
-            overriden and installed by the NixOS module `programs.singularity`
+            overridden and installed by the NixOS module `programs.singularity`
             with default configuration.
 
             This is for binary substitutes only. Use pkgs.${packageName} instead.
diff --git a/pkgs/data/fonts/open-relay/default.nix b/pkgs/data/fonts/open-relay/default.nix
index caeb085fa28c..a92b26190631 100644
--- a/pkgs/data/fonts/open-relay/default.nix
+++ b/pkgs/data/fonts/open-relay/default.nix
@@ -67,7 +67,7 @@ lib.mapAttrs mkOpenRelayTypeface {
         supports many scripts and a large number of Unicode blocks as well as
         constructed scripts as encoded in the Under-ConScript Unicode Registry,
         pseudographics and semigraphics, and tons of private use characters. It
-        has been superceded by Fairfax HD but is still maintained.
+        has been superseded by Fairfax HD but is still maintained.
       '';
     };
   };
diff --git a/pkgs/desktops/gnome/extensions/update-extensions.py b/pkgs/desktops/gnome/extensions/update-extensions.py
index 1d8a27a4f315..c26433e0a936 100755
--- a/pkgs/desktops/gnome/extensions/update-extensions.py
+++ b/pkgs/desktops/gnome/extensions/update-extensions.py
@@ -340,7 +340,7 @@ def serialize_extensions(processed_extensions: list[dict[str, Any]]) -> None:
                 out.write("[ ")
             else:
                 out.write(", ")
-            # Dump each extension into a single-line string forst
+            # Dump each extension into a single-line string first
             serialized_extension = json.dumps(extension, ensure_ascii=False)
             # Inject line breaks for each supported version
             for version in supported_versions:
diff --git a/pkgs/games/quake3/content/hires.nix b/pkgs/games/quake3/content/hires.nix
index 85b9fe497bb8..0ccc738ed7e0 100644
--- a/pkgs/games/quake3/content/hires.nix
+++ b/pkgs/games/quake3/content/hires.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   # According to the @diegoulloao (see https://github.com/diegoulloao/ioquake3-mac-install/issues/23#issuecomment-2817031996)
   # quake3-live-sounds.pk3 is likely a custom repack from https://www.moddb.com/addons/quake-live-announcers-pack
   # zpack-weapons.pk3 is an amalgamation of multiple mods, where he can't recall which ones he used exactly.
-  # It still makes him the authorative source for these file.
+  # It still makes him the authoritative source for these file.
   ioquake3_mac = fetchFromGitHub {
     owner = "diegoulloao";
     repo = "ioquake3-mac-install";
diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix
index bc9c04a62f2c..cbbc3fc8a9db 100644
--- a/pkgs/misc/barebox/default.nix
+++ b/pkgs/misc/barebox/default.nix
@@ -93,7 +93,7 @@ let
         with lib;
         {
           homepage = "https://www.barebox.org";
-          description = "Swiss Army Knive for bare metal";
+          description = "Swiss Army Knife for bare metal";
           license = licenses.gpl2Only;
           maintainers = with maintainers; [ emantor ];
         }

From 857a1c3a4f784759f1ff4298dab20be9a2cc8858 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Aug 2026 11:15:27 -0700
Subject: [PATCH 33/57] pkgs/os-specific: fix typos

Assisted-by: Claude Code (claude-opus-5)
---
 pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix                 | 2 +-
 pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix              | 2 +-
 pkgs/os-specific/cygwin/newlib-cygwin/default.nix             | 2 +-
 .../darwin/sourceRelease/update-source-releases.sh            | 2 +-
 pkgs/os-specific/linux/kernel/common-config.nix               | 4 ++--
 pkgs/os-specific/linux/lvm2/common.nix                        | 2 +-
 pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix           | 2 +-
 pkgs/os-specific/linux/trelay/default.nix                     | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix
index fc925e46ec09..87fa9e270413 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix
@@ -28,6 +28,6 @@ mkDerivation {
     cp "${pciutils}/share/pci.ids" "$out/share/pci.ids"
   '';
 
-  meta.platorms = lib.platforms.freebsd;
+  meta.platforms = lib.platforms.freebsd;
   meta.mainProgram = "pciconf";
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix b/pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix
index 45d70b5fc35e..3c368c001417 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/vidcontrol.nix
@@ -6,5 +6,5 @@ mkDerivation {
   path = "usr.sbin/vidcontrol";
 
   meta.mainProgram = "vidcontrol";
-  meta.platorms = lib.platforms.freebsd;
+  meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/default.nix b/pkgs/os-specific/cygwin/newlib-cygwin/default.nix
index 516498e6ec3b..86420948acf6 100644
--- a/pkgs/os-specific/cygwin/newlib-cygwin/default.nix
+++ b/pkgs/os-specific/cygwin/newlib-cygwin/default.nix
@@ -154,7 +154,7 @@
           "--enable-static"
           "--disable-dumper"
           "--with-cross-bootstrap"
-          # if gm4 or gnum4 are in PATH, they would be be preferred to nixpkgs m4
+          # if gm4 or gnum4 are in PATH, they would be preferred to nixpkgs m4
           "M4=m4"
         ];
 
diff --git a/pkgs/os-specific/darwin/sourceRelease/update-source-releases.sh b/pkgs/os-specific/darwin/sourceRelease/update-source-releases.sh
index 8e416bfc3483..29f2bfc1edff 100755
--- a/pkgs/os-specific/darwin/sourceRelease/update-source-releases.sh
+++ b/pkgs/os-specific/darwin/sourceRelease/update-source-releases.sh
@@ -104,7 +104,7 @@ git clone --branch "$tag" https://github.com/apple-oss-distributions/distributio
 cd distribution-macOS
 
 for package in "${packages[@]}"; do
-    # If the tag exists in `release.json`, use that as an optimization to avoid downloading unnecessarily from Github.
+    # If the tag exists in `release.json`, use that as an optimization to avoid downloading unnecessarily from GitHub.
     packageTag=$(jq -r --arg package "$package" '.projects[] | select(.project == $package) | .tag' release.json)
     packageCommit=$(git ls-tree -d HEAD "$package" | awk '{print $3}')
 
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ef681fa9e292..c4e858e676fa 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -670,7 +670,7 @@ let
 
       USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators
       USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling
-      USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies)
+      USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptible Power Supplies)
 
       # default to dual role mode
       USB_DWC2_DUAL_ROLE = yes;
@@ -1393,7 +1393,7 @@ let
         HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI
         HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
 
-        # Allos PCIe devices report errors with Advanced Error Reporting (AER).
+        # Allows PCIe devices to report errors with Advanced Error Reporting (AER).
         PCIEAER = yes;
         ACPI_APEI_PCIEAER = yes;
 
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index 83b6502405c8..5a9c206950cb 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -17,7 +17,7 @@
   udev,
   udevCheckHook,
   onlyLib ? stdenv.hostPlatform.isStatic,
-  # Otherwise we have a infinity recursion during static compilation
+  # Otherwise we have an infinite recursion during static compilation
   enableUtilLinux ? !stdenv.hostPlatform.isStatic,
   util-linux,
   enableVDO ? false,
diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
index f81a304ba152..d0cac9dee6ad 100644
--- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://www.nvidia.com/object/unix.html";
-    description = "Fabricmanager daemon for NVLink intialization and control";
+    description = "Fabricmanager daemon for NVLink initialization and control";
     license = lib.licenses.unfreeRedistributable;
     platforms = nvidia_x11.meta.platforms;
     mainProgram = "nv-fabricmanager";
diff --git a/pkgs/os-specific/linux/trelay/default.nix b/pkgs/os-specific/linux/trelay/default.nix
index eaf83d64f982..017b12af72a1 100644
--- a/pkgs/os-specific/linux/trelay/default.nix
+++ b/pkgs/os-specific/linux/trelay/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "For relaying IP packets between two devices to build a IP bridge between them";
+    description = "For relaying IP packets between two devices to build an IP bridge between them";
     longDescription = ''
       A kernel module that relays ethernet packets between two devices (similar to a bridge),
       but without any MAC address checks.

From 2176cc9b3fd84b80a231bc02db17eaa018a6a5c3 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Aug 2026 11:15:27 -0700
Subject: [PATCH 34/57] pkgs/servers: fix typos

Assisted-by: Claude Code (claude-opus-5)
---
 pkgs/servers/home-assistant/custom-components/README.md         | 2 +-
 pkgs/servers/home-assistant/update-component-packages.py        | 2 +-
 pkgs/servers/icingaweb2/theme-lsd/default.nix                   | 2 +-
 .../monitoring/nagios-plugins/check_wmi_plus/default.nix        | 2 +-
 pkgs/servers/sql/postgresql/ext/smlar.nix                       | 2 +-
 pkgs/servers/web-apps/wordpress/packages/default.nix            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md
index b8b1fed85764..deba06c5ca22 100644
--- a/pkgs/servers/home-assistant/custom-components/README.md
+++ b/pkgs/servers/home-assistant/custom-components/README.md
@@ -12,7 +12,7 @@ function arguments. Pass them into `dependencies` for them to
 be available to Home Assistant.
 
 Out-of-tree components need to use Python packages from
-`home-assistant.python3Pacakges` as to not introduce conflicting package
+`home-assistant.python3Packages` as to not introduce conflicting package
 versions into the Python environment.
 
 
diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py
index fa4eadd027ba..784f4e16d55d 100755
--- a/pkgs/servers/home-assistant/update-component-packages.py
+++ b/pkgs/servers/home-assistant/update-component-packages.py
@@ -148,7 +148,7 @@ def repository_root() -> str:
     return os.path.abspath(sys.argv[0] + "/../../../..")
 
 
-# For a package attribute and and an extra, check if the package exposes it via passthru.optional-dependencies
+# For a package attribute and an extra, check if the package exposes it via passthru.optional-dependencies
 def has_extra(package: str, extra: str):
     cmd = [
         "nix-instantiate",
diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix
index 0b6c110e9f13..5e34bd043e4d 100644
--- a/pkgs/servers/icingaweb2/theme-lsd/default.nix
+++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Psychadelic theme for IcingaWeb 2";
+    description = "Psychedelic theme for IcingaWeb 2";
     homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-lsd";
     license = lib.licenses.publicDomain;
     platforms = lib.platforms.all;
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix
index b7bc0cb46fa1..bdbfbe464496 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   pname = "check-wmi-plus";
   version = "1.65";
 
-  # Upstream has been moved from Github to tarballs on the author's website.
+  # Upstream has been moved from GitHub to tarballs on the author's website.
   # See https://edcint.co.nz/checkwmiplus/releases/
   src = fetchFromGitHub {
     owner = "speartail";
diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix
index e02e7aa2334b..a76353fa10df 100644
--- a/pkgs/servers/sql/postgresql/ext/smlar.nix
+++ b/pkgs/servers/sql/postgresql/ext/smlar.nix
@@ -18,7 +18,7 @@ postgresqlBuildExtension {
   makeFlags = [ "USE_PGXS=1" ];
 
   meta = {
-    description = "Compute similary of any one-dimensional arrays";
+    description = "Compute similarity of any one-dimensional arrays";
     homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git";
     platforms = postgresql.meta.platforms;
     license = lib.licenses.bsd2;
diff --git a/pkgs/servers/web-apps/wordpress/packages/default.nix b/pkgs/servers/web-apps/wordpress/packages/default.nix
index c7630cbeb1a5..43780dd9362f 100644
--- a/pkgs/servers/web-apps/wordpress/packages/default.nix
+++ b/pkgs/servers/web-apps/wordpress/packages/default.nix
@@ -116,7 +116,7 @@ let
         }
       ) { };
 
-      # Filter out all characters that might occur in a version string but that that are not allowed
+      # Filter out all characters that might occur in a version string but that are not allowed
       # in store paths.
       filterWPString =
         builtins.replaceStrings

From f7379a5aeca4051a7a3ee3730e341f076c77c57d Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Aug 2026 11:15:27 -0700
Subject: [PATCH 35/57] pkgs/tools: fix typos

Assisted-by: Claude Code (claude-opus-5)
---
 .../package-management/nix/modular/packaging/everything.nix     | 2 +-
 pkgs/tools/text/multitran/libfacet/default.nix                  | 2 +-
 pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
index a8128775e4ab..a552130d3501 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontBuild = true;
 
   /**
-    `doCheck` controles whether tests are added as build gate for the combined package.
+    `doCheck` controls whether tests are added as build gate for the combined package.
     This includes both the unit tests and the functional tests, but not the
     integration tests that run in CI (the flake's `hydraJobs` and some of the `checks`).
   */
diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix
index 8cd5f004b4a0..44101aca9744 100644
--- a/pkgs/tools/text/multitran/libfacet/default.nix
+++ b/pkgs/tools/text/multitran/libfacet/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://multitran.sourceforge.net/";
-    description = "Multitran lib: enchanced locale facets";
+    description = "Multitran lib: enhanced locale facets";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
index da4be6be6e2f..4d8a95311d82 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
@@ -572,7 +572,7 @@ lib.recursiveUpdate orig rec {
 
   # Use top-level git-latexdiff's version and src. NOTE that this derivation is
   # still different from top-level's `git-latexdiff`, due to __structuredAttrs
-  # enabled unconditionally. Still though this derivation produces a funcitonal
+  # enabled unconditionally. Still though this derivation produces a functional
   # binary.
   inherit git-latexdiff;
 

From df52add746b5a6bb8a2f07470c97c7825e507416 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 08:52:49 +0000
Subject: [PATCH 36/57] libretro.beetle-vb: 0-unstable-2026-07-22 ->
 0-unstable-2026-07-29

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
index 89f3cd32c600..8b6052e8ba0a 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-vb";
-  version = "0-unstable-2026-07-22";
+  version = "0-unstable-2026-07-29";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-vb-libretro";
-    rev = "7cc663e9044459b3dab1790bdce8f48dc7358ed6";
-    hash = "sha256-ntw8SXzyu0PTDQgaLmT5Wy172A8TI3JLN6A5WQ2T/OI=";
+    rev = "3f53a40bf8aa18777514fd4b220960427e312a3f";
+    hash = "sha256-mIgLMgJnoGmlWSS6Z4x5GfJGV5fZxqFtLT5BdI+rgaI=";
   };
 
   makefile = "Makefile";

From 2026a9ca882abb86aa6c41f46bcc51ced8bb288f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 09:13:17 +0000
Subject: [PATCH 37/57] vulnix: 1.12.4 -> 1.12.5

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

diff --git a/pkgs/by-name/vu/vulnix/package.nix b/pkgs/by-name/vu/vulnix/package.nix
index 62f4010142c4..6e91cb652034 100644
--- a/pkgs/by-name/vu/vulnix/package.nix
+++ b/pkgs/by-name/vu/vulnix/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "vulnix";
-  version = "1.12.4";
+  version = "1.12.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "vulnix";
     tag = finalAttrs.version;
-    hash = "sha256-4aaYSOBuZHW/FZ8c+REjwr6X2S4KsP9Czk5jGTQfqDI=";
+    hash = "sha256-uz8vHabk5UTnSj969VQ9EZrha/rOQ9vxuQxfJcmx/v0=";
   };
 
   __darwinAllowLocalNetworking = true;

From 31d3aa23ac676969e5aa68339e984777359a4f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Mon, 3 Aug 2026 12:04:17 +0200
Subject: [PATCH 38/57] authentik: 2026.5.3 -> 2026.5.6, fix build

---
 pkgs/by-name/au/authentik/package.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index 13b363cbded6..0b2a898d7dac 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -25,7 +25,7 @@
 let
   nodejs = nodejs_24;
 
-  version = "2026.5.3";
+  version = "2026.5.6";
 
   cargoPackageFlags = [
     "--package"
@@ -36,7 +36,7 @@ let
     owner = "goauthentik";
     repo = "authentik";
     tag = "version/${version}";
-    hash = "sha256-nmAX8nwZpdDcFAPvC9hAEp0x43RnFtGLUTAm7NcvNZo=";
+    hash = "sha256-/HdXzjjvuSW7zjbCNJKm3Fj8gvIwfrDf8mOYev0yuIg=";
   };
 
   meta = {
@@ -129,7 +129,7 @@ let
     sourceRoot = "${src.name}/website";
 
     inherit nodejs;
-    npmDepsHash = "sha256-SkIZF+wQPgoZOGJc0YR8Ot07KCsAdA1985SLQaoibfA=";
+    npmDepsHash = "sha256-5zAsS+Jw/hcBOws+MvFGZMMSn+NNKcpUmmkd9NO9fTY=";
     npmDepsFetcherVersion = 2;
     makeCacheWritable = true;
     npmInstallFlags = [ "--legacy-peer-deps" ];
@@ -189,7 +189,7 @@ let
 
     outputHash =
       {
-        "aarch64-linux" = "sha256-41xZEfLul92vJATZqyVnd7Pp++NzLL/u8NeJJPHpXrw=";
+        "aarch64-linux" = "sha256-ZdfDKrrcVpNImY8cYa9CPEwI7tuaoPn3kM6MXGGio2U=";
         "x86_64-linux" = "sha256-p6xjAinU2Isl/uYgoJuacqHN7jBnbWam40J6AQudbtQ=";
       }
       .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform");
@@ -292,6 +292,8 @@ let
 
         build-system = with final; [ hatchling ];
 
+        nativeBuildInputs = with final; [ pyprojectVersionPatchHook ];
+
         propagatedBuildInputs = with final; [
           django
           typing-extensions
@@ -307,6 +309,8 @@ let
 
         build-system = with final; [ hatchling ];
 
+        nativeBuildInputs = with final; [ pyprojectVersionPatchHook ];
+
         pythonRelaxDeps = [
           "structlog"
         ];
@@ -333,6 +337,8 @@ let
 
         build-system = with final; [ hatchling ];
 
+        nativeBuildInputs = with final; [ pyprojectVersionPatchHook ];
+
         pythonRelaxDeps = [
           "structlog"
         ];
@@ -360,6 +366,8 @@ let
 
         build-system = with final; [ hatchling ];
 
+        nativeBuildInputs = with final; [ pyprojectVersionPatchHook ];
+
         propagatedBuildInputs = with final; [
           django
           django-postgres-extra
@@ -367,7 +375,7 @@ let
       };
 
       authentik-django = final.buildPythonPackage {
-        pname = "authentik-django";
+        pname = "authentik";
         inherit version src meta;
         pyproject = true;
 
@@ -383,9 +391,7 @@ let
             --replace-fail "and (self._base_dir.is_mount() or (self._base_dir / self.usage.value).is_mount())" ""
         '';
 
-        build-system = [
-          final.hatchling
-        ];
+        build-system = with final; [ hatchling ];
 
         pythonRemoveDeps = [ "dumb-init" ];
 
@@ -486,7 +492,7 @@ let
     pname = "authentik-worker";
     inherit version src meta;
 
-    cargoHash = "sha256-KExlNyT9G3R5rnt99beT2pYrWxezMLhGw+Q9T1X2kj4=";
+    cargoHash = "sha256-bpS1cXIG8srVE4tTS1rXL6R+ZBE65BZTlMghSPiAJy4=";
 
     nativeBuildInputs = [
       cmake

From 238c598440455653fdf3ff62a760b5df53f9d295 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Mon, 3 Aug 2026 16:22:10 +0200
Subject: [PATCH 39/57] tengine: drop

Drop due to seriously delayed responses to security vulnerabilities.
---
 doc/release-notes/rl-2611.section.md          |   2 +
 nixos/modules/services/web-apps/akkoma.md     |   3 -
 .../services/web-servers/nginx/default.nix    |   2 +-
 nixos/tests/nginx-variants.nix                |   1 -
 pkgs/servers/http/tengine/default.nix         | 159 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   9 -
 7 files changed, 4 insertions(+), 173 deletions(-)
 delete mode 100644 pkgs/servers/http/tengine/default.nix

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index f6d4cabc93c4..c31c734f27ac 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -78,6 +78,8 @@
 
 - `himalaya` has been updated from `v1.2.0` to `v2.0.0`, which introduces breaking changes. See the [release notes](https://github.com/pimalaya/himalaya/releases/tag/v2.0.0) and the [migration guide](https://github.com/pimalaya/himalaya/blob/master/MIGRATION.md).
 
+- `tengine` has been removed as it has seen seriously delayed responses to security vulnerabilities.
+
 - `nix-serve-ng` (and `haskellPackages.nix-serve-ng`) is now built against Lix instead of CppNix, following upstream which has switched to Lix as its supported Nix implementation.
 
 - Linux kernel configuration has been moved out of the `linux-kernel` field of the platform structure into the kernel builders:
diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md
index c8419fe94ecc..1b4cb141a147 100644
--- a/nixos/modules/services/web-apps/akkoma.md
+++ b/nixos/modules/services/web-apps/akkoma.md
@@ -83,9 +83,6 @@ locally, and clients have to fetch them directly from the source server.
 
 ```nix
 {
-  # Enable nginx slice module distributed with Tengine
-  services.nginx.package = pkgs.tengine;
-
   # Enable media proxy
   services.akkoma.config.":pleroma".":media_proxy" = {
     enabled = true;
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 3722e98bec24..0a0ccf403ebc 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -805,7 +805,7 @@ in
           Nginx package to use. This defaults to the stable version. Note
           that the nginx team recommends to use the mainline version which
           available in nixpkgs as `nginxMainline`.
-          Supported Nginx forks include `angie`, `openresty` and `tengine`.
+          Supported Nginx forks include `angie` and `openresty`.
         '';
       };
 
diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix
index a3994ad83247..482c95e89f0c 100644
--- a/nixos/tests/nginx-variants.nix
+++ b/nixos/tests/nginx-variants.nix
@@ -29,6 +29,5 @@ builtins.listToAttrs (
       "nginxMainline"
       "nginxShibboleth"
       "openresty"
-      "tengine"
     ]
 )
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
deleted file mode 100644
index c6a7aabab8f3..000000000000
--- a/pkgs/servers/http/tengine/default.nix
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  openssl,
-  zlib,
-  pcre2,
-  libxcrypt,
-  libxml2,
-  libxslt,
-  replaceVars,
-  gd,
-  geoip,
-  gperftools,
-  jemalloc,
-  nixosTests,
-  withDebug ? false,
-  withMail ? false,
-  withStream ? false,
-  modules ? [ ],
-  ...
-}:
-
-let
-  inherit (lib) optional optionals optionalString;
-in
-stdenv.mkDerivation rec {
-  version = "3.1.0";
-  pname = "tengine";
-
-  src = fetchFromGitHub {
-    owner = "alibaba";
-    repo = pname;
-    rev = version;
-    hash = "sha256-cClSNBlresMHqJrqSFWvUo589TlwJ2tL5FWJG9QBuis=";
-  };
-
-  buildInputs = [
-    openssl
-    zlib
-    pcre2
-    libxcrypt
-    libxml2
-    libxslt
-    gd
-    geoip
-    gperftools
-    jemalloc
-  ]
-  ++ lib.concatMap (mod: mod.buildInputs or [ ]) modules;
-
-  patches = [
-    ../nginx/nix-etag-1.15.4.patch
-    ./check-resolv-conf.patch
-    ../nginx/nix-skip-check-logs-path.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/http/ngx_http_core_module.c \
-      --replace-fail '@nixStoreDir@' "$NIX_STORE" \
-      --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}"
-  '';
-
-  configureFlags = [
-    "--with-http_ssl_module"
-    "--with-http_v2_module"
-    "--with-http_realip_module"
-    "--with-http_addition_module"
-    "--with-http_xslt_module"
-    "--with-http_geoip_module"
-    "--with-http_sub_module"
-    "--with-http_dav_module"
-    "--with-http_flv_module"
-    "--with-http_mp4_module"
-    "--with-http_gunzip_module"
-    "--with-http_gzip_static_module"
-    "--with-http_auth_request_module"
-    "--with-http_random_index_module"
-    "--with-http_secure_link_module"
-    "--with-http_degradation_module"
-    "--with-http_stub_status_module"
-    "--with-threads"
-    "--with-pcre-jit"
-    "--with-http_slice_module"
-    "--with-select_module"
-    "--with-poll_module"
-    "--with-google_perftools_module"
-    "--with-jemalloc"
-    "--http-log-path=/var/log/nginx/access.log"
-    "--error-log-path=/var/log/nginx/error.log"
-    "--pid-path=/var/log/nginx/nginx.pid"
-    "--http-client-body-temp-path=/var/cache/nginx/client_body"
-    "--http-proxy-temp-path=/var/cache/nginx/proxy"
-    "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi"
-    "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi"
-    "--http-scgi-temp-path=/var/cache/nginx/scgi"
-  ]
-  ++ optionals withDebug [
-    "--with-debug"
-  ]
-  ++ optionals withMail [
-    "--with-mail"
-    "--with-mail_ssl_module"
-  ]
-  ++ optionals (!withMail) [
-    "--without-mail_pop3_module"
-    "--without-mail_imap_module"
-    "--without-mail_smtp_module"
-  ]
-  ++ optionals withStream [
-    "--with-stream"
-    "--with-stream_ssl_module"
-    "--with-stream_realip_module"
-    "--with-stream_geoip_module"
-    "--with-stream_ssl_preread_module"
-    "--with-stream_sni"
-  ]
-  ++ optionals (!withStream) [
-    "--without-stream_limit_conn_module"
-    "--without-stream_access_module"
-    "--without-stream_geo_module"
-    "--without-stream_map_module"
-    "--without-stream_split_clients_module"
-    "--without-stream_return_module"
-    "--without-stream_upstream_hash_module"
-    "--without-stream_upstream_least_conn_module"
-    "--without-stream_upstream_random_module"
-    "--without-stream_upstream_zone_module"
-  ]
-  ++ optional (gd != null) "--with-http_image_filter_module"
-  ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
-  ++ map (mod: "--add-module=${mod}") modules;
-
-  env.NIX_CFLAGS_COMPILE =
-    "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough -Wno-unterminated-string-initialization"
-    + optionalString stdenv.hostPlatform.isDarwin " -Wno-error=deprecated-declarations -Wno-unused-but-set-variable";
-
-  preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    mv $out/sbin $out/bin
-  '';
-
-  passthru = {
-    inherit modules;
-    tests = nixosTests.nginx-variants.tengine;
-  };
-
-  meta = {
-    description = "Web server based on Nginx and has many advanced features, originated by Taobao";
-    mainProgram = "nginx";
-    homepage = "https://tengine.taobao.org";
-    license = lib.licenses.bsd2;
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ izorkin ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08d69741489e..2183e24dcf74 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2343,6 +2343,7 @@ mapAliases {
   temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
   temurin-jre-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04
   temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
+  tengine = throw "tengine has been removed as it has seen seriously delayed responses to security vulnerabilities. Please switch to another webserver by updating or removing your `services.nginx.package` option."; # Added 2026-08-03
   tepl = throw "'tepl' has been renamed to/replaced by 'libgedit-tepl'"; # Converted to throw 2025-10-27
   termbook = throw "'termbook' has been removed because it is not maintained upstream and has insecure dependencies."; # Added 2025-12-01
   terminus-nerdfont = throw "'terminus-nerdfont' has been renamed to/replaced by 'nerd-fonts.terminess-ttf'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 506c38f1bc91..2337444d6c56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10081,15 +10081,6 @@ with pkgs;
 
   teeworlds-server = teeworlds.override { buildClient = false; };
 
-  tengine = callPackage ../servers/http/tengine {
-    modules = with nginxModules; [
-      rtmp
-      dav
-      moreheaders
-      modsecurity
-    ];
-  };
-
   ultrastar-creator = callPackage ../tools/misc/ultrastar-creator { };
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };

From 6c89db18dac4e561177cf1fce620587cfa6faf6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 15:39:11 +0000
Subject: [PATCH 40/57] glaze: 7.9.1 -> 8.0.0

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

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index c432f350cfd0..b87d466bcdf1 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glaze";
-  version = "7.9.1";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NRRq5MGF2f5PW0teYnq58ELzson+U6KHVPaY6r30KLA=";
+    hash = "sha256-UQsR+b7FHGcC/nNpc7ffRurIyN3xM12PwN2UkrV1dRo=";
   };
 
   nativeBuildInputs = [ cmake ];

From e7e521c4f9dd23a15da56810bc03bca0fccb5f83 Mon Sep 17 00:00:00 2001
From: Jack Boykin <jtboykin.jb@gmail.com>
Date: Mon, 3 Aug 2026 12:19:07 -0500
Subject: [PATCH 41/57] firefox: use ffmpeg 8 for browsers that support it

Assisted-by: Claude Code (Claude Fable 5)
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index d945a0a3d063..951d09baa4f9 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -12,6 +12,7 @@
 
   ## various stuff that can be plugged in
   ffmpeg_7,
+  ffmpeg_8,
   libxxf86vm,
   libxxf86dga,
   libxt,
@@ -88,6 +89,11 @@ let
 
     let
       ffmpegSupport = browser.ffmpegSupport or false;
+      # Firefox dlopens libavcodec by hardcoded soname, so each ffmpeg major needs
+      # explicit browser support; keep versioned pins here (never the ffmpeg alias)
+      # and add a tier when a release gains the next ABI. 146 added libavcodec 62
+      # (https://bugzilla.mozilla.org/show_bug.cgi?id=1962139), not uplifted to ESR 140.
+      ffmpegPackage = if lib.versionAtLeast browser.version "146" then ffmpeg_8 else ffmpeg_7;
       gssSupport = browser.gssSupport or false;
       alsaSupport = browser.alsaSupport or false;
       pipewireSupport = browser.pipewireSupport or false;
@@ -113,7 +119,7 @@ let
           ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal
         )
         ++ lib.optional pipewireSupport pipewire
-        ++ lib.optional ffmpegSupport ffmpeg_7
+        ++ lib.optional ffmpegSupport ffmpegPackage
         ++ lib.optional gssSupport libkrb5
         ++ lib.optional useGlvnd libglvnd
         ++ lib.optionals (cfg.enableQuakeLive or false) [

From 906200147c7d8c2f25063904f5928e75fc439c7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 18:54:18 +0000
Subject: [PATCH 42/57] tbox: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix
index 18b7c25dd6a0..a9295eee79e3 100644
--- a/pkgs/by-name/tb/tbox/package.nix
+++ b/pkgs/by-name/tb/tbox/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tbox";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "tboox";
     repo = "tbox";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tUN9H6TejbFbJR4Lr0N8HoYkRAo8a/Rh4HEMOG1aPoE=";
+    hash = "sha256-qrmlS2ympche4o0EquQWcy9+tP+WdqOhyRkN6SsSJLk=";
   };
 
   configureFlags = [

From 46113ff88aec4cac96b014a5197bb4a6bb1eb49f Mon Sep 17 00:00:00 2001
From: KristijanZic <kristijan.zic@10x.engineering>
Date: Mon, 3 Aug 2026 04:20:23 +0200
Subject: [PATCH 43/57] dataform: init at 3.0.63

---
 pkgs/by-name/da/dataform/package-lock.json | 1964 ++++++++++++++++++++
 pkgs/by-name/da/dataform/package.nix       |  135 ++
 2 files changed, 2099 insertions(+)
 create mode 100644 pkgs/by-name/da/dataform/package-lock.json
 create mode 100644 pkgs/by-name/da/dataform/package.nix

diff --git a/pkgs/by-name/da/dataform/package-lock.json b/pkgs/by-name/da/dataform/package-lock.json
new file mode 100644
index 000000000000..c89d0faa0138
--- /dev/null
+++ b/pkgs/by-name/da/dataform/package-lock.json
@@ -0,0 +1,1964 @@
+{
+    "name": "@dataform/cli",
+    "version": "3.0.63",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "@dataform/cli",
+            "version": "3.0.63",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@google-cloud/bigquery": "~8.3.0",
+                "chokidar": "^3.5.3",
+                "deepmerge": "^4.2.2",
+                "fs-extra": "^9.0.0",
+                "glob": "13.0.6",
+                "google-sql-syntax-ts": "^1.0.3",
+                "js-beautify": "^1.10.2",
+                "js-yaml": "^4.2.0",
+                "moo": "^0.5.0",
+                "object-sizeof": "^1.6.1",
+                "parse-duration": "^1.0.0",
+                "promise-pool-executor": "^1.1.1",
+                "protobufjs": "^7.6.3",
+                "readline-sync": "^1.4.9",
+                "semver": "^7.5.2",
+                "tarjan-graph": "^2.0.0",
+                "tmp": "^0.2.7",
+                "typeid-js": "0.3.0",
+                "untildify": "^4.0.0",
+                "vm2": "3.11.4",
+                "yargs": "^16.2.0"
+            },
+            "bin": {
+                "dataform": "bundle.js"
+            }
+        },
+        "node_modules/@google-cloud/bigquery": {
+            "version": "8.3.1",
+            "resolved": "https://registry.npmjs.org/@google-cloud/bigquery/-/bigquery-8.3.1.tgz",
+            "integrity": "sha512-F4g9oMgI3EB5Uo+6npRHDSWn1HkVko8GebG1tJtzasn/gknAEFeobQzuLeGYC6SJ92RVdaBpGVisw86P70RrHQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@google-cloud/common": "^6.0.0",
+                "@google-cloud/paginator": "^6.0.0",
+                "@google-cloud/precise-date": "^5.0.0",
+                "@google-cloud/promisify": "^5.0.0",
+                "arrify": "^3.0.0",
+                "big.js": "^7.0.0",
+                "duplexify": "^4.1.3",
+                "extend": "^3.0.2",
+                "stream-events": "^1.0.5",
+                "teeny-request": "^10.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@google-cloud/common": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-6.1.0.tgz",
+            "integrity": "sha512-Ohjxjvusr65+SiEVBrilpyn1ir9CM8ZqWjcf7bA8ph1GCunxI6bbwtcl7iGl67A7Lr4Nz7WpNzITNETwggc7pw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@google-cloud/projectify": "^4.0.0",
+                "@google-cloud/promisify": "^4.0.0",
+                "arrify": "^2.0.0",
+                "duplexify": "^4.1.3",
+                "extend": "^3.0.2",
+                "google-auth-library": "^10.6.2",
+                "html-entities": "^2.5.2",
+                "retry-request": "^8.0.0",
+                "teeny-request": "^10.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@google-cloud/common/node_modules/@google-cloud/promisify": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.1.0.tgz",
+            "integrity": "sha512-G/FQx5cE/+DqBbOpA5jKsegGwdPniU6PuIEMt+qxWgFxvxuFOzVmp6zYchtYuwAWV5/8Dgs0yAmjvNZv3uXLQg==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@google-cloud/common/node_modules/arrify": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+            "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@google-cloud/paginator": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-6.1.0.tgz",
+            "integrity": "sha512-9bxQ/QNhcq5c6ra75khWjA5Q9UHWp0vQnhwesmqPpLLF5PxmxCIsadIA5ssLxKted4/iZ2RlRPkW/E8p68W8cg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "extend": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@google-cloud/precise-date": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-5.2.0.tgz",
+            "integrity": "sha512-ckZ1elVT/JXbO4kxltiT8tumYnTXGIY7OFrDMAJyVWAte/rUYiCuH1YbaKLQrZpYDp522xgTfPqqW/VxfXFdgA==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@google-cloud/projectify": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz",
+            "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@google-cloud/promisify": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-5.1.0.tgz",
+            "integrity": "sha512-/j9zzWDxsgKg0hMuFBmLGI8ES9xj4DjXvQnDCKl0w5ed7WE3CGsgHmUoC35rvfBXshSW+5StQGnCUD+RBqITKA==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@isaacs/cliui": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^5.1.2",
+                "string-width-cjs": "npm:string-width@^4.2.0",
+                "strip-ansi": "^7.0.1",
+                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+                "wrap-ansi": "^8.1.0",
+                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+            "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+            "version": "6.2.3",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+            "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "license": "MIT"
+        },
+        "node_modules/@isaacs/cliui/node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "license": "MIT",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+            "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.2.2"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
+        "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/@one-ini/wasm": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
+            "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
+            "license": "MIT"
+        },
+        "node_modules/@pkgjs/parseargs": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/@protobufjs/aspromise": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+            "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@protobufjs/base64": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+            "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@protobufjs/codegen": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.5.tgz",
+            "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@protobufjs/eventemitter": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
+            "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@protobufjs/fetch": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.1.tgz",
+            "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@protobufjs/aspromise": "^1.1.1"
+            }
+        },
+        "node_modules/@protobufjs/float": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+            "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@protobufjs/path": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+            "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@protobufjs/pool": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+            "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@protobufjs/utf8": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.2.tgz",
+            "integrity": "sha512-b1UQwcEZ4yCnMCD8DAL1VlbvBJE9/IX4FTIp7BG1xYpf29SLazLSrqUkj4w7Y5y7cCVP6E5tcqqcI0xemPkHug==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@types/node": {
+            "version": "26.1.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.2.tgz",
+            "integrity": "sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==",
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~8.3.0"
+            }
+        },
+        "node_modules/abbrev": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+            "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+            "license": "ISC",
+            "engines": {
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+            }
+        },
+        "node_modules/acorn": {
+            "version": "8.18.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz",
+            "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==",
+            "license": "MIT",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-walk": {
+            "version": "8.3.5",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
+            "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
+            "license": "MIT",
+            "dependencies": {
+                "acorn": "^8.11.0"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/agent-base": {
+            "version": "7.1.4",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+            "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+            "license": "ISC",
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/argparse": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+            "license": "Python-2.0"
+        },
+        "node_modules/arrify": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz",
+            "integrity": "sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/at-least-node": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+            "license": "ISC",
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+            "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+            "license": "MIT",
+            "engines": {
+                "node": "18 || 20 || >=22"
+            }
+        },
+        "node_modules/base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/big.js": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/big.js/-/big.js-7.0.1.tgz",
+            "integrity": "sha512-iFgV784tD8kq4ccF1xtNMZnXeZzVuXWWM+ERFzKQjv+A5G9HC8CY3DuV45vgzFFcW+u2tIvmF95+AzWgs6BjCg==",
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/bigjs"
+            }
+        },
+        "node_modules/bignumber.js": {
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
+            "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/binary-extensions": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "5.0.9",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
+            "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^4.0.2"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "license": "MIT",
+            "dependencies": {
+                "fill-range": "^7.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/buffer": {
+            "version": "5.7.1",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.1.13"
+            }
+        },
+        "node_modules/buffer-equal-constant-time": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+            "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/chokidar": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "license": "MIT",
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "license": "MIT"
+        },
+        "node_modules/commander": {
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+            "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/config-chain": {
+            "version": "1.1.13",
+            "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+            "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+            "license": "MIT",
+            "dependencies": {
+                "ini": "^1.3.4",
+                "proto-list": "~1.2.1"
+            }
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/data-uri-to-buffer": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+            "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/debug": {
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/deepmerge": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/duplexify": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
+            "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.4.1",
+                "inherits": "^2.0.3",
+                "readable-stream": "^3.1.1",
+                "stream-shift": "^1.0.2"
+            }
+        },
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+            "license": "MIT"
+        },
+        "node_modules/ecdsa-sig-formatter": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+            "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "node_modules/editorconfig": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.7.tgz",
+            "integrity": "sha512-e0GOtq/aTQhVdNyDU9e02+wz9oDDM+SIOQxWME2QRjzRX5yyLAuHDE+0aE8vHb9XRC8XD37eO2u57+F09JqFhw==",
+            "license": "MIT",
+            "dependencies": {
+                "@one-ini/wasm": "0.1.1",
+                "commander": "^10.0.0",
+                "minimatch": "^9.0.1",
+                "semver": "^7.5.3"
+            },
+            "bin": {
+                "editorconfig": "bin/editorconfig"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/editorconfig/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "license": "MIT"
+        },
+        "node_modules/editorconfig/node_modules/brace-expansion": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
+            "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/editorconfig/node_modules/minimatch": {
+            "version": "9.0.9",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.2"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
+        "node_modules/end-of-stream": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+            "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+            "license": "MIT",
+            "dependencies": {
+                "once": "^1.4.0"
+            }
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/extend": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+            "license": "MIT"
+        },
+        "node_modules/fetch-blob": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+            "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/jimmywarting"
+                },
+                {
+                    "type": "paypal",
+                    "url": "https://paypal.me/jimmywarting"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "node-domexception": "^1.0.0",
+                "web-streams-polyfill": "^3.0.3"
+            },
+            "engines": {
+                "node": "^12.20 || >= 14.13"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "license": "MIT",
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/foreground-child": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+            "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+            "license": "ISC",
+            "dependencies": {
+                "cross-spawn": "^7.0.6",
+                "signal-exit": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/formdata-polyfill": {
+            "version": "4.0.10",
+            "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+            "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+            "license": "MIT",
+            "dependencies": {
+                "fetch-blob": "^3.1.2"
+            },
+            "engines": {
+                "node": ">=12.20.0"
+            }
+        },
+        "node_modules/fs-extra": {
+            "version": "9.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+            "license": "MIT",
+            "dependencies": {
+                "at-least-node": "^1.0.0",
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/gaxios": {
+            "version": "7.3.0",
+            "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.3.0.tgz",
+            "integrity": "sha512-RB5vLV+vvQeoFPCX4QMK6/hjVkbIamPp1QSUD0CiZcnj12qbpiL+pLbYtgD+oZkWl0tl9z+o2Utp+MpM3QRhBA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "extend": "^3.0.2",
+                "https-proxy-agent": "^7.0.1",
+                "node-fetch": "^3.3.2"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/gcp-metadata": {
+            "version": "8.1.2",
+            "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-8.1.2.tgz",
+            "integrity": "sha512-zV/5HKTfCeKWnxG0Dmrw51hEWFGfcF2xiXqcA3+J90WDuP0SvoiSO5ORvcBsifmx/FoIjgQN3oNOGaQ5PhLFkg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "gaxios": "^7.0.0",
+                "google-logging-utils": "^1.0.0",
+                "json-bigint": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/glob": {
+            "version": "13.0.6",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+            "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "minimatch": "^10.2.2",
+                "minipass": "^7.1.3",
+                "path-scurry": "^2.0.2"
+            },
+            "engines": {
+                "node": "18 || 20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/google-auth-library": {
+            "version": "10.9.1",
+            "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.9.1.tgz",
+            "integrity": "sha512-i1ydyHrqcIxXkWh/uBmVkzCvIuq5yiK2ATndIe5XxKholrG/MTYP9xGYka4sQhrbIAgGjL2B6NOE7rFaiF3fXw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "base64-js": "^1.3.0",
+                "ecdsa-sig-formatter": "^1.0.11",
+                "gaxios": "^7.1.4",
+                "gcp-metadata": "8.1.2",
+                "google-logging-utils": "1.1.3",
+                "jws": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/google-logging-utils": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.3.tgz",
+            "integrity": "sha512-eAmLkjDjAFCVXg7A1unxHsLf961m6y17QFqXqAXGj/gVkKFrEICfStRfwUlGNfeCEjNRa32JEWOUTlYXPyyKvA==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/google-sql-syntax-ts": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/google-sql-syntax-ts/-/google-sql-syntax-ts-1.0.3.tgz",
+            "integrity": "sha512-hkO4n1dNS/GIUpSDSBmc7DbEgzFBJWKMJTI0ArHb/qNjveOP1UfAb8wAeBt9WSWkUGlnV2S0/gh+MHx8GCBI2Q==",
+            "license": "ISC",
+            "dependencies": {
+                "monaco-editor": "^0.44.0"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "license": "ISC"
+        },
+        "node_modules/html-entities": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
+            "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/mdevils"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://patreon.com/mdevils"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/http-proxy-agent": {
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+            "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/https-proxy-agent": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.2",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "license": "ISC"
+        },
+        "node_modules/ini": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+            "license": "ISC"
+        },
+        "node_modules/is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "license": "MIT",
+            "dependencies": {
+                "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "license": "MIT",
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "license": "ISC"
+        },
+        "node_modules/jackspeak": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            },
+            "optionalDependencies": {
+                "@pkgjs/parseargs": "^0.11.0"
+            }
+        },
+        "node_modules/js-beautify": {
+            "version": "1.15.4",
+            "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz",
+            "integrity": "sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==",
+            "license": "MIT",
+            "dependencies": {
+                "config-chain": "^1.1.13",
+                "editorconfig": "^1.0.4",
+                "glob": "^10.4.2",
+                "js-cookie": "^3.0.5",
+                "nopt": "^7.2.1"
+            },
+            "bin": {
+                "css-beautify": "js/bin/css-beautify.js",
+                "html-beautify": "js/bin/html-beautify.js",
+                "js-beautify": "js/bin/js-beautify.js"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/js-beautify/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "license": "MIT"
+        },
+        "node_modules/js-beautify/node_modules/brace-expansion": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
+            "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/js-beautify/node_modules/glob": {
+            "version": "10.5.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+            "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^3.1.2",
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^1.11.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/js-beautify/node_modules/lru-cache": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+            "license": "ISC"
+        },
+        "node_modules/js-beautify/node_modules/minimatch": {
+            "version": "9.0.9",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.2"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/js-beautify/node_modules/path-scurry": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^10.2.0",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/js-cookie": {
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.8.tgz",
+            "integrity": "sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw==",
+            "license": "MIT"
+        },
+        "node_modules/js-yaml": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz",
+            "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/puzrin"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/nodeca"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/json-bigint": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+            "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+            "license": "MIT",
+            "dependencies": {
+                "bignumber.js": "^9.0.0"
+            }
+        },
+        "node_modules/jsonfile": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
+            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/jwa": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+            "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
+            "license": "MIT",
+            "dependencies": {
+                "buffer-equal-constant-time": "^1.0.1",
+                "ecdsa-sig-formatter": "1.0.11",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "node_modules/jws": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+            "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
+            "license": "MIT",
+            "dependencies": {
+                "jwa": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "node_modules/long": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
+            "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
+            "license": "Apache-2.0"
+        },
+        "node_modules/lru-cache": {
+            "version": "11.5.2",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
+            "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": "20 || >=22"
+            }
+        },
+        "node_modules/minimatch": {
+            "version": "10.2.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
+            "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "brace-expansion": "^5.0.8"
+            },
+            "engines": {
+                "node": "18 || 20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/minipass": {
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+            "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
+        "node_modules/monaco-editor": {
+            "version": "0.44.0",
+            "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz",
+            "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==",
+            "license": "MIT"
+        },
+        "node_modules/moo": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.3.tgz",
+            "integrity": "sha512-m2fmM2dDm7GZQsY7KK2cme8agi+AAljILjQnof7p1ZMDe6dQ4bdnSMx0cPppudoeNv5hEFQirN6u+O4fDE0IWA==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "license": "MIT"
+        },
+        "node_modules/next-tick": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+            "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+            "license": "ISC"
+        },
+        "node_modules/node-domexception": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+            "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+            "deprecated": "Use your platform's native DOMException instead",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/jimmywarting"
+                },
+                {
+                    "type": "github",
+                    "url": "https://paypal.me/jimmywarting"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.5.0"
+            }
+        },
+        "node_modules/node-fetch": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+            "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+            "license": "MIT",
+            "dependencies": {
+                "data-uri-to-buffer": "^4.0.0",
+                "fetch-blob": "^3.1.4",
+                "formdata-polyfill": "^4.0.10"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/node-fetch"
+            }
+        },
+        "node_modules/nopt": {
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
+            "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+            "license": "ISC",
+            "dependencies": {
+                "abbrev": "^2.0.0"
+            },
+            "bin": {
+                "nopt": "bin/nopt.js"
+            },
+            "engines": {
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+            }
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/object-sizeof": {
+            "version": "1.6.3",
+            "resolved": "https://registry.npmjs.org/object-sizeof/-/object-sizeof-1.6.3.tgz",
+            "integrity": "sha512-LGtilAKuDGKCcvu1Xg3UvAhAeJJlFmblo3faltmOQ80xrGwAHxnauIXucalKdTEksHp/Pq9tZGz1hfyEmjFJPQ==",
+            "license": "MIT",
+            "dependencies": {
+                "buffer": "^5.6.0"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/p-defer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+            "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/package-json-from-dist": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+            "license": "BlueOak-1.0.0"
+        },
+        "node_modules/parse-duration": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-1.1.2.tgz",
+            "integrity": "sha512-p8EIONG8L0u7f8GFgfVlL4n8rnChTt8O5FSxgxMz2tjc9FMP199wxVKVB6IbKx11uTbKHACSvaLVIKNnoeNR/A==",
+            "license": "MIT"
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-scurry": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+            "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^11.0.0",
+                "minipass": "^7.1.2"
+            },
+            "engines": {
+                "node": "18 || 20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+            "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/promise-batcher": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/promise-batcher/-/promise-batcher-1.1.1.tgz",
+            "integrity": "sha512-DtGBp8OQlAtALDFoVphyAz6Vn1c0GyelKU5smpMQEXpEAcWWxY3fC5JT0AkpWqrljvJrhC6zVdWbK/jx6NNG2A==",
+            "license": "MIT",
+            "dependencies": {
+                "p-defer": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/promise-batcher/node_modules/p-defer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz",
+            "integrity": "sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/promise-pool-executor": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/promise-pool-executor/-/promise-pool-executor-1.1.1.tgz",
+            "integrity": "sha512-WZTGr7E8tiW93QoSRe0+arBIrJ13m7yKov/vyWqP8nkME/OjfzZgmSJjLtcDHd6VVz2LdSoAHZLmDfis8hJd1w==",
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^3.1.0",
+                "next-tick": "^1.0.0",
+                "p-defer": "^1.0.0",
+                "promise-batcher": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=5.0.0"
+            }
+        },
+        "node_modules/promise-pool-executor/node_modules/debug": {
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+            "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.1"
+            }
+        },
+        "node_modules/proto-list": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+            "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+            "license": "ISC"
+        },
+        "node_modules/protobufjs": {
+            "version": "7.6.5",
+            "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.5.tgz",
+            "integrity": "sha512-/FPD0nUc9jH6rfFjji9IBqOz4pcSE3CsT1m7Ep6Mdb0LxSUMj8hgl6GomOvZzpNpAqqGaXA0P3VSrZLFzIhQrw==",
+            "hasInstallScript": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@protobufjs/aspromise": "^1.1.2",
+                "@protobufjs/base64": "^1.1.2",
+                "@protobufjs/codegen": "^2.0.5",
+                "@protobufjs/eventemitter": "^1.1.1",
+                "@protobufjs/fetch": "^1.1.1",
+                "@protobufjs/float": "^1.0.2",
+                "@protobufjs/path": "^1.1.2",
+                "@protobufjs/pool": "^1.1.0",
+                "@protobufjs/utf8": "^1.1.1",
+                "@types/node": ">=13.7.0",
+                "long": "^5.3.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "license": "MIT",
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/readline-sync": {
+            "version": "1.4.10",
+            "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz",
+            "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/retry-request": {
+            "version": "8.0.4",
+            "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-8.0.4.tgz",
+            "integrity": "sha512-pI6/7eabUYkZxamkOq0g0uMxKLLGnjzhefY+vL8bVXag5rto4OU2YBTPytWLuHH7aEKD6fn7kJycQfid0Mwnkw==",
+            "license": "MIT",
+            "dependencies": {
+                "extend": "^3.0.2",
+                "teeny-request": "^10.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/semver": {
+            "version": "7.8.5",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+            "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+            "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+            "license": "ISC",
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/stream-events": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+            "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+            "license": "MIT",
+            "dependencies": {
+                "stubs": "^3.0.0"
+            }
+        },
+        "node_modules/stream-shift": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+            "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
+            "license": "MIT"
+        },
+        "node_modules/string_decoder": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.2.0"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs": {
+            "name": "string-width",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi-cjs": {
+            "name": "strip-ansi",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/stubs": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+            "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
+            "license": "MIT"
+        },
+        "node_modules/tarjan-graph": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/tarjan-graph/-/tarjan-graph-2.0.0.tgz",
+            "integrity": "sha512-fDe57nO2Ukw2A/jHwVeiEgERGrGHukf3aHmR/YZ9BrveOtHVlFs289AnVeb1wD2aj9g01ZZ6f7VyMJ2QxI2NBQ==",
+            "license": "MIT"
+        },
+        "node_modules/teeny-request": {
+            "version": "10.1.4",
+            "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-10.1.4.tgz",
+            "integrity": "sha512-R1Cg4Vu0UULeDfHL/kjABLaTW++9yD/B6n2g48y5dJ04hsEaxcfmAqbNDzNsbqAYJyIpZafjklLG9YxRu9uzOg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.1",
+                "node-fetch": "^3.3.2",
+                "stream-events": "^1.0.5"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/tmp": {
+            "version": "0.2.7",
+            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz",
+            "integrity": "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "license": "MIT",
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/typeid-js": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/typeid-js/-/typeid-js-0.3.0.tgz",
+            "integrity": "sha512-A1EmvIWG6xwYRfHuYUjPltHqteZ1EiDG+HOmbIYXeHUVztmnGrPIfU9KIK1QC30x59ko0r4JsMlwzsALCyiB3Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "uuidv7": "^0.4.4"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "8.3.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz",
+            "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
+            "license": "MIT"
+        },
+        "node_modules/universalify": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/untildify": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+            "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "license": "MIT"
+        },
+        "node_modules/uuidv7": {
+            "version": "0.4.4",
+            "resolved": "https://registry.npmjs.org/uuidv7/-/uuidv7-0.4.4.tgz",
+            "integrity": "sha512-jjRGChg03uGp9f6wQYSO8qXkweJwRbA5WRuEQE8xLIiehIzIIi23qZSzsyvZPCPoFqkeLtZuz7Plt1LGukAInA==",
+            "license": "Apache-2.0",
+            "bin": {
+                "uuidv7": "cli.js"
+            }
+        },
+        "node_modules/vm2": {
+            "version": "3.11.4",
+            "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.11.4.tgz",
+            "integrity": "sha512-3assDRyB+A9/5rjECD2e2FAlezOfzCqejZy0L36zij4LgzoWZRA3a26q3PZnl6o5PmNjrTBRbAWACpdK/Y3qOQ==",
+            "license": "MIT",
+            "dependencies": {
+                "acorn": "^8.15.0",
+                "acorn-walk": "^8.3.4"
+            },
+            "bin": {
+                "vm2": "bin/vm2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
+        "node_modules/web-streams-polyfill": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+            "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs": {
+            "name": "wrap-ansi",
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "license": "ISC"
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs": {
+            "version": "16.2.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.2.tgz",
+            "integrity": "sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==",
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "20.2.9",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        }
+    }
+}
diff --git a/pkgs/by-name/da/dataform/package.nix b/pkgs/by-name/da/dataform/package.nix
new file mode 100644
index 000000000000..7d969162fee2
--- /dev/null
+++ b/pkgs/by-name/da/dataform/package.nix
@@ -0,0 +1,135 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchurl,
+  nix-update-script,
+  nodejs,
+  makeWrapper,
+  testers,
+  runCommand,
+  writableTmpDirAsHomeHook,
+  cacert,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "dataform";
+  version = "3.0.63";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  inherit nodejs;
+
+  src = fetchurl {
+    url = "https://registry.npmjs.org/@dataform/cli/-/cli-${finalAttrs.version}.tgz";
+    hash = "sha256-WAVTcWCZ99y+i7KTKWaqE5oMG+Uc/4d5h3Y6k9Bqhuo=";
+  };
+
+  # Inject the locally committed lockfile into the extracted source
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  npmDepsHash = "sha256-GLzkgs8ohGcWlNf55ktW4N1Q6HRJ+rse7wzBXC/xBno=";
+
+  dontNpmBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/dataform \
+      --prefix PATH : ${lib.makeBinPath [ nodejs ]}
+  '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--generate-lockfile" ];
+    };
+
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+      };
+
+      help = testers.runCommand {
+        name = "${finalAttrs.pname}-help-test";
+        nativeBuildInputs = [ finalAttrs.finalPackage ];
+        script = ''
+          dataform --help | grep -F "dataform [command]"
+          touch $out
+        '';
+      };
+
+      # `dataform install` should refuse to run against a workflow_settings.yaml
+      # project -- this is expected behavior, not a bug: packages for these
+      # projects are resolved at runtime instead.
+      install-refuses = testers.testBuildFailure' {
+        name = "${finalAttrs.pname}-install-refuses-test";
+        drv =
+          runCommand "${finalAttrs.pname}-install-refuses-test"
+            {
+              nativeBuildInputs = [ finalAttrs.finalPackage ];
+            }
+            ''
+              dataform init test-project my-test-db US
+              cd test-project
+              dataform install .
+            '';
+        expectedBuilderLogEntries = [
+          "No installation is needed when using workflow_settings.yaml"
+        ];
+      };
+
+      # `dataform compile` on a freshly-initialized workflow_settings.yaml
+      # project lazily fetches @dataform/core from the npm registry the
+      # first time it's needed -- this is the "packages are installed at
+      # runtime" behavior from the `install` refusal message actually
+      # happening. Needs network + a CA bundle, unlike the other tests here.
+      workflow = testers.runCommand {
+        name = "${finalAttrs.pname}-workflow-test";
+        nativeBuildInputs = [
+          finalAttrs.finalPackage
+          writableTmpDirAsHomeHook
+          cacert
+        ];
+        script = ''
+          dataform init test-project my-test-db US
+          test -d test-project/definitions
+          test -d test-project/includes
+          test -f test-project/workflow_settings.yaml
+          grep -F "my-test-db" test-project/workflow_settings.yaml
+          grep -F "US" test-project/workflow_settings.yaml
+
+          cd test-project
+          dataform compile . | grep -F "Compiled 0 action(s)."
+
+          touch $out
+        '';
+      };
+    };
+  };
+
+  meta = {
+    mainProgram = "dataform";
+    description = "Dataform CLI";
+    longDescription = ''
+      Dataform is a framework for managing SQL based data operations in BigQuery
+      Dataform CLI is an open-source command-line tool that allows developers to locally build,
+      compile, test, and execute SQLX data transformation pipelines for BigQuery.
+    '';
+    homepage = "https://github.com/dataform-co/dataform";
+    downloadPage = "https://www.npmjs.com/package/@dataform/cli";
+    changelog = "https://github.com/dataform-co/dataform/releases#release-${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    identifiers = {
+      cpeParts = lib.meta.cpeFullVersionWithVendor "dataform-co" finalAttrs.version;
+      purlParts = {
+        type = "npm";
+        spec = "%40dataform/cli@${finalAttrs.version}";
+      };
+    };
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ KristijanZic ];
+  };
+})

From d64be4648c71301b65bce796faa00137c556b951 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 22:15:13 +0000
Subject: [PATCH 44/57] libretro.thepowdertoy: 0-unstable-2026-04-20 ->
 0-unstable-2026-07-25

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

diff --git a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
index bbae8f0394d2..325c1646e90c 100644
--- a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
+++ b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "thepowdertoy";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-07-25";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "ThePowderToy";
-    rev = "dcb5e41f1f9800192ea07ea43459413c5a065d9f";
-    hash = "sha256-FDotG/ngmrxgyN7YQ8SK/ZQHKWkwZ5hhg0qsNNXmaNc=";
+    rev = "bb2d9f6623d2ccf25a0021045af9591c8a0bbaff";
+    hash = "sha256-iYGIDpum2x3sE8dBsZQOVv70C20Ras2CTlam0AldeLM=";
   };
 
   extraNativeBuildInputs = [ cmake ];

From 59d78a641a6a070179920e151fa61cee1f279f85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 22:50:05 +0000
Subject: [PATCH 45/57] bento: 1.19.0 -> 1.20.0

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

diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index 4be3e6cd7dff..a077cfe93f02 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "bento";
-  version = "1.19.0";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3ZISLZzh8FYAE9riZ5Ya5h3LhwzHK4a5jJl8jeHiNoA=";
+    hash = "sha256-cWQvCTN9G4M0DTLFyGusgpgM7g24C5STP4Pb/T8pyYI=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-h9bH5aewbDAuOVAps3TMihjCITFiBT/bbqNJCUT0NN8=";
+  vendorHash = "sha256-sX5I4TssmlRnkOc3XAtaoKLppla56AQi+vypGMLf0i8=";
 
   subPackages = [
     "cmd/bento"

From a778e457b05ac5cc5d0114280e2f93cee3c1a41d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 23:43:03 +0000
Subject: [PATCH 46/57] libretro.pcsx-rearmed: 0-unstable-2026-06-28 ->
 0-unstable-2026-08-02

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

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index d2f42d2e655b..1fa88c72fa2c 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-08-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "050981b6eeb715f142854f57c68086f62921f027";
-    hash = "sha256-MFNA3YPhLKa5q9hYM11O5/BIrj5xOsiNXkFLnCzugzo=";
+    rev = "da2cb8ecd17fd0932ab6d94774c0522beebce6e3";
+    hash = "sha256-WQexwG8KXsN2ZEs2a6x9yyN7a3jU6F5mqj226h6SFqw=";
   };
 
   dontConfigure = true;

From 3e3c2e80f1f93594ba09d8fc87d61fc913ceea4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Aug 2026 23:51:37 +0000
Subject: [PATCH 47/57] rtorrent: 0.16.17 -> 0.16.19

---
 pkgs/by-name/li/libtorrent-rakshasa/package.nix | 4 ++--
 pkgs/by-name/rt/rtorrent/package.nix            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
index b8685277e4c5..72edce1f6f01 100644
--- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix
+++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtorrent-rakshasa";
-  version = "0.16.17";
+  version = "0.16.19";
 
   __structuredAttrs = true;
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rakshasa";
     repo = "libtorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gwEbaAe1A5bPBrrQDBeKraAwdzgbcUYVZYt8Gjtugi8=";
+    hash = "sha256-D+RPDp8r2ZKhNpiLKpm269h/5MBN+QhHf/qeXEzM92M=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index d0ebb8f66eb5..fddee3463204 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rtorrent";
-  version = "0.16.17";
+  version = "0.16.19";
 
   __structuredAttrs = true;
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rakshasa";
     repo = "rtorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pFEUbxrruP4Zq9WdlnBSmE6Fe95jpZ88x3md5jzytO4=";
+    hash = "sha256-oMErraDUyCiuRxFZ5CoBvoW9vXHG+eLHnAKzm6kWt2Y=";
   };
 
   outputs = [

From 0fc9d65faea53cf3268e620dbcde85c35a011808 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 3 Aug 2026 16:59:56 -0700
Subject: [PATCH 48/57] tailscale: skip testwrapper race tests that require cgo

TestRaceAttributedToPassingTest and TestRaceSuppressesFlakyRetry run
`go test -race`, which requires cgo, but we build with CGO_ENABLED=0.

Assisted-by: Claude Code (claude-fable-5)
---
 pkgs/by-name/ta/tailscale/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index c779517f9b79..85941ed43519 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -176,6 +176,10 @@ buildGoModule (finalAttrs: {
         # Fails because we vendor dependencies
         "TestLicenseHeaders"
 
+        # Runs `go test -race`, which requires cgo, but we build with CGO_ENABLED=0
+        "TestRaceAttributedToPassingTest" # cmd/testwrapper
+        "TestRaceSuppressesFlakyRetry" # cmd/testwrapper
+
         # Uses testing/synctest which spawns goroutines that block on syscalls
         # incompatible with synctest's bubble mechanism
         "TestDNSTrampleRecovery"

From f427bb255eff4fbc8d17f51ae2b63388b0f47d5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 00:42:56 +0000
Subject: [PATCH 49/57] biome: 2.5.5 -> 2.5.6

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

diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 2be506ef1550..bcb5767a13db 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-mTkW+ni52TybEw+j9v/WcxoZhLelrjO7vAf/MMd7NOc=";
+    hash = "sha256-jutNefPBi39eM/Db04IHA6RId+Un7xLBv/L7tMaC3iI=";
   };
 
-  cargoHash = "sha256-sbh5WpBTcFNlKxf62adCZ6g8Ch+MapJ8wbRRT8+R7XA=";
+  cargoHash = "sha256-pPX9sbVYfN9k3LeTBY1SMXU1xOFlYmQCkvSg8U9dL+w=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 28fd0a99a696093cb8841bc0500a0559d9948f83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 00:53:31 +0000
Subject: [PATCH 50/57] home-assistant-custom-components.cover_time_based:
 4.9.0 -> 4.10.0

---
 .../custom-components/cover_time_based/package.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/cover_time_based/package.nix b/pkgs/servers/home-assistant/custom-components/cover_time_based/package.nix
index 76184bec4b0c..d0f1cc353b61 100644
--- a/pkgs/servers/home-assistant/custom-components/cover_time_based/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/cover_time_based/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent (finalAttrs: {
   owner = "Sese-Schneider";
   domain = "cover_time_based";
-  version = "4.9.0";
+  version = "4.10.0";
 
   src = fetchFromGitHub {
     inherit (finalAttrs) owner;
     repo = "ha-cover-time-based";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NVws0FAB88PfgyfrCymyeHVSMzBc/KyILmVOyUQ8T7g=";
+    hash = "sha256-FF4adRPojKOaA8SkWvFtz5Qem/rmz+5ZTAoT+o60aPg=";
   };
 
   nativeCheckInputs = [

From 8e2d570c48bff60b5aaa6cb36d6236e8085ca0b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 4 Aug 2026 03:09:27 +0200
Subject: [PATCH 51/57] python3Packages.django-phonenumber-field: 8.4.0 ->
 8.5.0

https://github.com/django-phonenumber-field/django-phonenumber-field/releases/tag/8.5.0
---
 .../django-phonenumber-field/default.nix      | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix
index c568853b5186..a0fca5c7e68f 100644
--- a/pkgs/development/python-modules/django-phonenumber-field/default.nix
+++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix
@@ -9,56 +9,61 @@
   phonenumbers,
   phonenumberslite,
   python,
+  pytestCheckHook,
+  pytest-django,
   setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "django-phonenumber-field";
-  version = "8.4.0";
+  version = "8.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "stefanfoulis";
+    owner = "django-phonenumber-field";
     repo = "django-phonenumber-field";
-    tag = version;
-    hash = "sha256-k6r+yy1o7pFJx/9yxI5AbsfRPIhycAc0oXBHyV0GHec=";
+    tag = finalAttrs.version;
+    hash = "sha256-hTrW7QeZPBsln9iHh9sV7JMQxdJ9cFcAq4ETyhxFGv0=";
   };
 
+  nativeBuildInputs = [ gettext ];
+
   build-system = [ setuptools-scm ];
 
   # Upstream doesn't put phonenumbers in dependencies but the package doesn't
   # make sense without either of the two optional dependencies. Since, in
   # Nixpkgs, phonenumberslite depends on phonenumbers, add the latter
   # unconditionally.
-  dependencies = [ django ] ++ optional-dependencies.phonenumbers;
+  dependencies = [ django ] ++ finalAttrs.passthru.optional-dependencies.phonenumbers;
 
-  nativeCheckInputs = [
-    babel
-    djangorestframework
-  ];
-
-  nativeBuildInputs = [ gettext ];
-
-  pythonImportsCheck = [ "phonenumber_field" ];
-
-  checkPhase = ''
-    ${python.interpreter} -m django test --settings tests.settings
-  '';
+  optional-dependencies = {
+    babel = [ babel ];
+    phonenumbers = [ phonenumbers ];
+    phonenumberslite = [ phonenumberslite ];
+  };
 
   preBuild = ''
     ${python.interpreter} -m django compilemessages
   '';
 
-  optional-dependencies = {
-    phonenumbers = [ phonenumbers ];
-    phonenumberslite = [ phonenumberslite ];
-  };
+  nativeCheckInputs = [
+    djangorestframework
+    pytestCheckHook
+    pytest-django
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';
+
+  pythonImportsCheck = [ "phonenumber_field" ];
 
   meta = {
     description = "Django model and form field for normalised phone numbers using python-phonenumbers";
-    homepage = "https://github.com/stefanfoulis/django-phonenumber-field/";
-    changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${src.tag}";
+    homepage = "https://github.com/django-phonenumber-field/django-phonenumber-field";
+    changelog = "https://github.com/django-phonenumber-field/django-phonenumber-field/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sephi ];
   };
-}
+})

From 94a6ff4e0b4eacf2b61c860d15dd0255e5f9ca4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 01:20:57 +0000
Subject: [PATCH 52/57] gobgp: 4.7.0 -> 4.8.0

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

diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix
index d707bd291096..6d26953e8377 100644
--- a/pkgs/by-name/go/gobgp/package.nix
+++ b/pkgs/by-name/go/gobgp/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gobgp";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-crruhk4Jo1TdmGWvtdJKCBucjYNEwEMbNkJ3r5hxoQA=";
+    sha256 = "sha256-nU/HjHi0nKQy8SelwKSHneRjaRVNfvif4dljhPpUZrI=";
   };
 
-  vendorHash = "sha256-fGDjeWmIe0GNZTDCXDBU4b286rMdCnPgRBInLZsFWxQ=";
+  vendorHash = "sha256-9r8LZlCF4sr8VTyJfDktjhk32afc8ep7GXtqxUnAleE=";
 
   postConfigure = ''
     export CGO_ENABLED=0

From fe06cef51a0aac477329f93616668cf8be44b4f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 01:23:21 +0000
Subject: [PATCH 53/57] gobgpd: 4.7.0 -> 4.8.0

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

diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix
index 98fed863783b..f6eb0a287a49 100644
--- a/pkgs/by-name/go/gobgpd/package.nix
+++ b/pkgs/by-name/go/gobgpd/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gobgpd";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-crruhk4Jo1TdmGWvtdJKCBucjYNEwEMbNkJ3r5hxoQA=";
+    hash = "sha256-nU/HjHi0nKQy8SelwKSHneRjaRVNfvif4dljhPpUZrI=";
   };
 
-  vendorHash = "sha256-fGDjeWmIe0GNZTDCXDBU4b286rMdCnPgRBInLZsFWxQ=";
+  vendorHash = "sha256-9r8LZlCF4sr8VTyJfDktjhk32afc8ep7GXtqxUnAleE=";
 
   postConfigure = ''
     export CGO_ENABLED=0

From e6354072a567bc1ec6c706669ed814ed02095395 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 01:23:56 +0000
Subject: [PATCH 54/57] python3Packages.elevenlabs: 2.59.0 -> 2.60.0

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

diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index 2ffb547ace85..2734615eab7b 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "elevenlabs";
-  version = "2.59.0";
+  version = "2.60.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TDBCwKpyPmpdTcsq2UTwsE4qsVVHJMchh+gSChHjiZU=";
+    hash = "sha256-Foe5icwDNVD/g/tss1UG9wzrzXmECzXr/3Ql6yA4YHY=";
   };
 
   build-system = [ poetry-core ];

From c9dece68145dea6c38ca88e3ad2fdf556b58d7e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 01:43:59 +0000
Subject: [PATCH 55/57] jetbrains-toolbox: 3.6.2.85969 -> 3.6.3.86383

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

diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index 3399a8f136a2..582c8ffcf1ae 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "jetbrains-toolbox";
-  version = "3.6.2.85969";
+  version = "3.6.3.86383";
 
   updateScript = ./update.sh;
 
@@ -57,9 +57,9 @@ let
         aarch64 = "-arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-2XvsZ5WrdmDGTigKWJCUJB2VkHj+Z3M8QClp6YoIIRw=";
-        aarch64-linux = "sha256-/8j7vJGTCvj57I1kqUCyBSDoJA8Tr0MUaomhb0Um7vA=";
-        aarch64-darwin = "sha256-esf/AfRDGoWV05KWb7CfJBRQvkcs3bG5/IldcTuNZOA=";
+        x86_64-linux = "sha256-RhBZK/86wMqgtFAolk5xubGAaqCewyEUlWjB+HAGEDg=";
+        aarch64-linux = "sha256-qhheArqQpElRoZGHmrl2W4+llDWEq+m4PXfG2XM6uYQ=";
+        aarch64-darwin = "sha256-mvfy8B2sOumvWiUmG8BtHvyZdcBs90BG8bEn21sPs5E=";
       };
     in
     selectKernel {

From 4b1cd35e951dd2760cf83fe5bf5129d26464ae31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 02:15:29 +0000
Subject: [PATCH 56/57] terraform-providers.sap-cloud-infrastructure_sci: 2.3.0
 -> 2.5.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2d172e847f87..fd996d5163a3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1166,13 +1166,13 @@
     "vendorHash": "sha256-zklw0YajAZZLkosLxZCsWtAbvmHuGEI8OGpVykp1Xw4="
   },
   "sap-cloud-infrastructure_sci": {
-    "hash": "sha256-eQA4mY+Rx5PLbTgGqfefYFc5gZKIvt1w2eag8ipE0PI=",
+    "hash": "sha256-S0E8vZpJaJvch8Riy1hO5ChegTyq0NYdEfjS290h1G4=",
     "homepage": "https://registry.terraform.io/providers/sap-cloud-infrastructure/sci",
     "owner": "SAP-cloud-infrastructure",
     "repo": "terraform-provider-sci",
-    "rev": "v2.3.0",
+    "rev": "v2.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag="
+    "vendorHash": "sha256-22bOJyR+ERVu8eTX3iT838q6mxViGt5Fd6MVFB49JZY="
   },
   "sap_btp": {
     "hash": "sha256-fRg83kdeHizOi8riLFU0NKWmeQSAbG0xJUtkdMcvWp0=",

From 71fc65c745b628de8b3cc5b9f006031d89971dc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 03:02:39 +0000
Subject: [PATCH 57/57] terraform-providers.huaweicloud_huaweicloud: 1.95.0 ->
 1.96.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2d172e847f87..299342c820c9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -724,11 +724,11 @@
     "vendorHash": "sha256-s9tdthUzIdisP0XB9V+HGlWgZCXnOodz9Atu/XyDKf4="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-1WVZ5NOvVFuRIWJQpFy9lRvlt5GbOHINFISABexcb/M=",
+    "hash": "sha256-TiupRu1Aj750do194qYyWlJJAaT1cwyy/oc3WyqtJdM=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.95.0",
+    "rev": "v1.96.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },